From e01069edfaebcaf25c168688e4c058a6c0bc3232 Mon Sep 17 00:00:00 2001 From: Peter Slattery Date: Mon, 24 Oct 2022 14:15:10 -0700 Subject: [PATCH] removing old bin and build code --- bin/compile.bat | 2 - bin/debug.bat | 2 - bin/gen_incenter_cities.js | 89 --------------------------- bin/run.bat | 4 -- build/_postbuild_win32.bat | 11 ---- build/_prebuild_win32.bat | 31 ---------- build/build_app_clang_osx_debug.sh | 7 --- build/build_app_clang_win32_debug.bat | 26 -------- build/build_app_msvc_win32_debug.bat | 46 -------------- build/build_meta_msvc_win32_debug.bat | 17 ----- build/setup_cl.bat | 40 ------------ 11 files changed, 275 deletions(-) delete mode 100644 bin/compile.bat delete mode 100644 bin/debug.bat delete mode 100644 bin/gen_incenter_cities.js delete mode 100644 bin/run.bat delete mode 100644 build/_postbuild_win32.bat delete mode 100644 build/_prebuild_win32.bat delete mode 100644 build/build_app_clang_osx_debug.sh delete mode 100644 build/build_app_clang_win32_debug.bat delete mode 100644 build/build_app_msvc_win32_debug.bat delete mode 100644 build/build_meta_msvc_win32_debug.bat delete mode 100644 build/setup_cl.bat diff --git a/bin/compile.bat b/bin/compile.bat deleted file mode 100644 index b623ea0..0000000 --- a/bin/compile.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -build\build_app_msvc_win32_debug.bat \ No newline at end of file diff --git a/bin/debug.bat b/bin/debug.bat deleted file mode 100644 index ecdc8cc..0000000 --- a/bin/debug.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -call remedybg.bat ./app_run_tree/win32_msvc/debug/session.rdbg \ No newline at end of file diff --git a/bin/gen_incenter_cities.js b/bin/gen_incenter_cities.js deleted file mode 100644 index f620272..0000000 --- a/bin/gen_incenter_cities.js +++ /dev/null @@ -1,89 +0,0 @@ -const fs = require("fs"); - -const IN_FILE_PATH_PRIMARY = "../run_tree/data/cities_final.json"; -const IN_FILE_PATH_SECONDARY = "../run_tree/data/cities_secondary_final.json"; -const OUT_FILE_PATH = "../src/user_space/incenter_gen_cities.h" - -function print_city_desc (city, prefix, dest, gets_own_universe) -{ - const city_ascii = city.city_ascii - .toLowerCase() - .replaceAll(' ', '_') - .replaceAll('-', '_') - .replaceAll('\'', '') - .replaceAll('`', ''); - - const city_id = `${prefix}_${city_ascii}`; - const { lat, lng } = city; - - dest.enum_out += ` ${city_id} = ${dest.enum_counter++},\n`; - - const universe = gets_own_universe ? city_id : "incenter_secondary_city_universe"; - - dest.desc_out += ` [${city_id}] = { - .id = ${city_id}, - .lat = ${lat}, - .lon = ${lng}, - .sacn_universe = ${universe}, - },\n`; - - dest.strings_out += ` [${city_id}] = "${city_id}",\n`; -} - -function main () -{ - const primary_file = fs.readFileSync(IN_FILE_PATH_PRIMARY, {}); - const primary_json = JSON.parse(primary_file); - - const secondary_file = fs.readFileSync(IN_FILE_PATH_SECONDARY, {}); - const secondary_json = JSON.parse(secondary_file); - - let out = "// NOTE: This file is autogenerated by csv_to_cstruct.js\n"; - - let enum_counter = 0; - let enum_out = "// NOTE: These are values for Incenter_City_Id\nenum {\n"; - enum_out += ` city_black_rock = ${enum_counter++},\n`; - - let desc_out = "global Incenter_City_Desc city_descs[] = {\n"; - - let strings_out = "global char* city_strings[] = {\n"; - - let dest = { - enum_counter, - enum_out, - desc_out, - strings_out, - }; - - primary_json.forEach((city) => { - print_city_desc(city, "city", dest, true); - }); - - // Add Black Rock City - dest.desc_out += `\n // Black Rock City\n [city_black_rock] = { - .id = city_black_rock, - .lat = -90.0f, - .lon = 0, - .sacn_universe = city_black_rock, - },\n`; - - dest.strings_out += ` [city_black_rock] = "city_black_rock",\n`; - dest.enum_out += " city_count,\n"; - dest.enum_out += " city_secondary_first = city_count + 1,\n"; - - secondary_json.forEach((city) => { - print_city_desc(city, "city_secondary", dest, false); - }); - - dest.enum_out += " city_secondary_count,\n"; - dest.enum_out += "};\n\n"; - dest.desc_out += "};\n\n"; - dest.strings_out += "};\n\n"; - - out += dest.enum_out; - out += dest.desc_out; - out += dest.strings_out; - fs.writeFileSync(OUT_FILE_PATH, out, {}); -} - -main(); diff --git a/bin/run.bat b/bin/run.bat deleted file mode 100644 index d8708cf..0000000 --- a/bin/run.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -pushd app_run_tree -start win32_msvc\debug\win32_foldhaus.exe -popd \ No newline at end of file diff --git a/build/_postbuild_win32.bat b/build/_postbuild_win32.bat deleted file mode 100644 index ebc3e0a..0000000 --- a/build/_postbuild_win32.bat +++ /dev/null @@ -1,11 +0,0 @@ -@echo off - -IF NOT "%PrebuildCalled%"=="1" GOTO error - -IF EXIST %CTIMEPATH% ( call C:\apps\ctime\ctime.exe -end %StatsPath%\%StatsFile% %LastError% ) -IF EXIST %CTIMEPATH% ( call C:\apps\ctime\ctime.exe -stats %StatsPath%\%StatsFile% ) -set PrebuildCalled=0 -GOTO:eof - -:error -echo ERROR: _prebuild_win32.bat was not called before _postbuild_win32.bat. \ No newline at end of file diff --git a/build/_prebuild_win32.bat b/build/_prebuild_win32.bat deleted file mode 100644 index 9680699..0000000 --- a/build/_prebuild_win32.bat +++ /dev/null @@ -1,31 +0,0 @@ -@echo off - -REM This file takes three arguments -REM 1 = "app" or "meta" -REM 2 = "debug" or "release" -REM 3 = "msvc" or "clang" - -set PrebuildCalled=1 - -set ProjectDevFolder=%~dp0 -set ProjectDevPath=%ProjectDevFolder:~0,-7% - -set SourceCodePath=%ProjectDevPath%\src\%1 - -set MetaProgramPath=%ProjectDevPath%\meta_run_tree\win32_%3\%2 - -set ProjectRunTree=%ProjectDevPath%\%1_run_tree\win32_%3 -set BuildPath=%ProjectRunTree%\%2 -set StatsPath=%ProjectRunTree%\stats -set StatsFile=%1_win32_%3_%2_build_time.ctm - -IF NOT EXIST %BuildPath% mkdir %BuildPath% -IF NOT EXIST %StatsPath% mkdir %StatsPath% - -set CTimePath=C:\apps\ctime -IF EXIST %CTIMEPATH% ( call C:\apps\ctime\ctime.exe -begin %StatsPath%\%StatsFile% ) - -echo. -echo BUILDING TO %BuildPath% -echo STATS IN %StatsPath%\%StatsFile% -echo. diff --git a/build/build_app_clang_osx_debug.sh b/build/build_app_clang_osx_debug.sh deleted file mode 100644 index c777b7d..0000000 --- a/build/build_app_clang_osx_debug.sh +++ /dev/null @@ -1,7 +0,0 @@ -pushd build -clang++ ../src/gs_osx.mm \ --g \ --Wno-c11-extensions -Wno-unused-variable -Wno-unused-function \ --framework Cocoa -framework OpenGL \ --o osx_foldhaus.out -popd \ No newline at end of file diff --git a/build/build_app_clang_win32_debug.bat b/build/build_app_clang_win32_debug.bat deleted file mode 100644 index 20a1746..0000000 --- a/build/build_app_clang_win32_debug.bat +++ /dev/null @@ -1,26 +0,0 @@ -@echo off - -SET MyPath=%~dp0 -SET MyPath=%MyPath:~0,-1% -call %MyPath%\_prebuild_win32.bat app debug clang - -set CommonCompilerFlags=-std=c++11 -Wno-writable-strings -Wno-unused-value -Wno-varargs -Wno-switch -Wno-microsoft-enum-forward-reference -DDEBUG=1 - -pushd %BuildPath% - -del *.pdb > NUL 2> NUL - -echo WAITING FOR PDB TO WRITE > lock.tmp - -clang++ %CommonCompilerFlags% %SourceCodePath%\foldhaus_app.cpp -shared -o - -set LastError=%ERRORLEVEL% - -del lock.tmp - -clang++ -c %CommonCompilerFlags% %SourceCodePath%\platform_win32\win32_foldhaus.cpp -link win32_foldhaus.o user32.lib winmm.lib gdi32.lib opengl32.lib dsound.lib Ws2_32.lib Comdlg32.lib - -popd - -call %MyPath%\_postbuild_win32.bat diff --git a/build/build_app_msvc_win32_debug.bat b/build/build_app_msvc_win32_debug.bat deleted file mode 100644 index 9f523a3..0000000 --- a/build/build_app_msvc_win32_debug.bat +++ /dev/null @@ -1,46 +0,0 @@ -@echo off - -SET MyPath=%~dp0 -SET MyPath=%MyPath:~0,-1% - -call %MyPath%\_prebuild_win32.bat app debug msvc -call %MyPath%\setup_cl.bat - -SET CommonCompilerFlags=-nologo -DDEBUG=1 -DPLATFORM_WINDOWS -FC -WX -W4 -Z7 -Oi -GR- -EHsc -EHa- -MTd -fp:fast -fp:except- -IC:\programs-dev\gs_libs\src - -SET CommonCompilerFlags=-wd4127 -wd4702 -wd4101 -wd4505 -wd4100 -wd4189 -wd4244 -wd4201 -wd4996 -I%CommonLibs% -Od %CommonCompilerFlags% - -SET CommonLinkerFlags= -opt:ref -incremental:no - -SET DLLExports=/EXPORT:InitializeApplication /EXPORT:UpdateAndRender /EXPORT:CleanupApplication /EXPORT:ReloadStaticData - -pushd %BuildPath% - -del *.pdb > NUL 2> NUL - -echo WAITING FOR PDB TO WRITE > lock.tmp - -cl %CommonCompilerFlags% %SourceCodePath%\foldhaus_app.cpp /Fefoldhaus.dll /LD /link %CommoLinkerFlags% %DLLExports% -SET LastError=%ERRORLEVEL% - -del lock.tmp - -cl %CommonCompilerFlags% %SourceCodePath%\platform_win32\win32_foldhaus.cpp /link %CommonLinkerFlags% user32.lib winmm.lib gdi32.lib opengl32.lib dsound.lib Ws2_32.lib Comdlg32.lib Winspool.lib - - -REM COMPILE UTILITY EXES - -cl %CommonCompilerFlags% %ProjectDevPath%\src\serial_monitor\first.cpp /Feserial_monitor.exe /link %CommonLinkerFlags% user32.lib winmm.lib gdi32.lib Winspool.lib - -cl %CommonCompilerFlags% %ProjectDevPath%\src\sculpture_gen\gen_blumen_lumen.cpp /Fegen_blumen_lumen.exe /link %CommonLinkerFlags% user32.lib winmm.lib gdi32.lib - -REM COMPILE AND RUN TESTS -cl %CommonCompilerFlags% %ProjectDevPath%\src\tests\sanity_tests.cpp /Fesanity_tests.exe /link %CommonLinkerFlags% user32.lib winmm.lib gdi32.lib - -ECHO SANITY TESTS BEGIN -sanity_tests.exe -ECHO SANITY TESTS END - -popd - -call %MyPath%\_postbuild_win32.bat \ No newline at end of file diff --git a/build/build_meta_msvc_win32_debug.bat b/build/build_meta_msvc_win32_debug.bat deleted file mode 100644 index a57de1b..0000000 --- a/build/build_meta_msvc_win32_debug.bat +++ /dev/null @@ -1,17 +0,0 @@ -@echo off - -SET MyPath=%~dp0 -SET MyPath=%MyPath:~0,-1% -call %MyPath%\_prebuild_win32.bat meta debug msvc - -set CommonCompilerFlags=-nologo -DDEBUG=1 -DPLATFORM_WINDOWS -FC -WX -W4 -Z7 -Oi -GR- -EHsc -EHa- -MTd -fp:fast -fp:except- -set CommonCompilerFlags=-wd4127 -wd4702 -wd4101 -wd4505 -wd4100 -wd4189 -wd4244 -wd4201 -wd4996 -Od %CommonCompilerFlags% -set CommonLinkerFlags= -opt:ref -incremental:no - -pushd %BuildPath% - -cl %CommonCompilerFlags% %SourceCodePath%\foldhaus_meta.cpp /link %CommonLinkerFlags% - -popd - -call %MyPath%\_postbuild_win32.bat \ No newline at end of file diff --git a/build/setup_cl.bat b/build/setup_cl.bat deleted file mode 100644 index bae8867..0000000 --- a/build/setup_cl.bat +++ /dev/null @@ -1,40 +0,0 @@ -@echo off - -ECHO SETUP CL - -SET "LIB=" - -SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio 12.0 -IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\vcvarsall.bat" x64)) - -SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio 11.0 -IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\vcvarsall.bat" x64)) - -SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio 10.0 -IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\vcvarsall.bat" x64)) - -SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio 13.0 -IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\vcvarsall.bat" x64)) - -SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0 -IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\vcvarsall.bat" x64)) - -SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools -IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64)) - -SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community -IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64)) - -SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional -IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64)) - -SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools -IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64)) - -SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community -IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64)) - -SET VC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional -IF NOT DEFINED LIB (IF EXIST "%VC_PATH%" (call "%VC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64)) - -ECHO SETUP CL COMPLETE \ No newline at end of file