JavaScript: Bump Emscripten to 2.0.11 for standard builds, update godot-mono-builds
This commit is contained in:
parent
ab8503aa31
commit
efa506e301
|
@ -3,16 +3,19 @@ FROM godot-mono:${img_version}
|
|||
|
||||
ARG mono_version
|
||||
|
||||
ENV EMSDK_CLASSICAL=2.0.11
|
||||
ENV EMSDK_MONO=1.39.9
|
||||
|
||||
RUN if [ -z "${mono_version}" ]; then printf "\n\nArgument mono_version is mandatory!\n\n"; exit 1; fi && \
|
||||
dnf -y install --setopt=install_weak_deps=False \
|
||||
java-openjdk && \
|
||||
git clone --branch 2.0.10 --progress https://github.com/emscripten-core/emsdk emsdk_2.0.10 && \
|
||||
cp -r emsdk_2.0.10 emsdk_1.39.9 && \
|
||||
emsdk_2.0.10/emsdk install 2.0.10 && \
|
||||
emsdk_2.0.10/emsdk activate 2.0.10 && \
|
||||
emsdk_1.39.9/emsdk install 1.39.9 && \
|
||||
emsdk_1.39.9/emsdk activate 1.39.9 && \
|
||||
source /root/emsdk_1.39.9/emsdk_env.sh && \
|
||||
git clone --branch ${EMSDK_CLASSICAL} --progress https://github.com/emscripten-core/emsdk emsdk_${EMSDK_CLASSICAL} && \
|
||||
cp -r emsdk_${EMSDK_CLASSICAL} emsdk_${EMSDK_MONO} && \
|
||||
emsdk_${EMSDK_CLASSICAL}/emsdk install ${EMSDK_CLASSICAL} && \
|
||||
emsdk_${EMSDK_CLASSICAL}/emsdk activate ${EMSDK_CLASSICAL} && \
|
||||
emsdk_${EMSDK_MONO}/emsdk install ${EMSDK_MONO} && \
|
||||
emsdk_${EMSDK_MONO}/emsdk activate ${EMSDK_MONO} && \
|
||||
source /root/emsdk_${EMSDK_MONO}/emsdk_env.sh && \
|
||||
cp -a /root/files/${mono_version} /root && \
|
||||
cd /root/${mono_version} && \
|
||||
export MONO_SOURCE_ROOT=/root/${mono_version} && \
|
||||
|
|
2
build.sh
2
build.sh
|
@ -88,7 +88,7 @@ if [ ! -e ${mono_root} ]; then
|
|||
# Set up godot-mono-builds in tree
|
||||
git clone --progress https://github.com/godotengine/godot-mono-builds
|
||||
pushd godot-mono-builds
|
||||
git checkout 61e36a93b6264248b2081136ff35dc544f06563b
|
||||
git checkout 9d75cff174fa3599a9d90f9bce53f0a86154db1e
|
||||
export MONO_SOURCE_ROOT=${mono_root}
|
||||
python3 patch_mono.py
|
||||
popd
|
||||
|
|
Loading…
Reference in New Issue