Emscripten WIP

Author: lephilousophe

buildbot-config/platforms.py

@@ -363,6 +363,29 @@ def dreamcast():
     register_platform(platform)
 dreamcast()
 
+def emscripten():
+    platform = Platform("emscripten")
+    platform.workerimage = "emscripten"
+    platform.compatibleBuilds = (builds.ScummVMBuild, )
+    platform.configureargs.append("--host=wasm32-unknown-emscripten")
+    platform.buildconfigureargs = {
+        builds.ScummVMBuild: [ "--enable-gif", "--enable-jpeg", "--enable-ogg", "--enable-png", "--enable-vorbis",
+                              "--enable-zlib", "--enable-freetype2", "--enable-a52", "--enable-faad", "--enable-mad",
+                              "--enable-mpeg2", "--enable-theoradec",
+                              "--enable-plugins", "--default-dynamic", "--enable-detection-dynamic" ],
+    }
+    platform.packaging_cmd = "dist-emscripten"
+    platform.built_files = {
+        builds.ScummVMBuild: [ "build-emscripten" ],
+    }
+    platform.archiveext = "tar.xz"
+
+    platform.description = "Emscripten"
+    #platform.icon = ''
+
+    register_platform(platform)
+emscripten()
+
 def gamecube():
     platform = Platform("gamecube")
     platform.workerimage = "devkitppc"

toolchains/emscripten/Dockerfile.m4

@@ -1,5 +1,8 @@
 m4_include(`paths.m4')m4_dnl
 m4_include(`packages.m4')m4_dnl
+m4_define(`em_package', RUN embuilder build `m4_foreachq(`pkg', `$@',`pkg ')' && embuilder --pic build `m4_foreachq(`pkg', `$@',`pkg ')' && \
+	rm -rf /tmp/* ${SYSROOT_DIR}/../ports/*/* ${SYSROOT_DIR}/../build/* && \
+	if [ -d "${SYSROOT_DIR}/../ports" ]; then find ${SYSROOT_DIR}/../ports -maxdepth 1 -type f -delete; fi)
 
 m4_dnl Include Debian base preparation steps
 m4_dnl This ensures all common steps are shared by all toolchains
@@ -19,50 +22,64 @@ RUN apt-get update && \
 	rm -rf /var/lib/apt/lists/*
 
 ENV EMSDK=/usr/local/emscripten HOST=wasm32-unknown-none
-ENV PREFIX=$EMSDK/scummvm-libs
+ENV PREFIX=$EMSDK/scummvm-libs SYSROOT_DIR=${EMSDK}/upstream/emscripten/cache/sysroot
 
 local_package(toolchain)
 
 # We add PATH here for *-config and platform specific binaries
 ENV \
+	def_binaries(`${EMSDK}/upstream/emscripten/em', `ar, cc, ranlib, strip') \
+	def_binaries(`${EMSDK}/upstream/bin/llvm-', `cxxfilt, nm, objcopy, objdump, strings') \
+	AS=${EMSDK}/upstream/bin/wasm-as \
+	CXX=${EMSDK}/upstream/emscripten/em++ \
+	LD=${EMSDK}/upstream/emscripten/emcc \
 	def_aclocal(`${PREFIX}') \
-	def_pkg_config(`${PREFIX}') \
-        PATH=$PATH:${EMSDK}:${EMSDK}/node/14.18.2_64bit/bin:${EMSDK}/upstream/emscripten:${PREFIX}/bin \
+	PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig:${PREFIX}/share/pkgconfig:${SYSROOT_DIR}/lib/pkgconfig:${SYSROOT_DIR}/local/lib/pkgconfig \
+	PATH=$PATH:${EMSDK}:${EMSDK}/node/current/bin:${EMSDK}/upstream/emscripten:${SYSROOT_DIR}/bin:${PREFIX}/bin \
+	EMSDK_NODE=${EMSDK}/node/current/bin/node \
 	CPPFLAGS="-I${PREFIX}/include" \
+	CFLAGS="-fPIC" \
+	CXXFLAGS="-fPIC" \
 	LDFLAGS="-L${PREFIX}/lib"
 
-RUN emcc -s USE_ZLIB -E - < /dev/null
+# Build system libraries for PIC
+em_package(libGL, libal, libhtml5, libstubs, libnoexit, libc,
+	libdlmalloc, libcompiler_rt, libc++-noexcept, libc++abi-noexcept, libsockets)
 
-RUN emcc -s USE_LIBPNG=1 -E - < /dev/null
+em_package(zlib)
 
-RUN emcc -s USE_LIBJPEG=1 -E - < /dev/null
+em_package(libpng)
 
-RUN emcc -s USE_GIFLIB=1 -E - < /dev/null
+em_package(libjpeg)
 
-helpers_package(libmad, --with-pic --enable-fpm=no)
+em_package(giflib)
 
-RUN emcc -s USE_OGG=1 -E - < /dev/null
+helpers_package(libmad, --with-pic --enable-fpm=64bit)
 
-RUN emcc -s USE_VORBIS=1 -E - < /dev/null
+em_package(ogg)
 
-# helpers_package(libtheora, --disable-asm, CFLAGS="-fPIC -s USE_OGG=1 -s USE_VORBIS=1")
-helpers_package(libtheora, --disable-asm, CFLAGS="-fPIC -s USE_OGG=1")
+em_package(vorbis)
 
-# TODO: flac
+# helpers_package(libtheora, --disable-asm, CFLAGS="$CFLAGS -sUSE_OGG=1 -sUSE_VORBIS=1")
+helpers_package(libtheora, --disable-asm, CFLAGS="$CFLAGS -sUSE_OGG=1")
 
-helpers_package(faad2, , CFLAGS="-fPIC")
+# TODO: flac
 
-helpers_package(mpeg2dec, , CFLAGS="-fPIC")
+helpers_package(faad2)
 
-helpers_package(a52dec, , CFLAGS="-fPIC")
+helpers_package(mpeg2dec)
 
+helpers_package(a52dec)
 
 # TODO: fluidlite
 
-RUN emcc -s USE_FREETYPE=1 -E - < /dev/null
+em_package(freetype)
 
 # TODO: fribidi
 
-RUN emcc -s USE_SDL=2 -E - < /dev/null
+# This is needed for SDL2
+em_package(libGL-getprocaddr)
+
+em_package(sdl2)
 
-RUN emcc -s USE_SDL_NET=2 -E - < /dev/null
+em_package(sdl2_net)

toolchains/emscripten/functions-platform.sh

@@ -1,17 +1,30 @@
-do_configure () {
-	source "$EMSDK/emsdk_env.sh" 
+__do_configure_emscripten () {
 	emconfigure ./configure --prefix=$PREFIX --host=$HOST --disable-shared "$@"
 }
 
-do_cmake () {
-	source "$EMSDK/emsdk_env.sh" 
+__do_cmake_emscripten () {
 	mkdir -p build
 	cd build
 	emcmake cmake -DCMAKE_INSTALL_PREFIX=$PREFIX \
 	              -DBUILD_SHARED_LIBS=no "$@" ..
 }
 
-do_make () {
-	source "$EMSDK/emsdk_env.sh" 
+__do_make_emscripten () {
 	emmake make "$@"
 }
+
+__setup_env() {
+	local pwd
+	if [ -f "$EMSDK/emsdk_env.sh" ]; then
+		pwd=$(pwd)
+		cd "$EMSDK"
+		. "./emsdk_env.sh"
+		cd "$pwd"
+	fi
+}
+
+__setup_env
+for f in do_configure do_cmake do_make; do
+        unset -f $f
+        eval "$f () { __${f}_emscripten \"\$@\"; }"
+done

toolchains/emscripten/packages/toolchain/build.sh

@@ -17,6 +17,11 @@ cd ${EMSDK}
 ./emsdk install ${EMSDK_VERSION}
 ./emsdk activate ${EMSDK_VERSION}
 
+# Also create a symink to current node
+# This avoids us to track which version of node is active
+NODE_JS=$(grep '^NODE_JS =' .emscripten | sed -e "s/.*'\\(.*\\)'$/\1/")
+ln -rs "$(dirname "$(dirname "./${NODE_JS}")")" ./node/current
+
 do_clean_bdir
 
 # Cleanup wget HSTS

workers/emscripten/Dockerfile.m4

@@ -0,0 +1,36 @@
+FROM toolchains/emscripten AS toolchain
+
+m4_include(`paths.m4')m4_dnl
+
+m4_include(`debian-builder-base.m4')m4_dnl
+
+ENV EMSDK=/usr/local/emscripten HOST=wasm32-unknown-none
+ENV PREFIX=$EMSDK/scummvm-libs SYSROOT_DIR=${EMSDK}/upstream/emscripten/cache/sysroot
+
+# Add libraries needed by toolchain to run
+RUN apt-get update && \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+		libatomic1 && \
+	rm -rf /var/lib/apt/lists/*
+
+COPY --from=toolchain ${EMSDK} ${EMSDK}/
+
+# We add PATH here for *-config and platform specific binaries
+# Prevent the build process to build ports
+ENV \
+	EM_FROZEN_CACHE=1 \
+	def_binaries(`${EMSDK}/upstream/emscripten/em', `ar, cc, ranlib, strip') \
+	def_binaries(`${EMSDK}/upstream/bin/llvm-', `cxxfilt, nm, objcopy, objdump, strings') \
+	AS=${EMSDK}/upstream/bin/wasm-as \
+	CXX=${EMSDK}/upstream/emscripten/em++ \
+	LD=${EMSDK}/upstream/emscripten/emcc \
+	def_aclocal(`${PREFIX}') \
+	PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig:${PREFIX}/share/pkgconfig:${SYSROOT_DIR}/lib/pkgconfig:${SYSROOT_DIR}/local/lib/pkgconfig \
+	PATH=$PATH:${EMSDK}:${EMSDK}/node/current/bin:${EMSDK}/upstream/emscripten:${SYSROOT_DIR}/bin:${PREFIX}/bin \
+	EMSDK_NODE=${EMSDK}/node/current/bin/node \
+	CPPFLAGS="-I${PREFIX}/include" \
+	CFLAGS="-fPIC" \
+	CXXFLAGS="-fPIC" \
+	LDFLAGS="-L${PREFIX}/lib"
+
+m4_include(`run-buildbot.m4')m4_dnl