Enable the asmjs build using the new module system

.travis.yml

@@ -49,12 +49,14 @@ before_script:
 - (source make-it/travis-support/setup-env.sh && make vjs)
 - (source make-it/travis-support/setup-env.sh && make vjs BUILD=debug)
 - (source make-it/travis-support/setup-env.sh && make vjs BUILD=profile)
+- (source make-it/travis-support/setup-env.sh && make vjs BUILD=release TARGET=asmjs-unknown-emscripten)
 - tar -tf $(npm pack)
 script:
 - make testjs
 - make testnative
 - make testhttpbin
 - npm run test-min
+- npm run test-asmjs
 after_failure:
 - cat emsdk-tools/emsdk_install_log.txt
 before_deploy:

karma.asmjs.conf.js

@@ -0,0 +1,21 @@
+// Karma configuration
+
+(function () {
+    'use strict';
+
+    module.exports = function (config) {
+        var getSharedConfig = require('./karma.shared.js');
+        var sharedConfig = getSharedConfig(config);
+
+        sharedConfig.files = [
+            ...sharedConfig.filesPolyfills,
+            ...sharedConfig.filesInfrastructure,
+            'dist/asmjs-unknown-emscripten/release/vireo.min.js',
+            ...sharedConfig.filesSource,
+            ...sharedConfig.filesFixtures,
+            ...sharedConfig.filesSpecs
+        ];
+
+        config.set(sharedConfig);
+    };
+}());

karma.conf.js

@@ -11,6 +11,10 @@
             ...sharedConfig.filesPolyfills,
             ...sharedConfig.filesInfrastructure,
             'dist/wasm32-unknown-emscripten/release/vireo.js',
+            {
+                pattern: 'dist/wasm32-unknown-emscripten/release/vireo.core.wasm',
+                included: false
+            },
             ...sharedConfig.filesSource,
             ...sharedConfig.filesFixtures,
             ...sharedConfig.filesSpecs

karma.coverage.conf.js

@@ -11,6 +11,10 @@
             ...sharedConfig.filesPolyfills,
             ...sharedConfig.filesInfrastructure,
             'dist/wasm32-unknown-emscripten/release/vireo.js',
+            {
+                pattern: 'dist/wasm32-unknown-emscripten/release/vireo.core.wasm',
+                included: false
+            },
             ...sharedConfig.filesSource,
             ...sharedConfig.filesFixtures,
             ...sharedConfig.filesSpecs

karma.debug.conf.js

@@ -11,6 +11,10 @@
             ...sharedConfig.filesPolyfills,
             ...sharedConfig.filesInfrastructure,
             'dist/wasm32-unknown-emscripten/debug/vireo.js',
+            {
+                pattern: 'dist/wasm32-unknown-emscripten/debug/vireo.core.wasm',
+                included: false
+            },
             ...sharedConfig.filesSource,
             ...sharedConfig.filesFixtures,
             ...sharedConfig.filesSpecs

karma.min.conf.js

@@ -11,6 +11,10 @@
             ...sharedConfig.filesPolyfills,
             ...sharedConfig.filesInfrastructure,
             'dist/wasm32-unknown-emscripten/release/vireo.min.js',
+            {
+                pattern: 'dist/wasm32-unknown-emscripten/release/vireo.core.wasm',
+                included: false
+            },
             ...sharedConfig.filesSource,
             ...sharedConfig.filesFixtures,
             ...sharedConfig.filesSpecs

karma.shared.js

@@ -23,10 +23,6 @@
             ],
 
             filesSource: [
-                {
-                    pattern: 'dist/wasm32-unknown-emscripten/*/vireo.core.wasm',
-                    included: false
-                }
             ],
 
             filesFixtures: [

make-it/EmMakefile

@@ -6,7 +6,7 @@ MKDIR="mkdir"
 
 VIREO_SDK=..
 
-TARGETS_SUPPORTED=wasm32-unknown-emscripten
+TARGETS_SUPPORTED=asmjs-unknown-emscripten wasm32-unknown-emscripten
 TARGET=wasm32-unknown-emscripten
 
 ifeq ($(filter $(TARGET), $(TARGETS_SUPPORTED)),)
@@ -84,12 +84,16 @@ endif
 EM_OPTFLAGS ?= $(EM_OPTFLAG)
 EM_ANALYSIS_OPT_FLAG = $(EM_OPTFLAG)
 
+ifeq ($(TARGET), asmjs-unknown-emscripten)
+   TARGET_FLAG = -s WASM=0
+endif
+
 ifeq ($(TARGET), wasm32-unknown-emscripten)
-   WASM_FLAG = -s WASM=1
+   TARGET_FLAG = -s WASM=1 -s BINARYEN_TRAP_MODE=js -s ALLOW_MEMORY_GROWTH=1
 endif
 
 # NO_DYNAMIC_EXECUTION=1 Allows Vireo to be used in CSP environments where eval() is forbidden: https://github.com/kripken/emscripten/blob/master/src/settings.js#L563
-EM_OPT = $(EM_OPTFLAGS) $(WASM_FLAG) -s NO_EXIT_RUNTIME=1 -std=c++14 -fno-exceptions --memory-init-file 0 -s NO_DYNAMIC_EXECUTION=1 -s MODULARIZE=1 -s EXPORT_NAME=VireoCreateCoreModule -s EXPORT_ES6=1 --minify 0 -s BINARYEN_TRAP_MODE=js -s ALLOW_MEMORY_GROWTH=1
+EM_OPT = $(EM_OPTFLAGS) $(TARGET_FLAG) -s NO_EXIT_RUNTIME=1 -std=c++14 -fno-exceptions --memory-init-file 0 -s NO_DYNAMIC_EXECUTION=1 -s MODULARIZE=1 -s EXPORT_NAME=VireoCreateCoreModule -s EXPORT_ES6=1 --minify 0
 EMFLAGS = -I$(INCDIR) -DkVireoOS_emscripten $(EM_OPT)
 EMLIBRARY = --js-library $(CORESOURCEDIR)/library_coreHelpers.js \
             --js-library $(CORESOURCEDIR)/library_eventHelpers.js \
@@ -252,7 +256,7 @@ $(DIST)/vireo.core.js: $(EM_BC_FILES) $(ANALYSIS_LIBRARY) $(PREJS) $(POSTJS) | $
 	$(EMCC) $(EM_OPT) $(EM_WRAP) $(EMLIBRARY) $(EM_BC_FILES) $(ANALYSIS_LIBRARY) $(EM_EXPORTS) $(EM_RUNTIME_EXPORTS) -o $@
 
 $(DIST)/vireo.js: $(DIST)/vireo.core.js $(JS_SOURCE_FILES)
-	npm run rollup -- $(CORESOURCEDIR)/vireo.loader.$(BUILD).js --format umd --name vireoHelpers --amd.id vireoHelpers --file $@
+	npm run rollup -- $(CORESOURCEDIR)/vireo.loader.$(TARGET).$(BUILD).js --format umd --name vireoHelpers --amd.id vireoHelpers --file $@
 
 $(DIST)/vireo.min.js: $(DIST)/vireo.js
 	npm run terser -- $(DIST)/vireo.js -o $@

package.json

@@ -33,6 +33,7 @@
     "test-dev": "karma start --browsers ChromeHeadlessNoSandbox --skip-tags Slow",
     "test-manual": "karma start --no-single-run",
     "test-coverage": "karma start karma.coverage.conf.js",
+    "test-asmjs": "karma start karma.asmjs.conf.js --browsers ChromeHeadlessNoSandbox,FirefoxHeadless",
     "lint": "eslint .",
     "prehttpbin": "python -V && pip -V && virtualenv --version && tox --version",
     "httpbin": "tox",

source/core/vireo.loader.asmjs-unknown-emscripten.debug.js

@@ -0,0 +1,10 @@
+
+import createVireoCore from '../../dist/asmjs-unknown-emscripten/debug/vireo.core.js';
+import createInstanceUnbound from './vireo.loader.shared.js';
+import staticHelpers from './vireo.loader.staticHelpers.js';
+
+const createInstance = createInstanceUnbound.bind(undefined, createVireoCore);
+export default {
+    createInstance,
+    staticHelpers
+};

source/core/vireo.loader.asmjs-unknown-emscripten.profile.js

@@ -0,0 +1,10 @@
+
+import createVireoCore from '../../dist/asmjs-unknown-emscripten/profile/vireo.core.js';
+import createInstanceUnbound from './vireo.loader.shared.js';
+import staticHelpers from './vireo.loader.staticHelpers.js';
+
+const createInstance = createInstanceUnbound.bind(undefined, createVireoCore);
+export default {
+    createInstance,
+    staticHelpers
+};

source/core/vireo.loader.asmjs-unknown-emscripten.release.js

@@ -0,0 +1,10 @@
+
+import createVireoCore from '../../dist/asmjs-unknown-emscripten/release/vireo.core.js';
+import createInstanceUnbound from './vireo.loader.shared.js';
+import staticHelpers from './vireo.loader.staticHelpers.js';
+
+const createInstance = createInstanceUnbound.bind(undefined, createVireoCore);
+export default {
+    createInstance,
+    staticHelpers
+};