Skip to content

Commit a0ab865

Browse files
committed
Merge branch 'fix_bytes' of github.com:DerThorsten/pyjs into fix_bytes
2 parents 477f509 + 0a8af44 commit a0ab865

File tree

3 files changed

+51
-1
lines changed

3 files changed

+51
-1
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.9)
22

3-
project(pyjs VERSION 2.8.0 DESCRIPTION "pyjs")
3+
project(pyjs VERSION 3.0.0 DESCRIPTION "pyjs")
44

55
option(BUILD_RUNTIME_BROWSER "Build runtime" ON)
66
option(WITH_NODE_TESTS "With node tests" OFF)

build_debug2.sh

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#!/bin/bash
2+
set -e
3+
4+
# dir of this script
5+
THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
6+
PREFIX_DIR=$THIS_DIR/wasm_prefix
7+
EMSDK_DIR=$THIS_DIR/emsdk_install
8+
EMSDK_VERSION="3.1.58"
9+
10+
if [ ! -d "$EMSDK_DIR" ]; then
11+
echo "Creating emsdk dir $EMSDK_DIR"
12+
$THIS_DIR/emsdk/setup_emsdk.sh $EMSDK_VERSION $EMSDK_DIR
13+
else
14+
echo "Emsdk dir $EMSDK_DIR already exists"
15+
fi
16+
17+
18+
if true; then
19+
rm -rf $PREFIX_DIR
20+
echo "Creating wasm env at $PREFIX_DIR"
21+
$MAMBA_EXE create -p $PREFIX_DIR \
22+
--platform=emscripten-wasm32 \
23+
-c https://repo.mamba.pm/emscripten-forge \
24+
-c https://repo.mamba.pm/conda-forge \
25+
--yes \
26+
python pybind11 "emscripten-abi=3.1.58"\
27+
bzip2 sqlite zlib libffi pytest
28+
fi
29+
30+
cd $THIS_DIR
31+
source $EMSDK_DIR/emsdk_env.sh
32+
33+
34+
mkdir -p build
35+
cd build
36+
37+
export PREFIX=$PREFIX_DIR
38+
export CMAKE_PREFIX_PATH=$PREFIX
39+
export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
40+
41+
emcmake cmake \
42+
-DCMAKE_BUILD_TYPE=Release \
43+
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
44+
-DBUILD_RUNTIME_BROWSER=ON \
45+
-DBUILD_RUNTIME_NODE=OFF \
46+
-DCMAKE_INSTALL_PREFIX=$PREFIX \
47+
..
48+
49+
emmake make -j8
50+
emmake make install
File renamed without changes.

0 commit comments

Comments
 (0)