Update build parameters, build new version. V0.1.8 (#4)

Aksem · Mar 29, 2022 · 5083957 · 5083957
1 parent 54c14e8
commit 5083957
Show file tree

Hide file tree

Showing 9 changed files with 1,834 additions and 3,497 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/libavoid.wasm b/dist/libavoid.wasm
diff --git a/examples/lib/libavoid.js b/examples/lib/libavoid.js
diff --git a/examples/lib/libavoid.wasm b/examples/lib/libavoid.wasm
diff --git a/examples/lib/libavoid.wasm.map b/examples/lib/libavoid.wasm.map
diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "libavoid-js",
-  "version": "0.1.5",
+  "version": "0.1.8",
   "description": "JS port of libavoid library",
   "main": "dist/index.js",
   "types": "typings/libavoid.d.ts",
   "scripts": {
-    "build": "webpack",
+    "build": "webpack --mode=production",
     "api-docs": "jsdoc -c jsdoc.conf.js -d ./api_docs_build/ build/generated_debug/glue.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },

diff --git a/src/generated/libavoid.js b/src/generated/libavoid.js
diff --git a/src/generated/libavoid.wasm b/src/generated/libavoid.wasm
diff --git a/tools/generate.py b/tools/generate.py
@@ -82,9 +82,8 @@ def compile(debug=False):
   except FileExistsError:
     ...
 
-  post_js_args = ''
+  post_js_args = f' --post-js ./{generated_sources_dir}/glue.js'
   compiler_sources = ''
-  post_js_args += f' --post-js ./{generated_sources_dir}/glue.js'
   for source_file in SOURCE_FILES:
     compiler_sources += f' ./adaptagrams/cola/libavoid/{source_file}.cpp'
 
@@ -107,20 +106,37 @@ def compile(debug=False):
   if debug:
     args += ' -g4 --source-map-base http://localhost:8080/lib/ -s RUNTIME_LOGGING=1'
   else:
-    args += '-g2 -O3'
+    args += '-O3'
 
   execute_command(f"""
   docker run \
   --rm \
   -v {str(pwd)}:/src -w /src/ \
   -u {os.getuid()}:{os.getgid()} \
   emscripten/emsdk:3.1.8 \
-  emcc {args} --closure 1 -s LLD_REPORT_UNDEFINED -flto -s FILESYSTEM=0 -s MODULARIZE=1 -s EXPORT_ES6=1 -s USE_ES6_IMPORT_META=0 -s EXPORT_NAME="'initAvoidModule'" -s ALLOW_TABLE_GROWTH=1 --no-entry -Iadaptagrams/cola/ -I{generated_sources_dir}/ {compiler_sources} {post_js_args} -o {dist_dir_name}/libavoid.js
+  emcc {args} \
+    --closure 1 \
+    -s LLD_REPORT_UNDEFINED \
+    -flto \
+    -s FILESYSTEM=0 \
+    -s MODULARIZE=1 \
+    -s EXPORT_ES6=1 \
+    -s USE_ES6_IMPORT_META=0 \
+    -s EXPORT_NAME="'initAvoidModule'" \
+    -s ALLOW_TABLE_GROWTH=1 \
+    -s ENVIRONMENT="web" \
+    --no-entry \
+    -Iadaptagrams/cola/ \
+    -I{generated_sources_dir}/ \
+    {compiler_sources} \
+    {post_js_args} \
+    -o {dist_dir_name}/libavoid.js
   """, logger)
   # -s CLOSURE_WARNINGS=error .. will show all warnings and errors, but also of emcc
   # -g .. for debug, -g4 is max level with source maps for browser
   # EXPORT_NAME ...  explanation: https://stackoverflow.com/a/30153119
   # source-map-base is required for browser recognition of source maps
+  # -s STRICT=1 \
 
 
 def main():