Merge pull request #65 from godotengine/js-is-web

Author: akien-mga

build-release.sh

@@ -245,20 +245,20 @@ if [ "${build_classical}" == "1" ]; then
   rm -rf macos_template.app
   sign_macos_template ${templatesdir} 0
 
-  ## Javascript (Classical) ##
+  ## Web (Classical) ##
 
   # Editor
-  unzip out/javascript/tools/godot.javascript.opt.tools.threads.zip -d ${webdir}/
+  unzip out/web/tools/godot.web.opt.tools.threads.zip -d ${webdir}/
   brotli --keep --force --quality=11 ${webdir}/*
   binname="${godot_basename}_web_editor.zip"
-  cp out/javascript/tools/godot.javascript.opt.tools.threads.zip ${reldir}/${binname}
+  cp out/web/tools/godot.web.opt.tools.threads.zip ${reldir}/${binname}
 
   # Templates
-  cp out/javascript/templates/godot.javascript.opt.threads.zip ${templatesdir}/webassembly_threads_release.zip
-  cp out/javascript/templates/godot.javascript.opt.debug.threads.zip ${templatesdir}/webassembly_threads_debug.zip
+  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/javascript/templates/godot.javascript.opt.gdnative.threads.zip ${templatesdir}/webassembly_gdnative_threads_release.zip
-  cp out/javascript/templates/godot.javascript.opt.debug.gdnative.threads.zip ${templatesdir}/webassembly_gdnative_threads_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
 
   ## Android (Classical) ##
 
@@ -451,14 +451,14 @@ if [ "${build_mono}" == "1" ]; then
   rm -rf macos_template.app
   sign_macos_template ${templatesdir_mono} 1
 
-#  ## Javascript (Mono) ##
+#  ## Web (Mono) ##
 #
 #  # Templates
-#  cp out/javascript/templates-mono/godot.javascript.opt.debug.mono.zip ${templatesdir_mono}/webassembly_debug.zip
-#  cp out/javascript/templates-mono/godot.javascript.opt.mono.zip ${templatesdir_mono}/webassembly_release.zip
+#  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/javascript/templates-mono/bcl/wasm ${templatesdir_mono}/bcl/
+#  cp -r out/web/templates-mono/bcl/wasm ${templatesdir_mono}/bcl/
 
   ## Android (Mono) ##
 

build-javascript/build.sh renamed to build-web/build.sh

@@ -17,21 +17,21 @@ tar xf /root/godot.tar.gz --strip-components=1
 # Classical
 
 if [ "${CLASSICAL}" == "1" ]; then
-  echo "Starting classical build for JavaScript..."
+  echo "Starting classical build for Web..."
 
   source /root/emsdk_${EMSCRIPTEN_CLASSICAL}/emsdk_env.sh
 
-  $SCONS platform=javascript ${OPTIONS} target=release_debug tools=no
-  $SCONS platform=javascript ${OPTIONS} target=release tools=no
+  $SCONS platform=web ${OPTIONS} target=release_debug tools=no
+  $SCONS platform=web ${OPTIONS} target=release tools=no
 
-  $SCONS platform=javascript ${OPTIONS} target=release_debug tools=no gdnative_enabled=yes
-  $SCONS platform=javascript ${OPTIONS} target=release tools=no gdnative_enabled=yes
+  $SCONS platform=web ${OPTIONS} target=release_debug tools=no gdnative_enabled=yes
+  $SCONS platform=web ${OPTIONS} target=release tools=no gdnative_enabled=yes
 
   mkdir -p /root/out/templates
   cp -rvp bin/*.zip /root/out/templates
   rm -f bin/*.zip
 
-  $SCONS platform=javascript ${OPTIONS} target=release_debug tools=yes use_closure_compiler=yes
+  $SCONS platform=web ${OPTIONS} target=release_debug tools=yes use_closure_compiler=yes
 
   mkdir -p /root/out/tools
   cp -rvp bin/*.zip /root/out/tools
@@ -42,16 +42,16 @@ fi
 # Mono
 
 if [ "${MONO}" == "1" ]; then
-  echo "Starting Mono build for JavaScript..."
+  echo "Starting Mono build for Web..."
 
   source /root/emsdk_${EMSCRIPTEN_MONO}/emsdk_env.sh
 
   cp /root/mono-glue/*.cpp modules/mono/glue/
   cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
   cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
 
-  $SCONS platform=javascript ${OPTIONS} ${OPTIONS_MONO} target=release_debug tools=no
-  $SCONS platform=javascript ${OPTIONS} ${OPTIONS_MONO} target=release tools=no
+  $SCONS platform=web ${OPTIONS} ${OPTIONS_MONO} target=release_debug tools=no
+  $SCONS platform=web ${OPTIONS} ${OPTIONS_MONO} target=release tools=no
 
   mkdir -p /root/out/templates-mono
   cp -rvp bin/*.zip /root/out/templates-mono
@@ -61,4 +61,4 @@ if [ "${MONO}" == "1" ]; then
   cp -r /root/mono-installs/wasm-bcl/wasm /root/out/templates-mono/bcl/
 fi
 
-echo "JavaScript build successful"
+echo "Web build successful"

build.sh

@@ -122,7 +122,7 @@ fi
 
 if [ $skip_download == 0 ]; then
   echo "Fetching images"
-  for image in mono-glue windows linux javascript; do
+  for image in mono-glue windows linux web; do
     if [ ${force_download} == 1 ] || ! ${podman} image exists godot/$image; then
       if ! ${podman} pull ${registry}/godot/${image}; then
         echo "ERROR: image $image does not exist and can't be downloaded"
@@ -182,7 +182,7 @@ mkdir -p ${basedir}/out
 mkdir -p ${basedir}/out/logs
 
 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=3.x-f36-mono-6.12.0.182
+export img_version=4.x-f36
 
 # Get AOT compilers from their containers.
 mkdir -p ${basedir}/out/aot-compilers
@@ -198,8 +198,8 @@ ${podman_run} -v ${basedir}/build-windows:/root/build -v ${basedir}/out/windows:
 mkdir -p ${basedir}/out/linux
 ${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux:/root/out localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux
 
-mkdir -p ${basedir}/out/javascript
-${podman_run} -v ${basedir}/build-javascript:/root/build -v ${basedir}/out/javascript:/root/out localhost/godot-javascript:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/javascript
+mkdir -p ${basedir}/out/web
+${podman_run} -v ${basedir}/build-web:/root/build -v ${basedir}/out/web:/root/out localhost/godot-web:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/web
 
 mkdir -p ${basedir}/out/macos
 ${podman_run} -v ${basedir}/build-macos:/root/build -v ${basedir}/out/macos:/root/out -v ${basedir}/deps/vulkansdk-macos:/root/vulkansdk localhost/godot-osx:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macos