@andersbakken/fisk 4.0.61 → 4.0.62

package/builder/VM_runtime.js

@@ -9,7 +9,7 @@ var require$$0$1 = require('stream');
 var require$$4 = require('util');
 var path$h = require('path');
 var require$$1$1 = require('os');
-var fiskNative = require('@andersbakken/fisk-native');
+var posix = require('posix');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -22,6 +22,7 @@ var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
 var path__default = /*#__PURE__*/_interopDefaultLegacy(path$h);
 var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
+var posix__default = /*#__PURE__*/_interopDefaultLegacy(posix);
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -3044,7 +3045,7 @@ class Compile extends EventEmitter__default["default"] {
         let outputFileName;
         let hasDashO = false;
         let hasDashX = false;
-        let sourcePath;
+        let sourceFile;
         for (let i = 0; i < args.length; ++i) {
             // console.log(i, args[i]);
             switch (args[i]) {
@@ -3125,21 +3126,21 @@ class Compile extends EventEmitter__default["default"] {
                         break;
                     }
                     if (args[i][0] !== "-") {
-                        if (sourcePath) {
-                            console.log("Multiple source files", sourcePath, args[i]);
+                        if (sourceFile) {
+                            console.log("Multiple source files", sourceFile, args[i]);
                             throw new Error("More than one source file");
                         }
-                        sourcePath = args[i];
+                        sourceFile = args[i];
                         args[i] = path__default["default"].join(dir, "sourcefile");
                     }
                     break;
             }
         }
-        if (!sourcePath) {
+        if (!sourceFile) {
             throw new Error("No sourcefile");
         }
         if (!hasDashX) {
-            switch (path__default["default"].extname(sourcePath)) {
+            switch (path__default["default"].extname(sourceFile)) {
                 case ".C":
                 case ".cc":
                 case ".cpp":
@@ -3183,7 +3184,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: ${sourcePath}`);
+                    throw new Error(`Can't determine source language for file: ${sourceFile}`);
             }
             args.unshift("-x");
         }
@@ -3194,8 +3195,8 @@ class Compile extends EventEmitter__default["default"] {
             args.push("-Wno-stdlibcxx-not-found");
         }
         if (!hasDashO) {
-            const suffix = path__default["default"].extname(sourcePath);
-            outputFileName = output = sourcePath.substring(0, sourcePath.length - suffix.length) + ".o";
+            const suffix = path__default["default"].extname(sourceFile);
+            outputFileName = output = sourceFile.substring(0, sourceFile.length - suffix.length) + ".o";
             args.push("-o", outputFileName);
         }
         // debug = true;
@@ -3205,7 +3206,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: ${sourcePath}\n${[compiler, ...args].join(" ")}`);
+        console.log("going for it", compiler, args);
         // 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
@@ -3225,7 +3226,6 @@ class Compile extends EventEmitter__default["default"] {
         proc.on("exit", (exitCode) => {
             // try {
             const files = [];
-            let addDirError;
             const addDir = (directory, prefix) => {
                 try {
                     fs.readdirSync(directory).forEach((file) => {
@@ -3242,21 +3242,21 @@ class Compile extends EventEmitter__default["default"] {
                                 if (file === outputFileName) {
                                     files.push({ path: output, mapped: path__default["default"].join(prefix, file) });
                                 }
+                                else if (path__default["default"].extname(file) === ".gcno") {
+                                    // console.log("mapping", output, prefix, file);
+                                    files.push({
+                                        path: output.substring(0, output.length - 1) + "gcno",
+                                        mapped: path__default["default"].join(prefix, file)
+                                    });
+                                }
+                                else if (path__default["default"].extname(file) === ".gcda") {
+                                    files.push({
+                                        path: output.substring(0, output.length - 1) + "gcda",
+                                        mapped: path__default["default"].join(prefix, file)
+                                    });
+                                }
                                 else {
-                                    const ext = path__default["default"].extname(file);
-                                    switch (ext) {
-                                        case ".gcno":
-                                        case ".gcda":
-                                        case ".dwo":
-                                            files.push({
-                                                path: output.substring(0, output.length - 2) + ext,
-                                                mapped: path__default["default"].join(prefix, file)
-                                            });
-                                            break;
-                                        default:
-                                            files.push({ path: path__default["default"].join(prefix, file) });
-                                            break;
-                                    }
+                                    files.push({ path: path__default["default"].join(prefix, file) });
                                 }
                                 if (debug) {
                                     console.log("Added file", file, files[files.length - 1]);
@@ -3264,33 +3264,30 @@ class Compile extends EventEmitter__default["default"] {
                             }
                         }
                         catch (err) {
-                            console.error("Got an error file", path__default["default"].join(directory, file), err);
+                            /* */
                         }
                     });
                 }
                 catch (err) {
-                    console.error("Got an error processing outputs for", sourcePath, err);
-                    addDirError = err;
+                    console.error("Got an error processing outputs for", sourceFile, err);
+                    assert__default["default"](sourceFile !== undefined, "Must have sourceFile");
+                    const errorExitEvent = {
+                        exitCode: 110,
+                        files: [],
+                        error: err.toString(),
+                        sourceFile
+                    };
+                    this.emit("exit", errorExitEvent);
                 }
             };
             if (exitCode === 0) {
                 addDir(dir, dir);
             }
-            assert__default["default"](sourcePath !== undefined, "Must have sourcePath4");
-            if (addDirError) {
-                const errorExitEvent = {
-                    exitCode: 110,
-                    files: [],
-                    error: addDirError.toString(),
-                    sourcePath
-                };
-                this.emit("exit", errorExitEvent);
-                return;
-            }
             if (exitCode === null) {
                 exitCode = 111;
             }
-            const exitEvent = { exitCode, files, sourcePath };
+            assert__default["default"](sourceFile !== undefined, "Must have sourceFile4");
+            const exitEvent = { exitCode, files, sourceFile };
             this.emit("exit", exitEvent);
         });
     }
@@ -3598,7 +3595,7 @@ process.on("uncaughtException", (err) => {
 let pwd;
 if (argv.user) {
     try {
-        pwd = fiskNative.getpwnam(argv.user);
+        pwd = posix__default["default"].getpwnam(argv.user);
     }
     catch (err) {
         console.error("Couldn't find user", argv.user);
@@ -3613,7 +3610,7 @@ if (argv.user) {
 }
 try {
     console.log("Chrooting to", argv.root);
-    fiskNative.chroot(argv.root);
+    posix__default["default"].chroot(argv.root);
 }
 catch (err) {
     console.error("Changing root or user failed", err);
@@ -3734,7 +3731,7 @@ process.on("message", (msg) => {
                             id: msg.id,
                             files: event.files,
                             exitCode: event.exitCode,
-                            sourcePath: event.sourcePath
+                            sourceFile: event.sourceFile
                         });
                     }
                     else {
@@ -3744,7 +3741,7 @@ process.on("message", (msg) => {
                             id: msg.id,
                             files: event.files,
                             exitCode: event.exitCode,
-                            sourcePath: event.sourcePath
+                            sourceFile: event.sourceFile
                         });
                     }
                     if (destroying && !compiles.size) {