Merge pull request #15 from trinnguyen/fix-linker

Wrapped file deletion during shared lib generation inside try/catch
trinnguyen · Jul 28, 2021 · 535e2d8 · 535e2d8
2 parents d27189e + 32c9490
commit 535e2d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/de.uniba.swt.dsl/src/de/uniba/swt/dsl/common/generator/GeneratorProvider.java b/src/de.uniba.swt.dsl/src/de/uniba/swt/dsl/common/generator/GeneratorProvider.java
@@ -63,7 +63,6 @@ protected void cleanUp(IFileSystemAccess2 fsa) {
                 } catch (Exception ex) {
                     logger.warn(String.format("Failed to delete file: %s, msg: %s", name, ex.getMessage()));
                 }
-
             }
         }
     }

diff --git a/src/de.uniba.swt.dsl/src/de/uniba/swt/dsl/generator/externals/ExternalGenerator.java b/src/de.uniba.swt.dsl/src/de/uniba/swt/dsl/generator/externals/ExternalGenerator.java
@@ -25,14 +25,15 @@
 package de.uniba.swt.dsl.generator.externals;
 
 import de.uniba.swt.dsl.common.fsa.FsaUtil;
-import org.eclipse.xtext.generator.AbstractFileSystemAccess;
-import org.eclipse.xtext.generator.AbstractFileSystemAccess2;
+import org.apache.log4j.Logger;
 import org.eclipse.xtext.generator.IFileSystemAccess2;
 
 import java.util.Arrays;
 
 public abstract class ExternalGenerator {
 
+    private static final Logger logger = Logger.getLogger(ExternalGenerator.class);
+
     protected abstract String[] supportedTools();
 
     protected boolean executeArgs(String[] args, IFileSystemAccess2 fsa, CliRuntimeExecutor runtimeExec) {
@@ -60,7 +61,11 @@ protected void cleanUp(IFileSystemAccess2 fsa) {
         var names = generatedFileNames();
         if (names != null) {
             for (String name : names) {
-                fsa.deleteFile(name);
+                try {
+                    fsa.deleteFile(name);
+                } catch (Exception ex) {
+                    logger.warn(String.format("Failed to delete file: %s, msg: %s", name, ex.getMessage()));
+                }
             }
         }
     }