diff --git a/.idea/dictionaries/ericf.xml b/.idea/dictionaries/ericf.xml index c9101d02..e781fd39 100644 --- a/.idea/dictionaries/ericf.xml +++ b/.idea/dictionaries/ericf.xml @@ -327,6 +327,7 @@ clrhdr clrnames clrred + cmakeserver cmathmodule cmds cmembers @@ -1055,6 +1056,7 @@ libssl libvorbi libvorbis + libvorbisfile libxm libxmu libxz @@ -1207,6 +1209,7 @@ msbuild mshell msvccompiler + msvcp mtarget mtime mtrans @@ -1598,6 +1601,7 @@ realsies recache redist + redistributables relpath remainingchecks remoteapp @@ -1993,6 +1997,7 @@ topkillcount topkilledcount toplevel + toplevelfiles totaldudes totalpts totalwaves @@ -2100,6 +2105,7 @@ varname varsize vartype + vcruntime vcxproj venv verlines @@ -2148,14 +2154,17 @@ willeval wincfg wincount + winempty winnergroup winnergroups winplt winprj winref winscore + winserver winsound winstate + wintype wmsbe woooo workdir diff --git a/CHANGELOG.md b/CHANGELOG.md index c0737fb1..2696a3d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 1.5.5 (20069) +- Cleaned up Windows version packaging. +- More misc bug fixes. + ### 1.5.4 (20067) - Should now work properly with non-ascii paths on Windows (for real this time). - Note that Windows game data is now stored under 'Local' appdata instead of 'Roaming'; if you have an old install with data you want to preserve, you may want to move it over manually. diff --git a/tools/snippets b/tools/snippets index 95a8ada5..8e1fb344 100755 --- a/tools/snippets +++ b/tools/snippets @@ -583,8 +583,12 @@ def lazy_increment_build() -> None: import os import subprocess from efro.terminal import Clr + from efro.error import CleanError from efrotools import get_files_hash from efrotools.code import get_code_filenames + if sys.argv[2:] not in [[], ['--update-hash-only']]: + raise CleanError('Invalid arguments') + update_hash_only = '--update-hash-only' in sys.argv codefiles = get_code_filenames(PROJROOT) codehash = get_files_hash(codefiles) hashfilename = '.cache/lazy_increment_build' @@ -596,9 +600,11 @@ def lazy_increment_build() -> None: if codehash != lasthash: print(f'{Clr.SMAG}Source(s) changed; incrementing build...{Clr.RST}') - # Just go ahead and bless; this will increment the build as needed. - # subprocess.run(['make', 'bless'], check=True) - subprocess.run(['tools/version_utils', 'incrementbuild'], check=True) + if not update_hash_only: + # Just go ahead and bless; this will increment the build as needed. + # subprocess.run(['make', 'bless'], check=True) + subprocess.run(['tools/version_utils', 'incrementbuild'], + check=True) # We probably just changed code, so we need to re-calc the hash. codehash = get_files_hash(codefiles)