Move prebuilt js files into 'lib'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a21cb4..a2cedbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,8 +167,8 @@
INSTALL(TARGETS binaryen DESTINATION ${CMAKE_INSTALL_LIBDIR})
INSTALL(FILES src/binaryen-c.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-INSTALL(FILES bin/wasm.js DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
-INSTALL(FILES bin/binaryen.js DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
+INSTALL(FILES lib/wasm.js DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
+INSTALL(FILES lib/binaryen.js DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
SET(wasm-shell_SOURCES
src/tools/wasm-shell.cpp
diff --git a/build-js.sh b/build-js.sh
index 037fed1..a326eca 100755
--- a/build-js.sh
+++ b/build-js.sh
@@ -63,6 +63,7 @@
# output binaries relative to current working directory
BINARYEN_BIN="$PWD/bin"
+BINARYEN_LIB="$PWD/lib"
echo "building shared bitcode"
@@ -147,7 +148,7 @@
$BINARYEN_SRC/wasm-js.cpp \
shared.bc \
-I$BINARYEN_SRC/ \
- -o $BINARYEN_BIN/wasm${OUT_FILE_SUFFIX}.js \
+ -o $BINARYEN_LIB/wasm${OUT_FILE_SUFFIX}.js \
-s MODULARIZE=1 \
-s 'EXTRA_EXPORTED_RUNTIME_METHODS=["writeAsciiToMemory"]' \
-s 'EXPORT_NAME="WasmJS"'
@@ -600,7 +601,7 @@
shared.bc \
-I$BINARYEN_SRC/ \
-s EXPORTED_FUNCTIONS=[${EXPORTED_FUNCTIONS}] \
- -o $BINARYEN_BIN/binaryen${OUT_FILE_SUFFIX}.js \
+ -o $BINARYEN_LIB/binaryen${OUT_FILE_SUFFIX}.js \
-s MODULARIZE_INSTANCE=1 \
-s 'EXPORT_NAME="Binaryen"' \
--post-js $BINARYEN_SRC/js/binaryen.js-post.js
diff --git a/check.py b/check.py
index fef48a9..a65d447 100755
--- a/check.py
+++ b/check.py
@@ -357,7 +357,7 @@
if not s.endswith('.js'): continue
print s
f = open('a.js', 'w')
- binaryen_js = open(os.path.join(options.binaryen_root, 'bin', 'binaryen.js')).read()
+ binaryen_js = open(os.path.join(options.binaryen_root, 'lib', 'binaryen.js')).read()
f.write(binaryen_js)
if NODEJS:
f.write(node_test_glue())
diff --git a/bin/binaryen.js b/lib/binaryen.js
similarity index 100%
rename from bin/binaryen.js
rename to lib/binaryen.js
diff --git a/bin/wasm.js b/lib/wasm.js
similarity index 100%
rename from bin/wasm.js
rename to lib/wasm.js
