Skip to content

Adjust compilation options for compatibility #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 19 commits into
base: main
Choose a base branch
from
Draft

Adjust compilation options for compatibility #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c77d8b6
Create an action to build the wasm
Jaifroid Nov 23, 2022
4130b0f
Remove -it options due to inpput device not TTY
Jaifroid Nov 23, 2022
c6f9682
Remove -it options due to inpput device not TTY
Jaifroid Nov 23, 2022
99dbe0e
Try adding emar to emscripten-crosscompile.ini
Jaifroid Nov 24, 2022
cf376fb
Merge branch 'Create-workflow-to-build-WASM' of https://github.com/op…
Jaifroid Nov 24, 2022
9ba8894
Add step to archive build artefacts
Jaifroid Nov 24, 2022
cb4c737
Finesse descriptions
Jaifroid Nov 24, 2022
62a4e03
Allow selecting number of results in search
Jaifroid Nov 27, 2022
825a81b
Allow setting the number of results in searach
Jaifroid Nov 27, 2022
2bed692
Cross-compile to wasm32 instead of wasm64
Jaifroid Nov 28, 2022
dd6fd97
Add back workerfs.js
Jaifroid Nov 28, 2022
d6f21f4
Try compiling to ASM as well as WASM
Jaifroid Nov 28, 2022
518432b
Allow optimizations
Jaifroid Nov 28, 2022
fb8729f
Remove poorly named files
Jaifroid Nov 28, 2022
4961c06
Try without pthreads
Jaifroid Nov 28, 2022
b8a8385
Update Mekefile
Jaifroid Nov 28, 2022
38c6988
Update artefacts
Jaifroid Nov 28, 2022
e525dba
Attempt to build with IE11 support
Jaifroid Nov 28, 2022
bdb8563
Remove performance code
Jaifroid Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions .github/workflows/build_libzim_wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@ jobs:
- uses: actions/checkout@v3
- name: Build the Docker image
run: docker build -t "docker-emscripten-libzim:v3" ./docker
- name: Compile the libzim WASM
run: docker run --rm -v $(pwd):/src -u $(id -u):$(id -g) -it docker-emscripten-libzim:v3 make
- name: Publish the WASM to draft release
run: |
echo 'If the run was successful, we will build a publish action here, to publish:'
ls -l a.out.*
- name: Compile the libzim WASM artefacts
run: docker run --rm -v $(pwd):/src -u $(id -u):$(id -g) docker-emscripten-libzim:v3 make
- name: List files in top-level directory
run: ls -l
- name: Archive build artefacts
uses: actions/upload-artifact@v3
with:
name: libzim-wasm-artefacts
path: |
a.out.*
bigfile.*
19 changes: 9 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
all: demo_file_api.js big_file_demo.js
all: libzim-wasm.js libzim-asm.js
build/lib/liblzma.so :
wget -N https://tukaani.org/xz/xz-5.2.4.tar.gz
tar xf xz-5.2.4.tar.gz
cd xz-5.2.4 ; ./autogen.sh
cd xz-5.2.4 ; emconfigure ./configure --prefix=`pwd`/../build
cd xz-5.2.4 ; emconfigure ./configure --prefix=`pwd`/../build --disable-pthreads
cd xz-5.2.4 ; emmake make
cd xz-5.2.4 ; emmake make install

Expand All @@ -26,16 +26,16 @@ build/lib/libicudata.so :
tar xf icu4c-69_1-src.tgz
# It's no use trying to compile examples
sed -i -e 's/^SUBDIRS =\(.*\)$$(DATASUBDIR) $$(EXTRA) $$(SAMPLE) $$(TEST)\(.*\)/SUBDIRS =\1\2/' icu/source/Makefile.in
cd icu/source ; emconfigure ./configure --prefix=`pwd`/../../build
cd icu/source ; emconfigure ./configure --prefix=`pwd`/../../build --disable-pthreads
cd icu/source ; emmake make
cd icu/source ; emmake make install

build/lib/libxapian.a : build/lib/libz.a
wget -N https://oligarchy.co.uk/xapian/1.4.18/xapian-core-1.4.18.tar.xz
tar xf xapian-core-1.4.18.tar.xz
# Some options coming from https://github.com/xapian/xapian/tree/master/xapian-core/emscripten
#cd xapian-core-1.4.18; emconfigure ./configure --prefix=`pwd`/../build "CFLAGS=-I`pwd`/../build/include -L`pwd`/../build/lib" "CXXFLAGS=-I`pwd`/../build/include -L`pwd`/../build/lib" CPPFLAGS='-DFLINTLOCK_USE_FLOCK' CXXFLAGS='-Oz -s USE_ZLIB=1 -fno-rtti' --disable-backend-honey --disable-backend-inmemory --disable-shared --disable-backend-remote
cd xapian-core-1.4.18; emconfigure ./configure --prefix=`pwd`/../build "CFLAGS=-I`pwd`/../build/include -L`pwd`/../build/lib" "CXXFLAGS=-I`pwd`/../build/include -L`pwd`/../build/lib" --disable-shared --disable-backend-remote
# cd xapian-core-1.4.18; emconfigure ./configure --prefix=`pwd`/../build "CFLAGS=-I`pwd`/../build/include -L`pwd`/../build/lib" "CXXFLAGS=-I`pwd`/../build/include -L`pwd`/../build/lib" CPPFLAGS='-DFLINTLOCK_USE_FLOCK' CXXFLAGS='-Oz -s USE_ZLIB=1 -fno-rtti' --disable-backend-honey --disable-backend-inmemory --disable-shared --disable-backend-remote
cd xapian-core-1.4.18; emconfigure ./configure --prefix=`pwd`/../build "CFLAGS=-I`pwd`/../build/include -L`pwd`/../build/lib" "CXXFLAGS=-I`pwd`/../build/include -L`pwd`/../build/lib" --disable-shared --disable-backend-remote --disable-pthreads
cd xapian-core-1.4.18; emmake make "CFLAGS=-I`pwd`/../build/include -L`pwd`/../build/lib -std=c++11" "CXXFLAGS=-I`pwd`/../build/include -L`pwd`/../build/lib -std=c++11"
cd xapian-core-1.4.18; emmake make install

Expand All @@ -48,11 +48,11 @@ build/lib/libzim.a : build/lib/liblzma.so build/lib/libz.a build/lib/libzstd.a b
cd libzim-7.2.2; ninja -C build
cd libzim-7.2.2; ninja -C build install

demo_file_api.js: build/lib/libzim.a demo_file_api.cpp prejs_file_api.js postjs_file_api.js
em++ --bind demo_file_api.cpp -I/src/build/include -L/src/build/lib -lzim -llzma -lzstd -lxapian -lz -licui18n -licuuc -licudata -lpthread -lm -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -Wnon-virtual-dtor -Werror -std=c++11 -O0 -g --pre-js prejs_file_api.js --post-js postjs_file_api.js -s DISABLE_EXCEPTION_CATCHING=0 -s "EXPORTED_RUNTIME_METHODS=['ALLOC_NORMAL','printErr','ALLOC_STACK','print']" -s DEMANGLE_SUPPORT=1 -s TOTAL_MEMORY=83886080 -s ALLOW_MEMORY_GROWTH=1 -lworkerfs.js
libzim-wasm.js: build/lib/libzim.a libzim_bindings.cpp prejs_file_api.js postjs_file_api.js
em++ -o libzim-wasm.js --bind libzim_bindings.cpp -I/src/build/include -L/src/build/lib -lzim -llzma -lzstd -lxapian -lz -licui18n -licuuc -licudata -lm -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -Wnon-virtual-dtor -std=c++11 -O2 --pre-js prejs_file_api.js --post-js postjs_file_api.js -s WASM=1 -s DISABLE_EXCEPTION_CATCHING=0 -s "EXPORTED_RUNTIME_METHODS=['ALLOC_NORMAL','printErr','ALLOC_STACK','print']" -s DEMANGLE_SUPPORT=1 -s TOTAL_MEMORY=83886080 -s ALLOW_MEMORY_GROWTH=1 -lworkerfs.js

big_file_demo.js:
em++ --bind -std=c++11 -O0 --pre-js prejs_file_api_testbigfile.js --post-js postjs_file_api_testbigfile.js big_file_test.cpp -lworkerfs.js -o bigfile.js
libzim-asm.js: build/lib/libzim.a libzim_bindings.cpp prejs_file_api.js postjs_file_api.js
em++ -o libzim-asm.js --bind libzim_bindings.cpp -I/src/build/include -L/src/build/lib -lzim -llzma -lzstd -lxapian -lz -licui18n -licuuc -licudata -lm -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -Wnon-virtual-dtor -std=c++11 -O2 --pre-js prejs_file_api.js --post-js postjs_file_api.js -mno-atomics --memory-init-file 0 -s WASM=0 -s DISABLE_EXCEPTION_CATCHING=0 -s MIN_IE_VERSION=11 -s "EXPORTED_RUNTIME_METHODS=['ALLOC_NORMAL','printErr','ALLOC_STACK','print']" -s DEMANGLE_SUPPORT=1 -s USE_PTHREADS=0 -s TOTAL_MEMORY=83886080 -s ALLOW_MEMORY_GROWTH=1 -lworkerfs.js

clean :
rm -rf xz-*
Expand All @@ -62,6 +62,5 @@ clean :
rm -rf icu*
rm -rf libzim-*
rm -rf build
rm a.out.*

.PHONY : all clean
Loading