diff --git a/BUILD.bat b/BUILD.bat index 8225158e4d8..68eaef0c2d3 100644 --- a/BUILD.bat +++ b/BUILD.bat @@ -1,2 +1,3 @@ -@call "%~dp0\tools\build\build" -@pause +@echo off +call "%~dp0\tools\build\build.bat" %* +pause diff --git a/tools/LinuxOneShot/SetupProgram/PreCompile.sh b/tools/LinuxOneShot/SetupProgram/PreCompile.sh index 5d217b6a1cf..ed2feb4f1a3 100644 --- a/tools/LinuxOneShot/SetupProgram/PreCompile.sh +++ b/tools/LinuxOneShot/SetupProgram/PreCompile.sh @@ -66,7 +66,7 @@ cd .. echo "Compiling tgui..." cd "$1" chmod +x tools/bootstrap/node # Workaround for https://github.com/tgstation/tgstation-server/issues/1167 -env TG_BOOTSTRAP_CACHE="$original_dir" TG_BOOTSTRAP_NODE_LINUX=1 tools/bootstrap/node tools/build/build.js tgs +env TG_BOOTSTRAP_CACHE="$original_dir" TG_BOOTSTRAP_NODE_LINUX=1 CBT_BUILD_MODE="TGS" tools/bootstrap/node tools/build/build.js cd "$original_dir" if [ ! -d "../GameStaticFiles/config" ]; then @@ -89,4 +89,4 @@ echo "Compiling tgui..." cd "$1" chmod +x tools/bootstrap/node # Workaround for https://github.com/tgstation/tgstation-server/issues/1167 chmod +x tgui/bin/tgui -env TG_BOOTSTRAP_CACHE="$original_dir" TG_BOOTSTRAP_NODE_LINUX=1 tools/bootstrap/node tools/build/build.js tgs +env TG_BOOTSTRAP_CACHE="$original_dir" TG_BOOTSTRAP_NODE_LINUX=1 CBT_BUILD_MODE="TGS" tools/bootstrap/node tools/build/build.js diff --git a/tools/bootstrap/python.bat b/tools/bootstrap/python.bat index 3b20c2d436b..5bec61b84ce 100644 --- a/tools/bootstrap/python.bat +++ b/tools/bootstrap/python.bat @@ -1 +1,2 @@ -@call powershell.exe -NoLogo -ExecutionPolicy Bypass -File "%~dp0\python_.ps1" %* +@echo off +call powershell.exe -NoLogo -ExecutionPolicy Bypass -File "%~dp0\python_.ps1" %* diff --git a/tools/build/build.bat b/tools/build/build.bat index f5d9bd48f35..6ea7e90f32d 100644 --- a/tools/build/build.bat +++ b/tools/build/build.bat @@ -1 +1,2 @@ -@"%~dp0\..\bootstrap\node" "%~dp0\build.js" +@echo off +"%~dp0\..\bootstrap\node.bat" "%~dp0\build.js" %* diff --git a/tools/build/build.js b/tools/build/build.js index 951eeab8820..f29a97a235d 100755 --- a/tools/build/build.js +++ b/tools/build/build.js @@ -137,8 +137,14 @@ const TgsTarget = Juke.createTarget({ }, }); -Juke.setup({ - default: DefaultTarget, -}).then((code) => { - process.exit(code); -}); +Juke + .setup({ + default: ( + process.env.CBT_BUILD_MODE === 'TGS' + ? TgsTarget + : DefaultTarget + ), + }) + .then((code) => { + process.exit(code); + }); diff --git a/tools/tgs4_scripts/PreCompile.bat b/tools/tgs4_scripts/PreCompile.bat index 3cb7dd05c17..fd7f861e69a 100644 --- a/tools/tgs4_scripts/PreCompile.bat +++ b/tools/tgs4_scripts/PreCompile.bat @@ -11,4 +11,5 @@ IF NOT %1 == "" ( rem TGS3: Otherwise build in Game/B cd ..\Game\B ) -tools\build\build tgs +set CBT_BUILD_MODE=TGS +tools\build\build diff --git a/tools/tgs4_scripts/PreCompile.sh b/tools/tgs4_scripts/PreCompile.sh index f7928bdae45..f21036ab191 100755 --- a/tools/tgs4_scripts/PreCompile.sh +++ b/tools/tgs4_scripts/PreCompile.sh @@ -111,4 +111,4 @@ fi echo "Compiling tgui..." cd "$1" chmod +x tools/bootstrap/node # Workaround for https://github.com/tgstation/tgstation-server/issues/1167 -env TG_BOOTSTRAP_CACHE="$original_dir" TG_BOOTSTRAP_NODE_LINUX=1 tools/bootstrap/node tools/build/build.js tgs +env TG_BOOTSTRAP_CACHE="$original_dir" TG_BOOTSTRAP_NODE_LINUX=1 CBT_BUILD_MODE="TGS" tools/bootstrap/node tools/build/build.js