Attempt to fix Windows build

- unindent some lines that it can't recognize
- display xNetHack version, not "NetHack 3.7"; use a variable (renamed
  to XNETHACK_VERSION) so I don't have to remember to update this in 2
  places
- Rename a bunch of NETHACK_VERSION to XNETHACK_VERSION. Document that
  all these different Windows build files need to be updated for any new
  version and I hate it.
- While touching those additional files, update stray 3.7.0 versions to
  9.0.0.
- fix the lua download by using https not http
- comment out LUA_VERSION env variable in the workflow; let
  Makefile.nmake provide it
- rename windows "make install" step to "make package"
- fix NetHackW files; use "xNetHackW" only for the .exe file, leave the
  source and object files as "NetHackW". This reverts part of earlier
  commits to rename a bunch of things xNetHack -- the problem with doing
  that in depth is that it causes lots and lots of merge conflicts in
  build files. Only renaming the final executable mostly avoids this.

Author: copperwater

.github/workflows/xnethack-cross-platform-build.yml

@@ -50,7 +50,7 @@ jobs:
         LUASRC: ../submodules/lua
         ADD_CURSES: Y
         PDCURSES_TOP: ../submodules/pdcurses
-        LUA_VERSION: 5.4.2
+        #LUA_VERSION: 5.4.2
         TRAVIS_COMPILER: 1
         ZIP_NAME: xnethack.zip
     steps:
@@ -61,20 +61,15 @@ jobs:
     - name: setup
       run: |
         ./sys/windows/nhsetup.bat
-    - name: make install
+    - name: make package
       run: |
         cd src
-        nmake fetch-lua
-        nmake install
-        # Note: mingw build doesn't seem to build xNetHackW.exe and is disabled.
-        # This would work to build the tty windows version, though.
-        #cp ../sys/winnt/Makefile.gcc ./Makefile
-        #mingw32-make LUA_VERSION=$LUA_VERSION install
+        nmake package
     - uses: thedoctor0/zip-release@master
       if: startsWith(github.ref, 'refs/tags/')
       with:
         type: 'zip'
-        path: binary/
+        path: package/
         filename: xnethack_mswindows.zip
     - name: release
       uses: softprops/action-gh-release@v1

Files

@@ -631,7 +631,7 @@ getline.c  termcap.c  topl.c     wintty.c
 
 win/win32:
 (files for Windows versions - tested up to Windows 11)
-NetHackW.c             xNetHackW.exe.manifest xNetHackW.rc
+NetHackW.c             NetHackW.exe.manifest  NetHackW.rc
 mhaskyn.c              mhaskyn.h              mhdlg.c
 mhdlg.h                mhfont.c               mhfont.h
 mhinput.c              mhinput.h              mhmain.c

doc/xnethack-new-version-runbook.md

@@ -38,8 +38,12 @@ Assumed premises:
    `VERSION_COMPATIBILITY` in patchlevel.h. Reset `EDITLEVEL` to 0 if it isn't
    already. Update `NH_DEVEL_STATUS` to `NH_STATUS_RELEASED` if it isn't already
    (it tends to not get changed from that except by the vanilla devteam). Update
-   `NETHACK_VERSION` in sys/windows/Makefile.nmake (blargh). Commit these
-   changes.
+   `XNETHACK_VERSION` in the following files (blargh):
+   - sys/windows/Makefile.nmake
+   - sys/windows/vs/NetHackProperties.props
+   - sys/windows/vs/package/package.nmake
+   - sys/windows/vs/FetchPrereq/fetchprereq.nmake
+   Commit these changes.
 10. Tag the patchlevel commit, e.g. `xnh5.0`, via `git tag -a xnh5.0`. Write the
     tag message using previous release tags as an example (xnh6.0 is a good
     matter-of-fact one). Mention that Windows binaries are available to download

sys/windows/GNUmakefile

@@ -229,10 +229,10 @@ endif
 #==============================================================================
 
 #  The version of the game this Makefile was designed for
-NETHACK_VERSION="3.7.0"
+XNETHACK_VERSION="9.0.0"
 
 # A brief version for use in macros
-NHV1=$(subst .,,$(NETHACK_VERSION))
+NHV1=$(subst .,,$(XNETHACK_VERSION))
 NHV=$(subst ",,$(NHV1))
 
 #
@@ -412,7 +412,7 @@ $(ULUADLL) $(LUAIMP): $(LUAOBJS) | $(OLUA)
 	$(ld) $(LDFLAGS) -fPIC -shared -Wl,--export-all-symbols -Wl,--add-stdcall-alias \
 		-Wl,--out-implib=$(LUAIMP) $^ -o$(ULUADLL)
 
-$(LUASTATIC): $(LUAOBJS) | $(OLUA) 
+$(LUASTATIC): $(LUAOBJS) | $(OLUA)
 	ar rcs $@ $^
 
 $(OLUA)/%.o: $(LUASRC)/%.c | $(OLUA)
@@ -485,7 +485,7 @@ HLTARGETS = $(HLHACKLIB) $(HLHACKLIBOBJS)
 $(HL)/hacklib.a: $(HLHACKLIBOBJS)
 	ar rcs $@ $^
 
-$(HL)/hacklib.o: $(HACKLIBSRC) | $(HL)	
+$(HL)/hacklib.o: $(HACKLIBSRC) | $(HL)
 
 $(HL)/%.o: $(SRC)/%.c | $(HL)
 	$(cc) $(CFLAGSU) $< -o$@

sys/windows/Makefile.nmake

@@ -159,10 +159,10 @@ GIT_AVAILABLE=Y
 #==============================================================================
 #
 #  The version of the game this Makefile was designed for
-NETHACK_VERSION="9.0.0"
+XNETHACK_VERSION="9.0.0"
 
 # A brief version for use in macros
-NHV=$(NETHACK_VERSION:.=)
+NHV=$(XNETHACK_VERSION:.=)
 NHV=$(NHV:"=)
 
 #==============================================================================
@@ -378,15 +378,15 @@ ADD_CURSES=Y
 INCLCURSES_H=-I$(R_PDCURSES_TOP)
 !  ELSE
 #  Cannot do it, sorry
-   PDCINCL=
-   INCLCURSES_H=
-   ADD_CURSES = N
+PDCINCL=
+INCLCURSES_H=
+ADD_CURSES = N
 !  ENDIF  # If we found a copy of curses.h
 ! ENDIF  # ADD_CURSES == Y
 !ENDIF  # WANT_CURSES
 
 !IF "$(ADD_CURSES)" != "Y"
-!MESSAGE NetHack 3.7 will be built without support for the curses window-port.
+!MESSAGE xNetHack $(XNETHACK_VERSION) will be built without support for the curses window-port.
 !ENDIF
 
 #These will be in the environment variables with one of the Visual Studio
@@ -1613,7 +1613,7 @@ $(PDCURSES_TOP)curses.h:
 #	git submodule update --remote $(SUBM)$(R_PDCDIST)
 !ENDIF
 !ELSE  # GIT_AVAILABLE no
-CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz
+CURLLUASRC=https://www.lua.org/ftp/lua-5.4.6.tar.gz
 CURLLUADST=lua-5.4.6.tar.gz
 
 #CURLPDCSRC=https://github.com/wmcbrine/PDCurses/archive/refs/tags/3.9.zip
@@ -1709,7 +1709,7 @@ $(GAMEDIR)xNetHack.exe : gamedir.tag $(OTTY)consoletty.o \
 $(GAMEDIR)xNetHackW.exe : gamedir.tag $(OGUI)tile.o \
 			$(ALLOBJGUI) $(GAMEOBJGUI) $(GUIOBJ) $(GUISOUNDOBJS) \
 			$(CURSESWINGUIOBJS) $(OGUI)date.o \
-			$(OGUI)xNetHackW.res \
+			$(OGUI)NetHackW.res \
 			$(LUALIB) $(PDCWINGUILIB) $(PDCWINGUIOBJS) $(OGUIHACKLIB)
 	@if not exist $(GAMEDIR)*.* mkdir $(R_GAMEDIR)
 	@echo   Linking $(@:\=/)
@@ -1724,7 +1724,7 @@ $(GAMEDIR)xNetHackW.exe : gamedir.tag $(OGUI)tile.o \
 		$(GUISOUNDOBJS) $(CURSESWINGUIOBJS) $(PDCWINGUIOBJS)
 		$(OGUI)tile.o
 		$(OGUI)date.o
-		$(OGUI)xNetHackW.res
+		$(OGUI)NetHackW.res
 << keep
 
 #--------
@@ -1793,12 +1793,12 @@ $(INCL)nhlua.h:
 tileutil: $(U)gif2txt.exe $(U)gif2tx32.exe $(U)txt2ppm.exe
 	@echo Optional tile development utilities are up to date.
 
-$(OGUI)xNetHackW.res: $(SRC)tiles.bmp $(MSWIN)xNetHackW.rc $(MSWIN)NetHack.ico \
+$(OGUI)NetHackW.res: $(SRC)tiles.bmp $(MSWIN)NetHackW.rc $(MSWIN)NetHack.ico \
 	$(MSWIN)mnsel.bmp $(MSWIN)mnselcnt.bmp $(MSWIN)mnunsel.bmp \
 	$(MSWIN)petmark.bmp $(MSWIN)pilemark.bmp $(MSWIN)NetHack.ico \
-	$(MSWIN)rip.bmp $(MSWIN)splash.bmp $(MSWIN)xNetHackW.exe.manifest $(WAV)
+	$(MSWIN)rip.bmp $(MSWIN)splash.bmp $(MSWIN)NetHackW.exe.manifest $(WAV)
 	@echo Building resource file $@ from $**
-	$(rc) -nologo -r -fo$@ -i$(MSWIN) -i$(SndWavDir) -dNDEBUG -dVIA_MAKE $(RCFLAGS) $(MSWIN)xNetHackW.rc
+	$(rc) -nologo -r -fo$@ -i$(MSWIN) -i$(SndWavDir) -dNDEBUG -dVIA_MAKE $(RCFLAGS) $(MSWIN)NetHackW.rc
 
 $(OTTY)console.res: $(MSWSYS)console.rc $(MSWSYS)NetHack.ico $(WAV)
 	@echo Building resource file $@ from $**
@@ -2039,7 +2039,7 @@ fetch-Lua: fetch-actual-Lua
 fetch-actual-Lua:
 	@if not exist $(LIBDIR)*.* mkdir $(R_LIBDIR)
 	cd $(LIBDIR)
-	curl -R -O http://www.lua.org/ftp/lua-$(LUAVER).tar.gz
+	curl -R -O https://www.lua.org/ftp/lua-$(LUAVER).tar.gz
 	tar zxf lua-$(LUAVER).tar.gz
 	if exist lua-$(LUAVER).tar.gz del lua-$(LUAVER).tar.gz
 	if exist lua-$(LUAVER).tar del lua-$(LUAVER).tar
@@ -2369,7 +2369,7 @@ $(OGUI)mhstatus.o: $(MSWIN)mhstatus.c $(MSWIN)$(@B).h $(MSWIN)mhmsg.h $(MSWIN)mh
 $(OGUI)mhtext.o: $(MSWIN)mhtext.c $(MSWIN)$(@B).h $(MSWIN)mhmsg.h $(MSWIN)mhfont.h \
 		$(WINDHDR) $(HACK_H)
 $(OGUI)mswproc.o: $(MSWIN)mswproc.c $(ALL_GUIHDR) $(MSWIN)resource.h $(WINDHDR) $(HACK_H)
-$(OGUI)xNetHackW.o: $(MSWIN)NetHackW.c $(ALL_GUIHDR) $(MSWIN)resource.h $(WINDHDR) $(HACK_H)
+$(OGUI)NetHackW.o: $(MSWIN)NetHackW.c $(ALL_GUIHDR) $(MSWIN)resource.h $(WINDHDR) $(HACK_H)
 
 #===================================================================
 # sys/share dependencies
@@ -2549,10 +2549,10 @@ $(SndWavDir)sa2_xplevelup.wav: $(SndWavDir)sa2_xplevelup.uu $(U)uudecode.exe
 # packaging
 #===============================================================================
 
-PKGFILES = nethackrc.template Guidebook.txt license xNetHack.exe NetHack.txt \
-	 NetHackW.exe opthelp nhdat370 record symbols sysconf.template
-FILESTOZIP = $(BinDir)nethackrc.template $(BinDir)Guidebook.txt $(BinDir)license \
-	$(BinDir)xNetHack.exe $(BinDir)NetHack.txt $(BinDir)NetHackW.exe \
+PKGFILES = xnethackrc.template Guidebook.txt license xNetHack.exe NetHack.txt \
+	 xNetHackW.exe opthelp nhdat370 record symbols sysconf.template
+FILESTOZIP = $(BinDir)xnethackrc.template $(BinDir)Guidebook.txt $(BinDir)license \
+	$(BinDir)xNetHack.exe $(BinDir)NetHack.txt $(BinDir)xNetHackW.exe \
 	$(BinDir)opthelp $(BinDir)nhdat370 $(BinDir)record \
 	$(BinDir)symbols $(BinDir)sysconf.template
 DBGSYMS = NetHack.PDB NetHackW.PDB
@@ -2577,7 +2577,7 @@ binary:  envchk.tag libdir.tag ottydir$(TARGET_CPU).tag \
 		$(INCL)nhlua.h $(OUTL)utility.tag \
 		$(DAT)data $(DAT)rumors $(DAT)oracles $(DAT)engrave \
 		$(DAT)epitaph $(DAT)bogusmon $(GAMEDIR)xNetHack.exe \
-		$(GAMEDIR)NetHackW.exe $(GAMEDIRDLLS) binary.tag
+		$(GAMEDIR)xNetHackW.exe $(GAMEDIRDLLS) binary.tag
 	@echo NetHack is up to date.
 
 #===============================================================================
@@ -2715,7 +2715,7 @@ clean:
 	if exist $(SRC)tiles.bmp       del $(SRC)tiles.bmp
 	if exist $(OTTY)console.res     del $(OTTY)console.res
 	if exist $(OTTY)xNetHack.res    del $(OTTY)xNetHack.res
-	if exist $(OGUI)xNetHackW.res   del $(OGUI)xNetHackW.res
+	if exist $(OGUI)NetHackW.res   del $(OGUI)NetHackW.res
 
 #===================================================================
 # OTHER DEPENDENCIES

sys/windows/vs/FetchPrereq/fetchprereq.nmake

@@ -2,10 +2,10 @@
 #==============================================================================
 #
 #  The version of the game this Makefile was designed for
-NETHACK_VERSION="3.7.0"
+XNETHACK_VERSION="9.0.0"
 
 # A brief version for use in macros
-NHV=$(NETHACK_VERSION:.=)
+NHV=$(XNETHACK_VERSION:.=)
 NHV=$(NHV:"=)
 
 #  The version of Lua we want
@@ -64,7 +64,7 @@ fetch-pdcurses:
 	@echo #include "lauxlib.h" >> $@
 	@echo /*nhlua.h*/ >> $@
 
-libdir: 
+libdir:
 	@if not exist $(LIBDIR)\*.* echo creating directory $(LIB:\=/)
 	@if not exist $(LIBDIR)\*.* mkdir $(LIBDIR)
 

sys/windows/vs/NetHackProperties.props

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <VERSION_MAJOR>3</VERSION_MAJOR>
-    <VERSION_MINOR>7</VERSION_MINOR>
+    <VERSION_MAJOR>9</VERSION_MAJOR>
+    <VERSION_MINOR>0</VERSION_MINOR>
     <PATCHLEVEL>0</PATCHLEVEL>
-    <NETHACK_VERSION>$(VERSION_MAJOR).$(VERSION_MINOR).$(PATCHLEVEL)</NETHACK_VERSION>
+    <XNETHACK_VERSION>$(VERSION_MAJOR).$(VERSION_MINOR).$(PATCHLEVEL)</XNETHACK_VERSION>
     <LUA_MAJOR_VERSION>5</LUA_MAJOR_VERSION>
     <LUA_MINOR_VERSION>4</LUA_MINOR_VERSION>
     <LUA_PATCH_LEVEL>6></LUA_PATCH_LEVEL>

sys/windows/vs/NetHackW/NetHackW.vcxproj

@@ -77,7 +77,7 @@
       <AdditionalDependencies>hacklib.lib;lualib.lib;dbghelp.lib;comctl32.lib;winmm.lib;bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Manifest>
-      <AdditionalManifestFiles>$(WinWin32Dir)xNethackW.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+      <AdditionalManifestFiles>$(WinWin32Dir)NethackW.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -252,7 +252,7 @@
     <ClCompile Include="$(WinWin32Dir)NetHackW.c" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="$(WinWin32Dir)xNetHackW.rc" />
+    <ResourceCompile Include="$(WinWin32Dir)NetHackW.rc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(WinWin32Dir)mhaskyn.h" />

sys/windows/vs/package/package.nmake

@@ -3,15 +3,15 @@
 #
 #  The version of the game this Makefile was designed for
 
-!IFNDEF NETHACK_VERSION
-NETHACK_VERSION="3.7.0"
-!MESSAGE NETHACK_VERSION set to $(NETHACK_VERSION).
+!IFNDEF XNETHACK_VERSION
+XNETHACK_VERSION="9.0.0"
+!MESSAGE XNETHACK_VERSION set to $(XNETHACK_VERSION).
 !ELSE
-!MESSAGE NETHACK_VERSION set to $(NETHACK_VERSION) by caller.
+!MESSAGE XNETHACK_VERSION set to $(XNETHACK_VERSION) by caller.
 !ENDIF
 
 # A brief variation for use in macros
-NHV=$(NETHACK_VERSION:.=)
+NHV=$(XNETHACK_VERSION:.=)
 NHV=$(NHV:"=)
 
 #

sys/windows/vs/package/package.vcxproj

@@ -54,7 +54,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-	<NMakeBuildCommandLine>pushd $(vsDir)package %26%26 nmake -F package.nmake BinDir=&quot;$(BinDir)\&quot; Platform=&quot;$(Platform)&quot; PlatformShortName=&quot;$(PlatformShortName)&quot; Configuration=&quot;$(Configuration)&quot; NETHACK_VERSION=&quot;$(NETHACK_VERSION)&quot; %26%26 popd</NMakeBuildCommandLine>
+	<NMakeBuildCommandLine>pushd $(vsDir)package %26%26 nmake -F package.nmake BinDir=&quot;$(BinDir)\&quot; Platform=&quot;$(Platform)&quot; PlatformShortName=&quot;$(PlatformShortName)&quot; Configuration=&quot;$(Configuration)&quot; XNETHACK_VERSION=&quot;$(XNETHACK_VERSION)&quot; %26%26 popd</NMakeBuildCommandLine>
 	<NMakeCleanCommandLine>pushd $(vsDir)package %26%26 nmake -F package.nmake clean %26%26 popd</NMakeCleanCommandLine>
 	<NMakeReBuildCommandLine>pushd $(vsDir)package %26%26 nmake -F package.nmake rebuild %26%26 popd</NMakeReBuildCommandLine>
   </PropertyGroup>