povray_wasm/Dockerfile

@@ -15,11 +15,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt install -y bash \
 RUN cd /opt && git clone https://github.com/boostorg/boost.git boost
 RUN cd /opt/boost && git submodule update --init --recursive
 
-RUN cd /opt/boost && ./bootstrap.sh --with-libraries=system,date_time,filesystem,thread
+RUN cd /opt/boost && ./bootstrap.sh
 
 RUN cd /opt/boost && ./b2 -j4 toolset=emscripten \
-	cflags="-s USE_PTHREADS=1"\
+	cflags="-s USE_PTHREADS=1" cxxflags="-s USE_PTHREADS=1" \
-	cxxflags="-s USE_PTHREADS=1" \
 	--prefix=/opt/libboost \
 	--build-dir=/opt/libboost_build \
 	link=static \

povray_wasm/compile.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+bash ./build_docker.sh
+
+sudo docker run \
+  -v $PWD:/usr/src/build \
+  povray_wasm \
+  sh -c 'cd /usr/src/povray && cp ../build/build.sh build.sh && bash build.sh'

povray_wasm/docker.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo docker build -t povray_wasm --rm . 

povray_wasm/pw

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-help () {
-	echo "Usage: ./pw [command]"
-	echo " "
-	echo "Commands:"
-	echo "	build - Build the docker image with optional -f/--force"
-	echo "	compile - Run the compilation process"
-}
-
-if [[ "${1}" == "build" ]]; then
-	bash ./scripts/build.sh "${2}"
-elif [[ "${1}" == "cmd" ]]; then
-	bash ./scripts/cmd.sh ${@}
-elif [[ "${1}" == "compile" ]]; then
-	bash ./scripts/compile.sh
-else
-	help
-fi

povray_wasm/scripts/build.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [[ "${1}" == "-f" ]] || [[ "${1}" == "--force" ]]; then
-	ARG="--no-cache"
-else
-	ARG=""
-fi
-
-sudo docker build ${ARG} -t povray_wasm --rm . 

povray_wasm/scripts/compile.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-sudo docker run \
-  -v $PWD:/usr/src/build \
-  povray_wasm \
-  sh -c 'cd /usr/src/povray && cp /usr/src/build/build.sh build.sh && bash build.sh'