From 2c4c51810c88ba33e7f57541407cda31ce6b2a31 Mon Sep 17 00:00:00 2001 From: jaifroid Date: Fri, 23 Jun 2023 10:50:55 +0100 Subject: [PATCH 1/3] Update libzim version for source build to 8.2.0 --- .github/workflows/build_libzim_wasm.yml | 3 ++- Makefile | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) 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 From c446892e4c567225e6fe6aaa2aa00ace656b0c0b Mon Sep 17 00:00:00 2001 From: jaifroid Date: Fri, 23 Jun 2023 10:55:48 +0100 Subject: [PATCH 2/3] Try to make commands generic --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ec29650..daa592e 100644 --- a/Makefile +++ b/Makefile @@ -70,12 +70,12 @@ 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.2.0.tar.xz || true - tar xf libzim-8.2.0.tar.xz + tar xf libzim-*.tar.xz # It's no use trying to compile examples - 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 + sed -i -e "s/^subdir('examples')//" libzim-*/meson.build + cd libzim-*; PKG_CONFIG_PATH=/src/build/lib/pkgconfig meson --prefix=`pwd`/../build --cross-file=../emscripten-crosscompile.ini . build -DUSE_MMAP=false + cd libzim-*; ninja -C build + cd libzim-*; 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 From 1e108b66b065f1621b2ad1293b7a2177b553f62c Mon Sep 17 00:00:00 2001 From: Jaifroid Date: Fri, 23 Jun 2023 11:26:56 +0100 Subject: [PATCH 3/3] Revert "Try to make commands generic" This reverts commit c446892e4c567225e6fe6aaa2aa00ace656b0c0b. --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index daa592e..ec29650 100644 --- a/Makefile +++ b/Makefile @@ -70,12 +70,12 @@ 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.2.0.tar.xz || true - tar xf libzim-*.tar.xz + tar xf libzim-8.2.0.tar.xz # It's no use trying to compile examples - sed -i -e "s/^subdir('examples')//" libzim-*/meson.build - cd libzim-*; PKG_CONFIG_PATH=/src/build/lib/pkgconfig meson --prefix=`pwd`/../build --cross-file=../emscripten-crosscompile.ini . build -DUSE_MMAP=false - cd libzim-*; ninja -C build - cd libzim-*; 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