1.5.5

.idea/dictionaries/ericf.xml

@@ -327,6 +327,7 @@
       <w>clrhdr</w>
       <w>clrnames</w>
       <w>clrred</w>
+      <w>cmakeserver</w>
       <w>cmathmodule</w>
       <w>cmds</w>
       <w>cmembers</w>
@@ -1055,6 +1056,7 @@
       <w>libssl</w>
       <w>libvorbi</w>
       <w>libvorbis</w>
+      <w>libvorbisfile</w>
       <w>libxm</w>
       <w>libxmu</w>
       <w>libxz</w>
@@ -1207,6 +1209,7 @@
       <w>msbuild</w>
       <w>mshell</w>
       <w>msvccompiler</w>
+      <w>msvcp</w>
       <w>mtarget</w>
       <w>mtime</w>
       <w>mtrans</w>
@@ -1598,6 +1601,7 @@
       <w>realsies</w>
       <w>recache</w>
       <w>redist</w>
+      <w>redistributables</w>
       <w>relpath</w>
       <w>remainingchecks</w>
       <w>remoteapp</w>
@@ -1993,6 +1997,7 @@
       <w>topkillcount</w>
       <w>topkilledcount</w>
       <w>toplevel</w>
+      <w>toplevelfiles</w>
       <w>totaldudes</w>
       <w>totalpts</w>
       <w>totalwaves</w>
@@ -2100,6 +2105,7 @@
       <w>varname</w>
       <w>varsize</w>
       <w>vartype</w>
+      <w>vcruntime</w>
       <w>vcxproj</w>
       <w>venv</w>
       <w>verlines</w>
@@ -2148,14 +2154,17 @@
       <w>willeval</w>
       <w>wincfg</w>
       <w>wincount</w>
+      <w>winempty</w>
       <w>winnergroup</w>
       <w>winnergroups</w>
       <w>winplt</w>
       <w>winprj</w>
       <w>winref</w>
       <w>winscore</w>
+      <w>winserver</w>
       <w>winsound</w>
       <w>winstate</w>
+      <w>wintype</w>
       <w>wmsbe</w>
       <w>woooo</w>
       <w>workdir</w>

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.

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)