From ac2e748c51be1db39aac1fc039bf65152393c5ec Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Sun, 6 Sep 2020 13:17:38 -0500 Subject: [PATCH] Build system improvements --- .efrocachemap | 20 ++++++++++---------- .idea/dictionaries/ericf.xml | 10 ++++++++++ CHANGELOG.md | 2 +- tools/batools/build.py | 7 +++---- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index b970591a..3ce9104a 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3930,14 +3930,14 @@ "assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f", "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/3f/99/9b94f7d478142a08e02c769b64ba", "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/0d/f0/aed2b96addcc73e2de400aed2bdf", - "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a0/07/c0bf82b57e34f20a58069edbf651", - "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ca/a7/0c55882b9794255f1c5dede196b7", - "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c5/56/b033099ea96d4113fc434519f2bb", - "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/58/45/c307135aeb9b0ff3f98778db9db9", - "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/e1/c0/d4e431d897d7bed37f6af21a9c9f", - "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/60/1d/ed514d5f0e2d6c0d6ca7a9a4c059", - "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/ae/93/1a312729ea081233baf8a5f36be3", - "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/74/c8/64608e7c5a716cc336fc6425edf2", - "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/39/db/0246df61ce4d65a8e805437aa3d7", - "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/80/4a/b0729f19eee793ddb1a2f7b73fb1" + "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/d5/25/c53d807027893a776c6ebacedba4", + "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/84/bc/afaf493d73932639a1df0d689158", + "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7b/38/1ac23b6476d4fe77d9a82be52eae", + "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/18/1a/4bec9010414391b6ece113b659ca", + "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a0/1f/6dfe3c5638b23e6524946ee0fd30", + "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/aa/c1/915052e847075e26c14d309f8bb9", + "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/0f/54/4b9c86bb0cfcfe728e1b339333d5", + "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/83/53/e6a28ed5caef6be78dc556f91e3b", + "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/b7/7d/d2075b867fc7e1cd281d0f87fd66", + "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/b6/29/f05e7a8507a4f0c1c20594b592a1" } \ No newline at end of file diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml index f78d0797..5fec9375 100644 --- a/.idea/dictionaries/ericf.xml +++ b/.idea/dictionaries/ericf.xml @@ -160,6 +160,7 @@ baseh basemult basepos + baservnode basespaz basetime baseurl @@ -240,6 +241,7 @@ buildfile buildfilename buildnum + buildserver buildtype bullseye bumpmap @@ -329,6 +331,7 @@ clioncode clionroot cloudshell + cloudshellbuild cloudtool cloudtoolcmd clrblu @@ -397,6 +400,8 @@ cornerpin coroutines countdownsounds + cpbd + cpnf cpplint cpplintcode cpplintcodefull @@ -409,6 +414,8 @@ creationflags creditslist cryptmodule + cspbd + cspnf cssclass cstr csum @@ -1029,6 +1036,8 @@ jsonutils kbclass kbytecount + keepalive + keepalives keepaway keeprefs keylayout @@ -1137,6 +1146,7 @@ lnums loadpackage localconfig + localdir localuser locationgroup locationgroups diff --git a/CHANGELOG.md b/CHANGELOG.md index 9649c48a..ee31f156 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.5.25 (20175) +### 1.5.25 (20176) - Added Venetian language (thanks Federico!) - Fixed an issue where chosen-one flashes would remain if the player leaves the game - Added android input-device detection log messages for debugging diff --git a/tools/batools/build.py b/tools/batools/build.py index 5f181bf3..a85d4b3d 100644 --- a/tools/batools/build.py +++ b/tools/batools/build.py @@ -430,19 +430,18 @@ def gen_fulltest_buildfile_linux() -> None: dayoffset = datetime.datetime.now().timetuple().tm_yday targets = ['build', 'server-build'] - linflav = 'LINUX_FLAVOR=u18s' lines = [] for target in targets: - lines.append(f'{linflav} make linux-{target}') + lines.append(f'make cmake-cloudshell-{target}') if DO_SPARSE_TEST_BUILDS: extras = SPARSE_TEST_BUILDS[dayoffset % len(SPARSE_TEST_BUILDS)] extras = [e for e in extras if e.startswith('linux.')] for extra in extras: if extra == 'linux.package': - lines.append(f'{linflav} make linux-package') + lines.append('make linux-package') elif extra == 'linux.package.server': - lines.append(f'{linflav} make linux-server-package') + lines.append('make linux-server-package') else: raise RuntimeError(f'Unknown extra: {extra}')