From cd67cb17e58e9e33f21c9ef2a2cdb77ca086a9c9 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 15 Jan 2015 10:59:06 +0100 Subject: [PATCH] Emscripten: add a file to mark that the build completed, for libsodium.js --- .gitignore | 1 + dist-build/emscripten.sh | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7b0488c8..55696804 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ src/curvecp/curvecpserver src/libsodium/*.def src/libsodium/include/sodium/version.h stamp-* +test/js.done test/default/*.res test/default/*.trs test/default/aead_chacha20poly1305 diff --git a/dist-build/emscripten.sh b/dist-build/emscripten.sh index d5c672cf..962d3fe7 100755 --- a/dist-build/emscripten.sh +++ b/dist-build/emscripten.sh @@ -7,6 +7,8 @@ export TOTAL_MEMORY=33554432 export JS_EXPORTS_FLAGS="-s EXPORTED_FUNCTIONS=${EXPORTED_FUNCTIONS}" export LDFLAGS="-s TOTAL_MEMORY=${TOTAL_MEMORY}" +rm -f test/js.done + emconfigure ./configure --enable-minimal --disable-shared --prefix="$PREFIX" \ CFLAGS="-O3" && \ emmake make clean && \ @@ -45,4 +47,6 @@ echo 'sodium_utils2 and sodium_utils3 are expected to fail in Javascript.' mv -f "${file}.tmp" "$file" done ) -make $MAKE_FLAGS check && echo 'Done.' +make $MAKE_FLAGS check +echo 'Done.' +touch -r "${PREFIX}/lib/libsodium.js" test/js.done