diff --git a/.github/workflows/build_libzim_wasm.yml b/.github/workflows/build_libzim_wasm.yml index fbe24d0..37e66c8 100644 --- a/.github/workflows/build_libzim_wasm.yml +++ b/.github/workflows/build_libzim_wasm.yml @@ -53,8 +53,9 @@ jobs: # Customizes the Emscripten docker container via the Dockerfile in this repo - name: Build the Docker image run: | + # Sometimes it might be necessary to use a different version of EMSDK for different scenarios if [[ $BUILD_TYPE =~ 'source' ]]; then - BUILD_VERSION='3.1.12' + BUILD_VERSION='3.1.41' else BUILD_VERSION='3.1.41' fi diff --git a/Makefile b/Makefile index 33c0220..ec29650 100644 --- a/Makefile +++ b/Makefile @@ -69,13 +69,13 @@ build/lib/libxapian.a : build/lib/libz.a build/lib/libzim.a : build/lib/liblzma.so build/lib/libz.a build/lib/libzstd.a build/lib/libicudata.so build/lib/libxapian.a # Origin: wget -N --content-disposition https://github.com/openzim/libzim/archive/7.2.2.tar.gz - [ ! -f libzim-*.tar.xz ] && wget -N https://download.openzim.org/release/libzim/libzim-8.1.0.tar.xz || true - tar xf libzim-8.1.0.tar.xz + [ ! -f libzim-*.tar.xz ] && wget -N https://download.openzim.org/release/libzim/libzim-8.2.0.tar.xz || true + tar xf libzim-8.2.0.tar.xz # It's no use trying to compile examples - sed -i -e "s/^subdir('examples')//" libzim-8.1.0/meson.build - cd libzim-8.1.0; PKG_CONFIG_PATH=/src/build/lib/pkgconfig meson --prefix=`pwd`/../build --cross-file=../emscripten-crosscompile.ini . build -DUSE_MMAP=false - cd libzim-8.1.0; ninja -C build - cd libzim-8.1.0; ninja -C build install + sed -i -e "s/^subdir('examples')//" libzim-8.2.0/meson.build + cd libzim-8.2.0; PKG_CONFIG_PATH=/src/build/lib/pkgconfig meson --prefix=`pwd`/../build --cross-file=../emscripten-crosscompile.ini . build -DUSE_MMAP=false + cd libzim-8.2.0; ninja -C build + cd libzim-8.2.0; ninja -C build install # Development WASM version for testing with WORKERFS and NODEFS, completely unoptimized libzim-wasm.dev.js: libzim_bindings.cpp prejs_file_api.js postjs_file_api.js