@andersbakken/fisk 4.0.53 → 4.0.54

package/builder/VM_runtime.js

@@ -3044,7 +3044,7 @@ class Compile extends EventEmitter__default["default"] {
         let outputFileName;
         let hasDashO = false;
         let hasDashX = false;
-        let sourceFile;
+        let sourcePath;
         for (let i = 0; i < args.length; ++i) {
             // console.log(i, args[i]);
             switch (args[i]) {
@@ -3125,21 +3125,21 @@ class Compile extends EventEmitter__default["default"] {
                         break;
                     }
                     if (args[i][0] !== "-") {
-                        if (sourceFile) {
-                            console.log("Multiple source files", sourceFile, args[i]);
+                        if (sourcePath) {
+                            console.log("Multiple source files", sourcePath, args[i]);
                             throw new Error("More than one source file");
                         }
-                        sourceFile = args[i];
+                        sourcePath = args[i];
                         args[i] = path__default["default"].join(dir, "sourcefile");
                     }
                     break;
             }
         }
-        if (!sourceFile) {
+        if (!sourcePath) {
             throw new Error("No sourcefile");
         }
         if (!hasDashX) {
-            switch (path__default["default"].extname(sourceFile)) {
+            switch (path__default["default"].extname(sourcePath)) {
                 case ".C":
                 case ".cc":
                 case ".cpp":
@@ -3183,7 +3183,7 @@ class Compile extends EventEmitter__default["default"] {
                     args.unshift(isClang ? "objective-c++" : "objective-c++-cpp-output");
                     break;
                 default:
-                    throw new Error(`Can't determine source language for file: ${sourceFile}`);
+                    throw new Error(`Can't determine source language for file: ${sourcePath}`);
             }
             args.unshift("-x");
         }
@@ -3194,8 +3194,8 @@ class Compile extends EventEmitter__default["default"] {
             args.push("-Wno-stdlibcxx-not-found");
         }
         if (!hasDashO) {
-            const suffix = path__default["default"].extname(sourceFile);
-            outputFileName = output = sourceFile.substring(0, sourceFile.length - suffix.length) + ".o";
+            const suffix = path__default["default"].extname(sourcePath);
+            outputFileName = output = sourcePath.substring(0, sourcePath.length - suffix.length) + ".o";
             args.push("-o", outputFileName);
         }
         // debug = true;
@@ -3205,7 +3205,7 @@ class Compile extends EventEmitter__default["default"] {
         if (!fs.existsSync("/usr/bin/as")) {
             this.emit("stderr", "as doesn't exist");
         }
-        console.log(`Compiling source file: ${sourceFile}\n${[compiler, ...args].join(" ")}`);
+        console.log(`Compiling source file: ${sourcePath}\n${[compiler, ...args].join(" ")}`);
         // const env = Object.assign({ TMPDIR: dir, TEMPDIR: dir, TEMP: dir }, process.env);
         const proc = child_process__default["default"].spawn(compiler, args, {
             /*env: env, */ cwd: dir // , maxBuffer: 1024 * 1024 * 16
@@ -3268,13 +3268,13 @@ class Compile extends EventEmitter__default["default"] {
                     });
                 }
                 catch (err) {
-                    console.error("Got an error processing outputs for", sourceFile, err);
-                    assert__default["default"](sourceFile !== undefined, "Must have sourceFile");
+                    console.error("Got an error processing outputs for", sourcePath, err);
+                    assert__default["default"](sourcePath !== undefined, "Must have sourcePath");
                     const errorExitEvent = {
                         exitCode: 110,
                         files: [],
                         error: err.toString(),
-                        sourceFile
+                        sourcePath
                     };
                     this.emit("exit", errorExitEvent);
                 }
@@ -3285,8 +3285,8 @@ class Compile extends EventEmitter__default["default"] {
             if (exitCode === null) {
                 exitCode = 111;
             }
-            assert__default["default"](sourceFile !== undefined, "Must have sourceFile4");
-            const exitEvent = { exitCode, files, sourceFile };
+            assert__default["default"](sourcePath !== undefined, "Must have sourcePath4");
+            const exitEvent = { exitCode, files, sourcePath };
             this.emit("exit", exitEvent);
         });
     }
@@ -3730,7 +3730,7 @@ process.on("message", (msg) => {
                             id: msg.id,
                             files: event.files,
                             exitCode: event.exitCode,
-                            sourceFile: event.sourceFile
+                            sourcePath: event.sourcePath
                         });
                     }
                     else {
@@ -3740,7 +3740,7 @@ process.on("message", (msg) => {
                             id: msg.id,
                             files: event.files,
                             exitCode: event.exitCode,
-                            sourceFile: event.sourceFile
+                            sourcePath: event.sourcePath
                         });
                     }
                     if (destroying && !compiles.size) {