From cb2114daca81c721822f1d4a7e9df3969b1dc61d Mon Sep 17 00:00:00 2001 From: Patedam Date: Tue, 4 Aug 2026 21:18:05 -0400 Subject: [PATCH] Cleaned up build.bat to be more readable and easier to maintain --- misc/build.bat | 101 +++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 54 deletions(-) diff --git a/misc/build.bat b/misc/build.bat index 1fbc443..5cbbb32 100644 --- a/misc/build.bat +++ b/misc/build.bat @@ -1,23 +1,22 @@ @echo off setlocal enabledelayedexpansion -:: ------------------------------------------------------------------------------ -:: Unity Build Script (misc/build.bat) -:: Step 1: Generate build_plan.txt for all configurations -:: Step 2: Invoke build.exe to execute the plan -:: ------------------------------------------------------------------------------ - -set SCRIPT_DIR=%~dp0 -cd /d "%SCRIPT_DIR%.." +:: ============================================================================== +:: Juliet Custom Build Orchestrator +:: ============================================================================== +cd /d "%~dp0\.." set BUILD_TOOL=misc\build_system.exe set BUILD_SRC=tools\build_system.c +set BUILD_TOOL_VER=1.5 + +set COMMAND_GEN_VS=0 set TARGET_JULIET=0 +set TARGET_GAME=0 set TARGET_ROMEO=0 set TARGET_SHADER=0 -set TARGET_GAME=0 set TARGET_SPECIFIED=0 set CONFIG_DEBUG=0 @@ -25,6 +24,8 @@ set CONFIG_RELEASE=0 set CONFIG_PROFILE=0 set CONFIG_SPECIFIED=0 +set UNITY_MAX_FILES=50 + :parse_args if "%~1"=="" goto check_defaults if /i "%~1"=="gen_vs" ( @@ -54,7 +55,6 @@ if !TARGET_SPECIFIED! equ 0 set TARGET_JULIET=1& set TARGET_GAME=1& set TARGET_R :do_compile_build_tool - :: Find Clang / MSVC compiler set COMPILER=clang-cl.exe where %COMPILER% >nul 2>nul @@ -67,41 +67,36 @@ if !ERRORLEVEL! neq 0 ( ) ) -:: Check if build.exe needs to be compiled (missing, version changed, or source changed) -set BUILD_TOOL_VER=11 -set NEED_RECOMPILE_BUILD_TOOL=0 -if not exist "%BUILD_TOOL%" ( - set NEED_RECOMPILE_BUILD_TOOL=1 -) else ( - set "CURR_VER=" - if exist "Intermediate\build_tool.ver" ( - for /f "usebackq delims=" %%I in ("Intermediate\build_tool.ver") do set "CURR_VER=%%I" - ) - if not "!CURR_VER!"=="!BUILD_TOOL_VER!" set NEED_RECOMPILE_BUILD_TOOL=1 - set "SRC_TIME=" - for %%I in ("%BUILD_SRC%") do set "SRC_TIME=%%~tI" - set "STAMP_TIME=" - if exist "Intermediate\build_tool.stamp" ( - for /f "usebackq delims=" %%I in ("Intermediate\build_tool.stamp") do set "STAMP_TIME=%%I" - ) - if not "!SRC_TIME!"=="!STAMP_TIME!" set NEED_RECOMPILE_BUILD_TOOL=1 -) +:: Auto-compile build orchestrator if missing or out of date +set RECOMPILE_BUILD_TOOL=0 +if not exist "%BUILD_TOOL%" set RECOMPILE_BUILD_TOOL=1 +if exist "Intermediate\build_tool.ver" ( + set /p CACHED_VER=<"Intermediate\build_tool.ver" + if "!CACHED_VER!" neq "!BUILD_TOOL_VER!" set RECOMPILE_BUILD_TOOL=1 +) else set RECOMPILE_BUILD_TOOL=1 -if !NEED_RECOMPILE_BUILD_TOOL! equ 1 ( - if exist "Intermediate\build_tool.stamp" del /f /q "Intermediate\build_tool.stamp" - if exist "Intermediate\build_tool.ver" del /f /q "Intermediate\build_tool.ver" - if exist "%BUILD_TOOL%" ( - del /f /q "%BUILD_TOOL%" >nul 2>&1 - if exist "%BUILD_TOOL%" ( - echo [BUILD FAILED] Could not overwrite %BUILD_TOOL%. It may be in use by another process. +if exist "Intermediate\build_tool.stamp" ( + set /p CACHED_STAMP=<"Intermediate\build_tool.stamp" + for %%I in ("%BUILD_SRC%") do ( + if "%%~tI" neq "!CACHED_STAMP!" set RECOMPILE_BUILD_TOOL=1 + ) +) else set RECOMPILE_BUILD_TOOL=1 + +if !RECOMPILE_BUILD_TOOL! equ 1 ( + if "!COMMAND_GEN_VS!"=="1" ( + :: If generating visual studio, we must rebuild the tool silently so we don't pollute stdout for python + %COMPILER% /nologo /MT /O2 /W4 "%BUILD_SRC%" /Fe"%BUILD_TOOL%" >nul 2>&1 + if !ERRORLEVEL! neq 0 ( + echo [BUILD FAILED] Could not compile build orchestrator. + exit /b 1 + ) + ) else ( + echo [BUILD] Compiling fast native build orchestrator [tools\build_system.c -^> misc\build.exe]... + %COMPILER% /nologo /MT /O2 /W4 "%BUILD_SRC%" /Fe"%BUILD_TOOL%" + if !ERRORLEVEL! neq 0 ( + echo [BUILD FAILED] Could not compile build orchestrator. exit /b 1 ) - ) - echo [BUILD] Compiling fast native build orchestrator [tools\build_system.c -^> misc\build.exe]... - %COMPILER% /nologo /MT /O2 /W4 "%BUILD_SRC%" /Fe"%BUILD_TOOL%" - if !ERRORLEVEL! neq 0 ( - echo [BUILD FAILED] Could not compile build orchestrator. - exit /b 1 ) if not exist "%BUILD_TOOL%" ( echo [BUILD FAILED] Compilation failed to produce %BUILD_TOOL%. @@ -146,11 +141,13 @@ if not exist "Intermediate\x64-!CFG!" mkdir "Intermediate\x64-!CFG!" echo CONFIG !CFG!>>"!PLAN_FILE!" -set UNITY_MAX_FILES=50 +set BUILD_GAME_DLL=0 +if !TARGET_JULIET! equ 1 set BUILD_GAME_DLL=1 +if !TARGET_GAME! equ 1 set BUILD_GAME_DLL=1 if !TARGET_JULIET! equ 1 echo UNITY Juliet Intermediate\Juliet Juliet_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" if !TARGET_JULIET! equ 1 echo UNITY JulietApp Intermediate\JulietApp JulietApp_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" -if !TARGET_GAME! equ 1 echo UNITY Game Intermediate\Game Game_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" +if !BUILD_GAME_DLL! equ 1 echo UNITY Game Intermediate\Game Game_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" if !TARGET_ROMEO! equ 1 echo UNITY Romeo Intermediate\Romeo Romeo_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" if !TARGET_SHADER! equ 1 echo UNITY JulietShaderCompiler Intermediate\JulietShaderCompiler JulietShaderCompiler_Unity !UNITY_MAX_FILES!>>"!PLAN_FILE!" @@ -190,10 +187,6 @@ if defined IMGUI_UNITY_SRCS ( set IMGUI_OBJS= if defined IMGUI_UNITY_SRCS set IMGUI_OBJS=Intermediate\x64-!CFG!\ImGui_Unity*.obj -set BUILD_GAME_DLL=0 -if !TARGET_JULIET! equ 1 set BUILD_GAME_DLL=1 -if !TARGET_GAME! equ 1 set BUILD_GAME_DLL=1 - :: --- Juliet PCH --- echo STEP Building Juliet PCH [!CFG!]>>"!PLAN_FILE!" echo OUTPUT Intermediate\x64-!CFG!\Juliet_PCH.obj>>"!PLAN_FILE!" @@ -243,7 +236,7 @@ if !BUILD_GAME_DLL! equ 1 ( :: --- JulietApp.exe --- if !TARGET_JULIET! equ 1 ( -:: --- JulietApp PCH --- + :: --- JulietApp PCH --- echo STEP Building JulietApp PCH [!CFG!]>>"!PLAN_FILE!" echo OUTPUT Intermediate\x64-!CFG!\JulietApp_PCH.obj>>"!PLAN_FILE!" echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!" @@ -266,7 +259,7 @@ if !TARGET_JULIET! equ 1 ( :: --- Romeo.exe --- if !TARGET_ROMEO! equ 1 ( -:: --- Romeo PCH --- + :: --- Romeo PCH --- echo STEP Building Romeo PCH [!CFG!]>>"!PLAN_FILE!" echo OUTPUT Intermediate\x64-!CFG!\Romeo_PCH.obj>>"!PLAN_FILE!" echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!" @@ -284,12 +277,12 @@ if !TARGET_ROMEO! equ 1 ( echo STEP Building Romeo.exe [!CFG!]>>"!PLAN_FILE!" echo OUTPUT bin\x64-!CFG!\Romeo.exe>>"!PLAN_FILE!" echo DEPENDS Romeo^|Juliet^|External\imgui^|Intermediate\x64-!CFG!\Romeo_PCH.obj>>"!PLAN_FILE!" - echo COMMAND %COMPILER% !ROMEO_LINK_CMD! /DIMGUI_API=__declspec^(dllimport^) /Fe"bin\x64-!CFG!\Romeo.exe" !ROMEO_INPUTS! Intermediate\x64-!CFG!\Romeo_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Romeo.ilk /PDB:Intermediate\x64-!CFG!\Romeo.pdb>>"!PLAN_FILE!" + echo COMMAND %COMPILER% !ROMEO_LINK_CMD! /DIMGUI_API=__declspec^(dllimport^) /Fe"bin\x64-!CFG!\Romeo.exe" !ROMEO_INPUTS! Intermediate\x64-!CFG!\Romeo_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:WINDOWS /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Romeo.ilk /PDB:Intermediate\x64-!CFG!\Romeo.pdb>>"!PLAN_FILE!" ) :: --- JulietShaderCompiler.exe --- if !TARGET_SHADER! equ 1 ( -:: --- JulietShaderCompiler PCH --- + :: --- JulietShaderCompiler PCH --- echo STEP Building JulietShaderCompiler PCH [!CFG!]>>"!PLAN_FILE!" echo OUTPUT Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj>>"!PLAN_FILE!" echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!" @@ -306,8 +299,8 @@ if !TARGET_SHADER! equ 1 ( echo STEP Building JulietShaderCompiler.exe [!CFG!]>>"!PLAN_FILE!" echo OUTPUT bin\x64-!CFG!\JulietShaderCompiler.exe>>"!PLAN_FILE!" - echo DEPENDS JulietShaderCompiler^|Juliet^|External\imgui^|Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj>>"!PLAN_FILE!" - echo COMMAND %COMPILER% !SHADER_LINK_CMD! /DIMGUI_API=__declspec^(dllimport^) /Fe"bin\x64-!CFG!\JulietShaderCompiler.exe" !SHADER_INPUTS! Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib dxcompiler.lib /DELAYLOAD:dxcompiler.dll /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietShaderCompiler.ilk /PDB:Intermediate\x64-!CFG!\JulietShaderCompiler.pdb>>"!PLAN_FILE!" + echo DEPENDS JulietShaderCompiler^|Juliet^|Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj>>"!PLAN_FILE!" + echo COMMAND %COMPILER% !SHADER_LINK_CMD! /DIMGUI_API=__declspec^(dllimport^) /Fe"bin\x64-!CFG!\JulietShaderCompiler.exe" !SHADER_INPUTS! Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietShaderCompiler.ilk /PDB:Intermediate\x64-!CFG!\JulietShaderCompiler.pdb>>"!PLAN_FILE!" ) exit /b 0