Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Web: Handle new template names and dlink_enabled=yes #67

Merged
merged 1 commit into from
Sep 7, 2022
Merged

Web: Handle new template names and dlink_enabled=yes #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions build-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,17 +248,17 @@ if [ "${build_classical}" == "1" ]; then
## Web (Classical) ##

# Editor
unzip out/web/tools/godot.web.opt.tools.threads.zip -d ${webdir}/
unzip out/web/tools/godot.web.opt.tools.wasm32.zip -d ${webdir}/
brotli --keep --force --quality=11 ${webdir}/*
binname="${godot_basename}_web_editor.zip"
cp out/web/tools/godot.web.opt.tools.threads.zip ${reldir}/${binname}
cp out/web/tools/godot.web.opt.tools.wasm32.zip ${reldir}/${binname}

# Templates
cp out/web/templates/godot.web.opt.threads.zip ${templatesdir}/webassembly_threads_release.zip
cp out/web/templates/godot.web.opt.debug.threads.zip ${templatesdir}/webassembly_threads_debug.zip
cp out/web/templates/godot.web.opt.wasm32.zip ${templatesdir}/web_release.zip
cp out/web/templates/godot.web.opt.debug.wasm32.zip ${templatesdir}/web_debug.zip

cp out/web/templates/godot.web.opt.gdnative.threads.zip ${templatesdir}/webassembly_gdnative_threads_release.zip
cp out/web/templates/godot.web.opt.debug.gdnative.threads.zip ${templatesdir}/webassembly_gdnative_threads_debug.zip
cp out/web/templates/godot.web.opt.wasm32.dlink.zip ${templatesdir}/web_dlink_release.zip
cp out/web/templates/godot.web.opt.debug.wasm32.dlink.zip ${templatesdir}/web_dlink_debug.zip

## Android (Classical) ##

Expand Down Expand Up @@ -451,14 +451,11 @@ if [ "${build_mono}" == "1" ]; then
rm -rf macos_template.app
sign_macos_template ${templatesdir_mono} 1

# ## Web (Mono) ##
#
# # Templates
# cp out/web/templates-mono/godot.web.opt.debug.mono.zip ${templatesdir_mono}/webassembly_debug.zip
# cp out/web/templates-mono/godot.web.opt.mono.zip ${templatesdir_mono}/webassembly_release.zip
#
# mkdir -p ${templatesdir_mono}/bcl
# cp -r out/web/templates-mono/bcl/wasm ${templatesdir_mono}/bcl/
## Web (Mono) ##

# Templates
cp out/web/templates-mono/godot.web.opt.debug.wasm32.mono.zip ${templatesdir_mono}/web_debug.zip
cp out/web/templates-mono/godot.web.opt.wasm32.mono.zip ${templatesdir_mono}/web_release.zip

## Android (Mono) ##

Expand Down
8 changes: 4 additions & 4 deletions build-web/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ set -e
# Config

export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
export OPTIONS="production=yes use_thinlto=yes"
export OPTIONS_MONO="module_mono_enabled=yes"
export OPTIONS="production=yes"
export OPTIONS_MONO="module_mono_enabled=yes use_lto=no"
export TERM=xterm

source /root/emsdk/emsdk_env.sh
Expand All @@ -24,8 +24,8 @@ if [ "${CLASSICAL}" == "1" ]; then
$SCONS platform=web ${OPTIONS} target=release_debug tools=no
$SCONS platform=web ${OPTIONS} target=release tools=no

$SCONS platform=web ${OPTIONS} target=release_debug tools=no gdnative_enabled=yes
$SCONS platform=web ${OPTIONS} target=release tools=no gdnative_enabled=yes
$SCONS platform=web ${OPTIONS} target=release_debug tools=no dlink_enabled=yes
$SCONS platform=web ${OPTIONS} target=release tools=no dlink_enabled=yes

mkdir -p /root/out/templates
cp -rvp bin/*.zip /root/out/templates
Expand Down
1 change: 1 addition & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ fi
export basedir="$(pwd)"
mkdir -p ${basedir}/out
mkdir -p ${basedir}/out/logs
mkdir -p ${basedir}/mono-glue

export podman_run="${podman} run -it --rm --env BUILD_NAME --env GODOT_VERSION_STATUS --env NUM_CORES --env CLASSICAL=${build_classical} --env MONO=${build_mono} -v ${basedir}/godot-${godot_version}.tar.gz:/root/godot.tar.gz -v ${basedir}/mono-glue:/root/mono-glue -w /root/"
export img_version=4.x-f36
Expand Down