Skip to content

Commit dca66dc

Browse files
authored
Add Emscripten static library build CppInterOp
1 parent bc728d3 commit dca66dc

File tree

2 files changed

+241
-4
lines changed

2 files changed

+241
-4
lines changed

.github/workflows/emscripten.yml

Lines changed: 234 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ jobs:
460460
${{ matrix.cling=='On' && 'cling' || '' }}
461461
key: ${{ env.CLING_HASH }}-${{ runner.os }}-${{ matrix.os }}-clang-${{ matrix.clang-runtime }}.x-emscripten
462462

463-
- name: Emscripten build of CppInterOp on Unix systems
463+
- name: Emscripten build of CppInterOp on Unix systems (shared library)
464464
if: ${{ runner.os != 'windows' }}
465465
shell: bash -l {0}
466466
run: |
@@ -615,14 +615,165 @@ jobs:
615615
echo "LLVM_BUILD_DIR=$LLVM_BUILD_DIR" >> $GITHUB_ENV
616616
echo "CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH" >> $GITHUB_ENV
617617
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
618+
619+
- name: Emscripten build of CppInterOp on Unix systems (static library)
620+
if: ${{ runner.os != 'windows' }}
621+
shell: bash -l {0}
622+
run: |
623+
set -e
624+
./emsdk/emsdk activate ${{matrix.emsdk_ver}}
625+
source ./emsdk/emsdk_env.sh
626+
export SYSROOT_PATH=$PWD/emsdk/upstream/emscripten/cache/sysroot
627+
export PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm
628+
export CMAKE_PREFIX_PATH=$PREFIX
629+
export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
630+
631+
LLVM_DIR="$(pwd)/llvm-project"
632+
LLVM_BUILD_DIR="$(pwd)/llvm-project/build"
633+
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
634+
if [[ "${cling_on}" == "ON" ]]; then
635+
CLING_DIR="$(pwd)/cling"
636+
CLING_BUILD_DIR="$(pwd)/cling/build"
637+
CPLUS_INCLUDE_PATH="${CLING_DIR}/tools/cling/include:${CLING_BUILD_DIR}/include:${LLVM_DIR}/llvm/include:${LLVM_DIR}/clang/include:${LLVM_BUILD_DIR}/include:${LLVM_BUILD_DIR}/tools/clang/include:$PWD/include"
638+
else
639+
CPLUS_INCLUDE_PATH="${LLVM_DIR}/llvm/include:${LLVM_DIR}/clang/include:${LLVM_BUILD_DIR}/include:${LLVM_BUILD_DIR}/tools/clang/include:$PWD/include"
640+
fi
641+
642+
# Build CppInterOp next to cling and llvm-project.
643+
mkdir build_static
644+
cd build_static
645+
if [[ "${cling_on}" == "ON" ]]; then
646+
emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
647+
-DCPPINTEROP_USE_CLING=ON \
648+
-DCPPINTEROP_USE_REPL=OFF \
649+
-DCMAKE_PREFIX_PATH=$PREFIX \
650+
-DCling_DIR=$LLVM_BUILD_DIR/tools/cling \
651+
-DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm \
652+
-DLLD_DIR=$LLVM_BUILD_DIR/lib/cmake/lld \
653+
-DClang_DIR=$LLVM_BUILD_DIR/lib/cmake/clang \
654+
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
655+
-DCMAKE_INSTALL_PREFIX=$PREFIX \
656+
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
657+
-DLLVM_ENABLE_WERROR=On \
658+
-DSYSROOT_PATH=$SYSROOT_PATH \
659+
../
660+
else
661+
emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
662+
-DCMAKE_PREFIX_PATH=$PREFIX \
663+
-DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm \
664+
-DLLD_DIR=$LLVM_BUILD_DIR/lib/cmake/lld \
665+
-DClang_DIR=$LLVM_BUILD_DIR/lib/cmake/clang \
666+
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
667+
-DCMAKE_INSTALL_PREFIX=$PREFIX \
668+
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
669+
-DLLVM_ENABLE_WERROR=On \
670+
-DSYSROOT_PATH=$SYSROOT_PATH \
671+
../
672+
fi
673+
674+
emmake make -j ${{ env.ncpus }} check-cppinterop
675+
cd ./unittests/CppInterOp/
676+
# Fresh install browsers, and run Emscripten tests in them
677+
# This is to match the Emscripten build instructions, where
678+
# we run in a fresh browser, to stop any extra installed
679+
# stuff interferring with the running of the tests
680+
# Explaination of options for emrun
681+
# --browser (name of browser on path)
682+
# --kill_exit makes it so that when emrun finishes,
683+
# that the headless browser we create is killed along with it
684+
# --timeout 60 is such that emrun is killed after 60 seconds if
685+
# still running. emrun should have finished long before then,
686+
# so if it is still running, something went wrong (such as a test
687+
# which crashed the html file). This will cause the ci to fail,
688+
# as a non 0 value of will be returned.
689+
# In the case of Chrome we have the extra --no-sandbox flag, as on
690+
# Ubuntu Chrome will refuse to run otherwise, as it expects to have
691+
# been installed with admin privileges. This flag allows it to run
692+
# in userspace.
693+
os="${{ matrix.os }}"
694+
if [[ "${os}" == "macos"* ]]; then
695+
# Install Firefox
696+
wget "https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US" -O Firefox-latest.dmg
697+
hdiutil attach Firefox-latest.dmg
698+
cp -r /Volumes/Firefox/Firefox.app $PWD
699+
hdiutil detach /Volumes/Firefox
700+
cd ./Firefox.app/Contents/MacOS/
701+
export PATH="$PWD:$PATH"
702+
cd -
703+
704+
# Install Google Chrome
705+
wget https://dl.google.com/chrome/mac/stable/accept_tos%3Dhttps%253A%252F%252Fwww.google.com%252Fintl%252Fen_ph%252Fchrome%252Fterms%252F%26_and_accept_tos%3Dhttps%253A%252F%252Fpolicies.google.com%252Fterms/googlechrome.pkg
706+
pkgutil --expand-full googlechrome.pkg google-chrome
707+
cd ./google-chrome/GoogleChrome.pkg/Payload/Google\ Chrome.app/Contents/MacOS/
708+
export PATH="$PWD:$PATH"
709+
cd -
710+
711+
# Run tests in browsers
712+
echo "Running CppInterOpTests in Firefox"
713+
emrun --browser="firefox" --kill_exit --timeout 60 --browser-args="--headless" CppInterOpTests.html
714+
echo "Running DynamicLibraryManagerTests in Firefox"
715+
emrun --browser="firefox" --kill_exit --timeout 60 --browser-args="--headless" DynamicLibraryManagerTests.html
716+
echo "Running CppInterOpTests in Google Chrome"
717+
emrun --browser="Google Chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox" CppInterOpTests.html
718+
echo "Running DynamicLibraryManagerTests in Google Chrome"
719+
emrun --browser="Google Chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox" DynamicLibraryManagerTests.html
720+
else
721+
export ARCHITECHURE=$(uname -m)
722+
if [[ "$ARCHITECHURE" != "aarch64" ]]; then
723+
# Install Google Chrome
724+
wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
725+
dpkg-deb -x google-chrome-stable_current_amd64.deb $PWD/chrome
726+
cd ./chrome/opt/google/chrome/
727+
export PATH="$PWD:$PATH"
728+
cd -
729+
730+
# Install Firefox
731+
wget https://ftp.mozilla.org/pub/firefox/releases/138.0.1/linux-x86_64/en-GB/firefox-138.0.1.tar.xz
732+
tar -xJf firefox-138.0.1.tar.xz
733+
cd ./firefox
734+
export PATH="$PWD:$PATH"
735+
cd -
736+
737+
# Run tests in browsers
738+
echo "Running CppInterOpTests in Firefox"
739+
emrun --browser="firefox" --kill_exit --timeout 60 --browser-args="--headless" CppInterOpTests.html
740+
echo "Running DynamicLibraryManagerTests in Firefox"
741+
emrun --browser="firefox" --kill_exit --timeout 60 --browser-args="--headless" DynamicLibraryManagerTests.html
742+
echo "Running CppInterOpTests in Google Chrome"
743+
emrun --browser="google-chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox" CppInterOpTests.html
744+
echo "Running DynamicLibraryManagerTests in Google Chrome"
745+
emrun --browser="google-chrome" --kill_exit --timeout 60 --browser-args="--headless --no-sandbox" DynamicLibraryManagerTests.html
746+
else
747+
# Install Firefox
748+
wget https://ftp.mozilla.org/pub/firefox/releases/138.0.1/linux-aarch64/en-GB/firefox-138.0.1.tar.xz
749+
tar -xJf firefox-138.0.1.tar.xz
750+
cd ./firefox
751+
export PATH="$PWD:$PATH"
752+
cd -
753+
754+
# Run tests in browsers
755+
echo "Running CppInterOpTests in Firefox"
756+
emrun --browser="firefox" --kill_exit --timeout 60 --browser-args="--headless" CppInterOpTests.html
757+
echo "Running DynamicLibraryManagerTests in Firefox"
758+
emrun --browser="firefox" --kill_exit --timeout 60 --browser-args="--headless" DynamicLibraryManagerTests.html
759+
fi
760+
fi
761+
cd ../../..
762+
763+
echo "SYSROOT_PATH=$SYSROOT_PATH" >> $GITHUB_ENV
764+
echo "CB_PYTHON_DIR=$CB_PYTHON_DIR" >> $GITHUB_ENV
765+
echo "CPPINTEROP_DIR=$CPPINTEROP_DIR" >> $GITHUB_ENV
766+
echo "LLVM_BUILD_DIR=$LLVM_BUILD_DIR" >> $GITHUB_ENV
767+
echo "CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH" >> $GITHUB_ENV
768+
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
618769
619770
- name: micromamba shell hook
620771
if: ${{ runner.os == 'windows' }}
621772
shell: powershell
622773
run: |
623774
micromamba shell hook -s cmd.exe --root-prefix C:\Users\runneradmin\micromamba-root
624775
625-
- name: Build and Test/Install CppInterOp on Windows systems
776+
- name: Build and Test/Install CppInterOp on Windows systems (shared library)
626777
continue-on-error: true
627778
if: ${{ runner.os == 'windows' }}
628779
shell: powershell
@@ -707,7 +858,88 @@ jobs:
707858
}
708859
emmake make -j ${{ env.ncpus }} check-cppinterop
709860
emmake make -j ${{ env.ncpus }} install
861+
862+
- name: Build and Test/Install CppInterOp on Windows systems (static library)
863+
continue-on-error: true
864+
if: ${{ runner.os == 'windows' }}
865+
shell: powershell
866+
run: |
867+
$ErrorActionPreference = "Stop"
868+
.\emsdk\emsdk activate ${{matrix.emsdk_ver}}
869+
.\emsdk\emsdk_env.ps1
870+
$env:PWD_DIR= $PWD.Path
871+
$env:SYSROOT_PATH="$env:EMSDK/upstream/emscripten/cache/sysroot"
872+
$env:PREFIX="%CONDA_PREFIX%/envs/CppInterOp-wasm"
873+
$env:CMAKE_PREFIX_PATH=$env:PREFIX
874+
$env:CMAKE_SYSTEM_PREFIX_PATH=$env:PREFIX
710875
876+
$env:LLVM_DIR="$env:PWD_DIR\llvm-project"
877+
echo "LLVM_DIR=$env:LLVM_DIR"
878+
echo "LLVM_DIR=$env:LLVM_DIR" >> $env:GITHUB_ENV
879+
880+
$env:LLVM_BUILD_DIR="$env:PWD_DIR\llvm-project\build"
881+
echo "LLVM_BUILD_DIR=$env:LLVM_BUILD_DIR"
882+
echo "LLVM_BUILD_DIR=$env:LLVM_BUILD_DIR" >> $env:GITHUB_ENV
883+
884+
if ( "${{ matrix.cling }}" -imatch "On" )
885+
{
886+
$env:CLING_DIR="$env:PWD_DIR\cling"
887+
echo "CLING_DIR=$env:CLING_DIR"
888+
echo "CLING_DIR=$env:CLING_DIR" >> $env:GITHUB_ENV
889+
890+
$env:CLING_BUILD_DIR="$env:PWD_DIR\cling\build"
891+
echo "CLING_BUILD_DIR=$env:CLING_BUILD_DIR"
892+
echo "CLING_BUILD_DIR=$env:CLING_BUILD_DIR" >> $env:GITHUB_ENV
893+
894+
$env:CPLUS_INCLUDE_PATH="$env:CLING_DIR\tools\cling\include;$env:CLING_BUILD_DIR\include;$env:LLVM_DIR\llvm\include;$env:LLVM_DIR\clang\include;$env:LLVM_BUILD_DIR\include;$env:LLVM_BUILD_DIR\tools\clang\include;$env:PWD_DIR\include;"
895+
echo "CPLUS_INCLUDE_PATH=$env:CPLUS_INCLUDE_PATH"
896+
echo "CPLUS_INCLUDE_PATH=$env:CPLUS_INCLUDE_PATH" >> $env:GITHUB_ENV
897+
}
898+
else
899+
{
900+
$env:CPLUS_INCLUDE_PATH="$env:LLVM_DIR\llvm\include;$env:LLVM_DIR\clang\include;$env:LLVM_BUILD_DIR\include;$env:LLVM_BUILD_DIR\tools\clang\include;$env:PWD_DIR\include;"
901+
echo "CPLUS_INCLUDE_PATH=$env:CPLUS_INCLUDE_PATH"
902+
echo "CPLUS_INCLUDE_PATH=$env:CPLUS_INCLUDE_PATH" >> $env:GITHUB_ENV
903+
}
904+
905+
# Build CppInterOp next to cling and llvm-project.
906+
mkdir build_static
907+
cd build_static
908+
$env:CPPINTEROP_BUILD_DIR="$env:PWD_DIR"
909+
echo "CPPINTEROP_BUILD_DIR=$env:CPPINTEROP_BUILD_DIR"
910+
echo "CPPINTEROP_BUILD_DIR=$env:CPPINTEROP_BUILD_DIR" >> $env:GITHUB_ENV
911+
if ( "${{ matrix.cling }}" -imatch "On" )
912+
{
913+
emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
914+
-DCPPINTEROP_USE_CLING=ON `
915+
-DCPPINTEROP_USE_REPL=OFF `
916+
-DCMAKE_PREFIX_PATH="$env:PREFIX" `
917+
-DCling_DIR="$env:LLVM_BUILD_DIR\tools\cling" `
918+
-DLLVM_DIR="$env:LLVM_BUILD_DIR\lib\cmake\llvm" `
919+
-DLLD_DIR="$env:LLVM_BUILD_DIR\lib\cmake\lld" `
920+
-DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang" `
921+
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} `
922+
-DCMAKE_INSTALL_PREFIX="$env:PREFIX" `
923+
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON `
924+
-DLLVM_ENABLE_WERROR=On `
925+
-DSYSROOT_PATH="$env:SYSROOT_PATH" `
926+
..\
927+
}
928+
else
929+
{
930+
emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
931+
-DCMAKE_PREFIX_PATH="$env:PREFIX" `
932+
-DLLVM_DIR="$env:LLVM_BUILD_DIR\lib\cmake\llvm" `
933+
-DLLD_DIR="$env:LLVM_BUILD_DIR\lib\cmake\lld" `
934+
-DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang" `
935+
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} `
936+
-DCMAKE_INSTALL_PREFIX="$env:PREFIX" `
937+
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON `
938+
-DLLVM_ENABLE_WERROR=On `
939+
-DSYSROOT_PATH="$env:SYSROOT_PATH" `
940+
..\
941+
}
942+
emmake make -j ${{ env.ncpus }} check-cppinterop
711943
712944
- name: Build xeus-cpp
713945
if: ${{ runner.os != 'windows' }}

lib/CppInterOp/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ if(EMSCRIPTEN)
122122

123123
# Replace newlines with spaces
124124
string(REPLACE "\n" " " SYMBOLS_LIST "${SYMBOLS_LIST}")
125-
125+
if(BUILD_SHARED_LIBS)
126126
set_target_properties(clangCppInterOp
127127
PROPERTIES NO_SONAME 1
128128
)
@@ -131,8 +131,13 @@ if(EMSCRIPTEN)
131131
PRIVATE "SHELL: -s SIDE_MODULE=1"
132132
PRIVATE "SHELL: ${SYMBOLS_LIST}"
133133
)
134+
else()
135+
target_link_options(clangCppInterOp
136+
PRIVATE "SHELL: -s WASM_BIGINT"
137+
)
138+
endif()
134139
if (CPPINTEROP_ENABLE_TESTING)
135-
# When compiling Emscripten tests the shared library it links to is expected to be in the same folder as the compiled Javascript
140+
# When compiling Emscripten tests the CppInterOp library it links to is expected to be in the same folder as the compiled Javascript
136141
add_custom_command(TARGET clangCppInterOp POST_BUILD
137142
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:clangCppInterOp> ${CMAKE_BINARY_DIR}/unittests/CppInterOp/
138143
)

0 commit comments

Comments
 (0)