build(emscripten): use docker image via npm scripts

rodneyrehm · rodneyrehm · commit 7053c8e18b0d · 2018-11-13T22:43:10.000+07:00
diff --git a/README.md b/README.md
@@ -43,6 +43,7 @@ Sass.js is used in the following tools:
 
 * the [sass group](https://github.com/sass), especially [team libsass](https://github.com/sass/libsass)
 * team [emscripten](https://github.com/kripken/emscripten), especially [Alon Zakai](https://github.com/kripken)
+* [Piotr Paczkowski](https://github.com/trzecieu/) for providing the [emscripten docker image](https://hub.docker.com/r/trzeci/emscripten/)
 
 
 ## License
diff --git a/docs/build.md b/docs/build.md
@@ -1,6 +1,6 @@
 # Building Sass.js
 
-To compile libsass to JS you need [emscripten](http://emscripten.org), to build Sass.js you also need [grunt](http://gruntjs.com/).
+To compile libsass to JS you need [docker](https://www.docker.com/).
 
 
 ## Preparations
@@ -13,17 +13,10 @@ cd sass.js
 npm install
 ```
 
-Install emscripten (using [Home Brew](http://brew.sh/))
-
-```bash
-brew install emscripten
-```
-
-
 ## Building everything
 
 ```bash
-grunt build
+npm run build
 
 # destination:
 #   dist/file-size.json
@@ -36,14 +29,14 @@ grunt build
 
 ### Assembling files
 
-When working with the Sass.js APIs it is not neccessary to download the libsass repository every time. The `grunt rebuild` command will compile the Sass.js the same way `grunt build` will, except it will expect the repository to already exist.
+When working with the Sass.js APIs it is not neccessary to download the libsass repository every time. The `npm run rebuild` command will compile the Sass.js the same way `npm run build` will, except it will expect the repository to already exist.
 
 ### Building in emscripten debug mode
 
 This is useful (and necessary) to identify the callstacks required to whitelist for the [Emterpreter](https://github.com/kripken/emscripten/wiki/Emterpreter#emterpreter-async-run-synchronous-code).
 
 ```bash
-grunt build:debug
+npm run build:debug
 
 # destination:
 #   dist/file-size.json
@@ -60,11 +53,11 @@ When working on the C wrapper it may be unnecessary to build the entire library,
 
 ```bash
 # import libsass repository
-grunt libsass:prepare
+npm run libsass:prepare
 # invoke emscripten
-grunt libsass:build
+npm run libsass:build
 # invoke emscripten in debug mode
-grunt libsass:debug
+npm run libsass:debug
 
 # destination:
 #   libsass/libsass/lib/libsass.js
@@ -73,7 +66,7 @@ grunt libsass:debug
 
 ## Loading the source files in the browser
 
-After cloning this repository you can run `grunt libsass:prepare libsass:build` and then run Sass.js off its source files to gain access to all components (emscripten environment, Sass.js components) in the global scope (see [`sass.source.html`](../sass.source.html)):
+After cloning this repository you can run `npm run libsass:prepare libsass:build` and then run Sass.js off its source files to gain access to all components (emscripten environment, Sass.js components) in the global scope (see [`sass.source.html`](../sass.source.html)):
 
 ```html
 <!-- you need to compile libsass.js first using `grunt libsass:prepare libsass:build` -->
diff --git a/grunt-tasks/versions.js b/grunt-tasks/versions.js
@@ -54,9 +54,10 @@ module.exports = function GruntfileVersions(grunt) {
     }
 
     var versions = grunt.config.data.versions;
-    childProcess.exec('emcc --version', function(err, stdout, stderr) {
+    var command = 'docker run --rm trzeci/emscripten:latest emcc --version'
+    childProcess.exec(command, function(err, stdout, stderr) {
       if (err) {
-        grunt.log.error('`emcc --version` failed with: ' + err.code + '\n' + stderr);
+        grunt.log.error('`' + command + '` failed with: ' + err.code + '\n' + stderr);
         return;
       }
 
diff --git a/libsass/Makefile.patch b/libsass/Makefile.patch
@@ -8,28 +8,28 @@
 +	emcc lib/libsass.a -o lib/libsass.js \
 + 		-O3 \
 +		-s EXPORTED_FUNCTIONS="['_sass_compile_emscripten']" \
-+		-s EXTRA_EXPORTED_RUNTIME_METHODS=@../exported_runtime_methods.json \
++		-s EXTRA_EXPORTED_RUNTIME_METHODS=@exported_runtime_methods.json \
 +		-s WASM=0 \
 +		-s DISABLE_EXCEPTION_CATCHING=0 \
 +		-s ALLOW_MEMORY_GROWTH=1 \
 +		-s LEGACY_VM_SUPPORT=1 \
 +		-s EMTERPRETIFY=1 \
 +		-s EMTERPRETIFY_ASYNC=1 \
-+		-s EMTERPRETIFY_WHITELIST=@../emterpreter_whitelist.json \
++		-s EMTERPRETIFY_WHITELIST=@emterpreter_whitelist.json \
 +		--memory-init-file 0
 +
 +js-debug: static
 +	emcc lib/libsass.a -o lib/libsass.js \
 +		-O0 \
 +		-s EXPORTED_FUNCTIONS="['_sass_compile_emscripten']" \
-+		-s EXTRA_EXPORTED_RUNTIME_METHODS=@../exported_runtime_methods.json \
++		-s EXTRA_EXPORTED_RUNTIME_METHODS=@exported_runtime_methods.json \
 +		-s WASM=0 \
 +		-s DISABLE_EXCEPTION_CATCHING=0 \
 +		-s ALLOW_MEMORY_GROWTH=1 \
 +		-s LEGACY_VM_SUPPORT=1 \
 +		-s EMTERPRETIFY=1 \
 +		-s EMTERPRETIFY_ASYNC=1 \
-+		-s EMTERPRETIFY_WHITELIST=@../emterpreter_whitelist.json \
++		-s EMTERPRETIFY_WHITELIST=@emterpreter_whitelist.json \
 +		-s ASSERTIONS=1 \
 +		-s SAFE_HEAP=1 \
 +		-s DEMANGLE_SUPPORT=1 \
diff --git a/libsass/build.sh b/libsass/build.sh
@@ -21,11 +21,13 @@ patch ./libsass/Makefile.conf < ./Makefile.conf.patch
 echo "  copying emscripten_wrapper"
 cp ./emscripten_wrapper.cpp ./libsass/src/emscripten_wrapper.cpp
 cp ./emscripten_wrapper.hpp ./libsass/src/emscripten_wrapper.hpp
+cp ./exported_runtime_methods.json ./libsass/exported_runtime_methods.json
+cp ./emterpreter_whitelist.json ./libsass/emterpreter_whitelist.json
 
 # build
 echo "  initializing emscripten"
 if [ "${2:-}" = "debug" ]; then
-  (cd libsass && emmake make js-debug)
+  docker run --rm --volume "$(pwd)/libsass:/src" --user="emscripten" trzeci/emscripten:latest emmake make js-debug
 else
-  (cd libsass && emmake make js)
+  docker run --rm --volume "$(pwd)/libsass:/src" --user="emscripten" trzeci/emscripten:latest emmake make js
 fi
diff --git a/package.json b/package.json
@@ -30,6 +30,13 @@
   "main": "./dist/sass.sync.js",
   "scripts": {
     "build": "grunt build",
+    "build:debug": "grunt build:debug",
+    "rebuild": "grunt rebuild",
+    "rebuild:debug": "grunt rebuild:debug",
+    "libsass:prepare": "grunt libsass:prepare",
+    "libsass:build": "grunt libsass:build",
+    "libsass:build": "grunt libsass:build",
+    "libsass:debug": "grunt libsass:debug",
     "test": "grunt test",
     "lint": "grunt lint",
     "serve": "serve ."

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,10 @@ module.exports = function GruntfileVersions(grunt) {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`var versions = grunt.config.data.versions;`
`57`		`- childProcess.exec('emcc --version', function(err, stdout, stderr) {`
	`57`	`+ var command = 'docker run --rm trzeci/emscripten:latest emcc --version'`
	`58`	`+ childProcess.exec(command, function(err, stdout, stderr) {`
`58`	`59`	`if (err) {`
`59`		- grunt.log.error('`emcc --version` failed with: ' + err.code + '\n' + stderr);
	`60`	+ grunt.log.error('`' + command + '` failed with: ' + err.code + '\n' + stderr);
`60`	`61`	`return;`
`61`	`62`	`}`
`62`	`63`