From 3fb6b0ab074c3cf5bed6ece478ea2a9b20d4bf0a Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Mon, 12 Oct 2020 13:48:00 -0700 Subject: [PATCH] More CI build fixes --- .efrocachemap | 8 ++++---- Makefile | 14 +++++++------- tools/batools/pcommand.py | 10 ++++++---- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 0372d3e6..ccbfc8a3 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3948,8 +3948,8 @@ "build/prefab/lib/linux_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/4c/a9/568023651355fdd0ce7a865c2872", "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/82/80/5c56c9f311d997f73ed3ed41eb39", "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/42/be/79eec8bc7b2cc914cc6cb8ed0769", - "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/8e/2e/c863e5520613579954468f8f9887", - "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ed/c0/d1bfae39ac76c4f150e7ac62fc7a", - "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/33/24/eb3b20e77451470149dd9fe13b30", - "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e8/22/e069b33ef595ba51da411ed32d3c" + "build/prefab/lib/mac_x86_64/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/89/3e/7c8a36f1d37195fb8c9bd8088276", + "build/prefab/lib/mac_x86_64/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b7/a5/2c60483331e391a88ba5cbad31c1", + "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/69/49/801eb43b86bcce796266a08ae3ab", + "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/fa/53/cbd657a2f8d5535f830e5424db86" } \ No newline at end of file diff --git a/Makefile b/Makefile index a212515f..3f3d1571 100644 --- a/Makefile +++ b/Makefile @@ -716,7 +716,7 @@ cmake: cmake-build # Build but don't run it. cmake-build: assets-cmake resources code @tools/pcommand cmake_prep_dir build/cmake/$(CM_BT_LC) - @tools/pcommand update_prefab_libs standard ${CM_BT_LC} + @tools/pcommand update_prefab_libs standard ${CM_BT_LC} build/cmake/${CM_BT_LC} @${STAGE_ASSETS} -cmake build/cmake/$(CM_BT_LC) @cd build/cmake/$(CM_BT_LC) && test -f Makefile \ || cmake -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \ @@ -731,7 +731,7 @@ cmake-server: cmake-server-build cmake-server-build: assets-cmake resources code @tools/pcommand cmake_prep_dir build/cmake/server-$(CM_BT_LC)/dist - @tools/pcommand update_prefab_libs server ${CM_BT_LC} + @tools/pcommand update_prefab_libs server ${CM_BT_LC} build/cmake/server-${CM_BT_LC}/dist @${STAGE_ASSETS} -cmakeserver -${CM_BT_LC} build/cmake/server-$(CM_BT_LC) @cd build/cmake/server-$(CM_BT_LC)/dist && test -f Makefile \ || cmake -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -DHEADLESS=true \ @@ -819,12 +819,12 @@ ballisticacore-cmake/.clang-format: .clang-format # Simple target for CI to build a binary but no assets/etc. _cmake-simple-ci-server-build: - rm -rf build/cmake/server-debug - mkdir -p build/cmake/server-debug - tools/pcommand update_prefab_libs server debug - cd build/cmake/server-debug && \ + rm -rf build/cmake_scsb + mkdir -p build/cmake_scsb + tools/pcommand update_prefab_libs server debug build/cmake_scsb + cd build/cmake_scsb && \ cmake -DCMAKE_BUILD_TYPE=Debug -DHEADLESS=true ${PWD}/ballisticacore-cmake - cd build/cmake/server-debug && ${MAKE} -j${CPUS} + cd build/cmake_scsb && ${MAKE} -j${CPUS} # Tell make which of these targets don't represent files. .PHONY: _cmake-simple-ci-server-build diff --git a/tools/batools/pcommand.py b/tools/batools/pcommand.py index f0fbebef..8000b2da 100644 --- a/tools/batools/pcommand.py +++ b/tools/batools/pcommand.py @@ -689,10 +689,11 @@ def update_prefab_libs() -> None: import os from efro.error import CleanError import batools.build - if len(sys.argv) != 4: + if len(sys.argv) != 5: raise CleanError('Expected 2 args (standard/server, debug/release)') buildtype = sys.argv[2] mode = sys.argv[3] + builddir = sys.argv[4] if buildtype not in {'standard', 'server'}: raise CleanError(f'Invalid buildtype: {buildtype}') if mode not in {'debug', 'release'}: @@ -706,9 +707,10 @@ def update_prefab_libs() -> None: # or the existing one is older than our target. subprocess.run(['make', target], check=True) - prefix = 'server-' if buildtype == 'server' else '' - suffix = '/dist' if buildtype == 'server' else '' - libdir = f'build/cmake/{prefix}{mode}{suffix}/prefablib' + # prefix = 'server-' if buildtype == 'server' else '' + # suffix = '/dist' if buildtype == 'server' else '' + # libdir = f'build/cmake/{prefix}{mode}{suffix}/prefablib' + libdir = os.path.join(builddir, 'prefablib') libpath = os.path.join(libdir, 'libballisticacore_internal.a') update = True