Changeset 13696

Timestamp:

Oct 8, 2019 2:26:04 PM (2 months ago)

Author:

molsson

Message:

#5843 Refactored ModelicaCompiler.packUnit().

File:

• branches/dev-mo-2265/Compiler/ModelicaCompiler/src/jastadd/ModelicaCompiler.jrag (modified) (2 diffs)

branches/dev-mo-2265/Compiler/ModelicaCompiler/src/jastadd/ModelicaCompiler.jrag

@@ -2198 +2198 @@
     protected Path ModelicaCompiler.packUnit(String className,
             TargetObject target, FClass fClass) throws PackingFailedException {
-
         Path unitFile = fClass.root().getUtilInterface().getCompilationOutputPath().toPath();
-
+        
         hookPackFmu(fClass, outDir);
         hookCheckAbort();
+        packUnit(className, target, fClass, unitFile);
+        hookFmuPacked(fClass, unitFile.toAbsolutePath().toFile());
+        
+        return unitFile;
+    }
+    
+    private void ModelicaCompiler.packUnit(String className, TargetObject target, FClass fClass, Path unitFile) {
         try {
             copySourceFiles(fClass, sourceDir, outDir);
@@ -2212 +2218 @@
             throw new PackingFailedException(String.format("Could not write to '%s'.", unitFile), e);
         }
-
-        hookFmuPacked(fClass, unitFile.toAbsolutePath().toFile());
-        return unitFile;
     }