@andersbakken/fisk 4.0.16 → 4.0.18

package/builder/VM_runtime.js

@@ -3139,56 +3139,52 @@ class Compile extends EventEmitter__default["default"] {
             throw new Error("No sourcefile");
         }
         if (!hasDashX) {
-            if (compiler.indexOf("g++") !== -1 || compiler.indexOf("c++") !== -1) {
-                args.unshift(isClang ? "c++" : "c++-cpp-output");
-            }
-            else {
-                switch (path__default["default"].extname(sourceFile)) {
-                    case ".C":
-                    case ".cc":
-                    case ".cpp":
-                    case ".CPP":
-                    case ".c++":
-                    case ".cp":
-                    case ".cxx":
-                        args.unshift(isClang ? "c++" : "c++-cpp-output");
-                        break;
-                    case ".ii":
-                        args.unshift("c++-cpp-output");
-                        break;
-                    case ".hh":
-                    case ".hpp":
-                    case ".H":
-                        args.unshift("c++-header");
-                        break;
-                    case ".h":
-                        args.unshift("c-header");
-                        break;
-                    case ".c":
-                        args.unshift(isClang ? "c" : "cpp-output");
-                        break;
-                    case ".i":
-                        args.unshift("cpp-output");
-                        break;
-                    case ".m":
-                    case ".mi":
-                        args.unshift(isClang ? "objective-c" : "objective-c-cpp-output");
-                        break;
-                    case ".s":
-                        args.unshift("assembler");
-                        break;
-                    case ".sx":
-                    case ".S":
-                        args.unshift("assembler-with-cpp");
-                        break;
-                    case ".mm":
-                    case ".M":
-                    case ".mii":
-                        args.unshift(isClang ? "objective-c++" : "objective-c++-cpp-output");
-                        break;
-                    default:
-                        throw new Error(`Can't determine source language for file: ${sourceFile}`);
-                }
+            console.log("shit", compiler, sourceFile);
+            switch (path__default["default"].extname(sourceFile)) {
+                case ".C":
+                case ".cc":
+                case ".cpp":
+                case ".CPP":
+                case ".c++":
+                case ".cp":
+                case ".cxx":
+                    args.unshift(isClang ? "c++" : "c++-cpp-output");
+                    break;
+                case ".ii":
+                    args.unshift("c++-cpp-output");
+                    break;
+                case ".hh":
+                case ".hpp":
+                case ".H":
+                    args.unshift("c++-header");
+                    break;
+                case ".h":
+                    args.unshift("c-header");
+                    break;
+                case ".c":
+                    args.unshift(isClang ? "c" : "cpp-output");
+                    break;
+                case ".i":
+                    args.unshift("cpp-output");
+                    break;
+                case ".m":
+                case ".mi":
+                    args.unshift(isClang ? "objective-c" : "objective-c-cpp-output");
+                    break;
+                case ".s":
+                    args.unshift("assembler");
+                    break;
+                case ".sx":
+                case ".S":
+                    args.unshift("assembler-with-cpp");
+                    break;
+                case ".mm":
+                case ".M":
+                case ".mii":
+                    args.unshift(isClang ? "objective-c++" : "objective-c++-cpp-output");
+                    break;
+                default:
+                    throw new Error(`Can't determine source language for file: ${sourceFile}`);
             }
             args.unshift("-x");
         }
@@ -3210,6 +3206,7 @@ class Compile extends EventEmitter__default["default"] {
         if (!fs.existsSync("/usr/bin/as")) {
             this.emit("stderr", "as doesn't exist");
         }
+        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

package/builder/fisk-builder.js

@@ -7561,7 +7561,6 @@ class ObjectCache extends EventEmitter__default["default"] {
             fs$4.readdirSync(this.dir)
                 .map((fileName) => {
                 const ret = { path: path__default["default"].join(this.dir, fileName) };
-                console.log("shit", fileName, fileName.length, ret);
                 if (fileName.length === 40) {
                     try {
                         const stat = fs$4.statSync(ret.path);
@@ -7590,7 +7589,7 @@ class ObjectCache extends EventEmitter__default["default"] {
     }
     loadFile(filePath, fileSize) {
         const fileName = path__default["default"].basename(filePath);
-        console.log("got file", filePath, fileSize);
+        // console.log("got file", filePath, fileSize);
         let fd;
         let jsonBuffer;
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@andersbakken/fisk",
-    "version": "4.0.16",
+    "version": "4.0.18",
     "description": "Fisk, a distributed compile system",
     "scripts": {
         "lint": "eslint . --ext .ts",