Automatically detect and use Skulpt distribution.

Author: rixner

package.json

@@ -19,7 +19,7 @@
     "btest": "node support/run/brun.js -t",
     "doc": "echo 'Building Documentation in docs/ProgMan' && jsdoc -c jsdoc.json HACKING.md",
     "dist": "npm run build && npm run testopt && npm run test3opt && npm run doc && node support/build/copy2docs.js",
-    "repl": "npm run devbuild && node repl/repl.js dist/skulpt.js",
+    "repl": "node repl/repl.js",
     "prebuild": "node support/build/wrapmodules.js internal",
     "build": "webpack --mode production",
     "postbuild": "node support/build/wrapmodules.js builtin",
@@ -31,15 +31,11 @@
     "testopt": "node test/testwrapper.js -o && node test/testunit.js -o",
     "test3": "node test/testunit.js skulpt.js --python3",
     "test3opt": "node test/testunit.js -o --python3",
-    "run": "node test/runfile.js -p",
-    "run3": "node test/runfile.js --python3 -p",
-    "runopt": "node test/runfile.js -o -p",
-    "run3opt": "node test/runfile.js -o --python3 -p",
-    "preprofile": "npm run build",
-    "profile": "node --prof --no-logfile-per-isolate --log-internal-timer-events test/runfile.js -o -p",
+    "run": "node support/run/runfile.js -p",
+    "run3": "node support/run/runfile.js --python3 -p",
+    "profile": "node --prof --no-logfile-per-isolate --log-internal-timer-events support/run/runfile.js -o -p",
     "postprofile": "node --prof-process v8.log",
-    "preprofile3": "npm run build",
-    "profile3": "node --prof --no-logfile-per-isolate --log-internal-timer-events test/runfile.js -o --python3 -p",
+    "profile3": "node --prof --no-logfile-per-isolate --log-internal-timer-events support/run/runfile.js -o --python3 -p",
     "postprofile3": "node --prof-process v8.log"
   },
   "repository": {

repl/repl.js

@@ -1,4 +1,10 @@
-require('../' + process.argv[2]);
+const reqskulpt = require('../support/run/require-skulpt').requireSkulpt;
+
+// Import Skulpt
+var skulpt = reqskulpt(false);
+if (skulpt === null) {
+    process.exit(1);
+}
 
 var readlineSync = require('readline-sync');
 var fs = require('fs');

support/run/require-skulpt.js

@@ -0,0 +1,27 @@
+const chalk = require('chalk');
+
+module.exports = {
+    requireSkulpt: function (requireOptimized) {
+        var skulpt;
+
+        try {
+            skulpt = require("../../dist/skulpt.min.js");
+            console.log(chalk.green("Using skulpt.min.js"));
+        } catch (err) {
+            if (requireOptimized) {
+                skulpt = null;
+                console.log(chalk.red("No optimized skulpt distribution, run 'npm run build' first."));
+            } else {
+                try {
+                    skulpt = require("../../dist/skulpt.js");
+                    console.log(chalk.blue("Using skulpt.js"));
+                } catch (err) {
+                    skulpt = null;
+                    console.log(chalk.red("No skulpt distribution, run 'npm run build' or 'npm run devbuild' first."));
+                }
+            }
+        }
+
+        return skulpt;
+    }
+}

test/runfile.js renamed to support/run/runfile.js

@@ -1,14 +1,15 @@
 const fs = require('fs');
 const path = require('path');
 const program = require('commander');
+const reqskulpt = require('./require-skulpt').requireSkulpt;
 
 function run (python3, opt, filename) {
     // Import Skulpt
-    var skulptname = 'skulpt.js';
-    if (opt) {
-	skulptname = 'skulpt.min.js';
+    var skulpt = reqskulpt(opt);
+    if (skulpt === null) {
+	process.exit(1);
     }
-    require('../dist/' + skulptname);
+
     Sk.js_beautify = require('js-beautify').js;
 
     var pyver, starttime, endtime, elapsed;

test/testunit.js

@@ -1,16 +1,17 @@
 const fs = require('fs');
 const path = require('path');
 const program = require('commander');
+const reqskulpt = require('../support/run/require-skulpt').requireSkulpt;
 
 function test (python3, opt) {
     var startime, endtime, elapsed;
 
     // Import Skulpt
-    var skulptname = 'skulpt.js';
-    if (opt) {
-        skulptname = 'skulpt.min.js';
+    var skulpt = reqskulpt(false);
+    if (skulpt === null) {
+	process.exit(1);
     }
-    require('../dist/' + skulptname);
+    
     Sk.js_beautify = require('js-beautify').js;
 
     // Setup for appropriate Python version

test/testwrapper.js

@@ -1,16 +1,10 @@
-const program = require('commander');
-
-program
-    .option('-o, --opt', 'use optimized skulpt')
-    .parse(process.argv);
+const reqskulpt = require('../support/run/require-skulpt').requireSkulpt;
 
 // Import Skulpt
-var skulptname = 'skulpt.js';
-if (program.opt) {
-    skulptname = 'skulpt.min.js';
+var skulpt = reqskulpt(false);
+if (skulpt === null) {
+    process.exit(1);
 }
-require('../dist/' + skulptname);
 
 // Run tests
 require('./test.js');
-