support for build with current Lua version 5.4.4

On some platforms this may require:
       re-using a sys/unix/hints file to generate updated Makefiles
       make spotless
       make fetch-lua

diff --git a/Porting b/Porting
index 477f10682b17f4a3db94c3b4592ba3c1f3c87f53..2327ba53367182202709465d5109f07a09ef93c5 100644 (file)
--- a/Porting
+++ b/Porting
@@ -209,7 +209,7 @@ need to be included in the packaging of the game.
      4.3. Lua
 
        Compile and link into a library, or obtain a prebuilt Lua library for
-your platform. Place the Lua source into lib/lua-5.4.3 (or other folder
+your platform. Place the Lua source into lib/lua-5.4.4 (or other folder
 representing an appropriate Lua version); place the compiled Lua library into
 lib.
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d135e89859a11da45367d19417415b8d19b62608..01b39e88da7ebb763ffcd165ee29242a1fdbb8d9 100644 (file)
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -136,7 +136,7 @@ steps:
     export LUASRC=../submodules/lua
     export ADD_CURSES=Y
     export PDCURSES_TOP=../submodules/pdcurses
-    export LUA_VERSION=5.4.3
+    export LUA_VERSION=5.4.4
     export TRAVIS_COMPILER=1
     cp ../sys/windows/Makefile.gcc ./Makefile
     mingw32-make LUA_VERSION=$LUA_VERSION install
@@ -208,8 +208,8 @@ steps:
     cd ../..
     make fetch-lua
     sh sys/msdos/fetch-cross-compiler.sh
-    make LUA_VERSION=5.4.3 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 all
-    make LUA_VERSION=5.4.3 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 package
+    make LUA_VERSION=5.4.4 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 all
+    make LUA_VERSION=5.4.4 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 package
   condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.toolchain, 'cross'))
   workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
   displayName: 'Building MSDOS build'

diff --git a/outdated/.travis.yml b/outdated/.travis.yml
index 6932e8815da8c7a4c2e5635be55aeea1839beefd..57cecc451f22c2cfe917ddfc19de03d3eb1e9818 100644 (file)
--- a/outdated/.travis.yml
+++ b/outdated/.travis.yml
@@ -3,7 +3,7 @@ matrix:
   include:
     - name: linux-xenial-gcc-win-all
       os: linux
-      env: HINTS=linux.370 LUA_VERSION=5.4.3
+      env: HINTS=linux.370 LUA_VERSION=5.4.4
       compiler: gcc
       addons:
         apt:
@@ -21,7 +21,7 @@ matrix:
         - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
     - name: linux-bionic-gcc-win-all
       os: linux
-      env: HINTS=linux.370 LUA_VERSION=5.4.3
+      env: HINTS=linux.370 LUA_VERSION=5.4.4
       dist: bionic
       compiler: gcc
       addons:
@@ -40,7 +40,7 @@ matrix:
         - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
     - name: linux-focal-clang-win-all
       os: linux
-      env: HINTS=linux.370 LUA_VERSION=5.4.3
+      env: HINTS=linux.370 LUA_VERSION=5.4.4
       dist: focal
       compiler: clang
       addons:
@@ -59,7 +59,7 @@ matrix:
         - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
     - name: linux-xenial-gcc-nocommon
       os: linux
-      env: HINTS=linux.370 LUA_VERSION=5.4.3
+      env: HINTS=linux.370 LUA_VERSION=5.4.4
       dist: xenial
       compiler: gcc
       script:
@@ -70,7 +70,7 @@ matrix:
         - make install
     - name: linux-focal-gcc9-win-all
       os: linux
-      env: HINTS=linux.370 LUA_VERSION=5.4.3
+      env: HINTS=linux.370 LUA_VERSION=5.4.4
       dist: focal
       compiler: gcc
       addons:
@@ -91,7 +91,7 @@ matrix:
         - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
     - name: linux-xenial-gcc-minimal
       os: linux
-      env: HINTS=linux-minimal LUA_VERSION=5.4.3
+      env: HINTS=linux-minimal LUA_VERSION=5.4.4
       compiler: gcc
       script: |
               cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
@@ -129,7 +129,7 @@ matrix:
       script:
         - export ADD_CURSES=Y
         - export PDCURSES_TOP=../lib/pdcurses
-        - export LUA_VERSION=5.4.3
+        - export LUA_VERSION=5.4.4
         - sh sys/windows/travis-gcc.sh
         - test -d "lib/lua-$LUA_VERSION/src" || exit 0
         - test -d "lib/pdcurses" || exit 0
@@ -138,7 +138,7 @@ matrix:
         - mingw32-make LUA_VERSION=$LUA_VERSION install
     - name: msdos-linux-focal-djgpp-crosscompile
       os: linux
-      env: HINTS=linux.370 LUA_VERSION=5.4.3
+      env: HINTS=linux.370 LUA_VERSION=5.4.4
       dist: focal
       compiler: gcc
       script:

diff --git a/submodules/lua b/submodules/lua
index eadd8c7178c79c814ecca9652973a9b9dd4cc71b..5d708c3f9cae12820e415d4f89c9eacbe2ab964b 160000 (submodule)
--- a/submodules/lua
+++ b/submodules/lua
@@ -1 +1 @@
-Subproject commit eadd8c7178c79c814ecca9652973a9b9dd4cc71b
+Subproject commit 5d708c3f9cae12820e415d4f89c9eacbe2ab964b

diff --git a/submodules/pdcurses b/submodules/pdcurses
index 618e0aaa31b4728eb4df78ec4de6c2b873908eda..2fa0f10dd844da47ee83c05a40a1ec541ceb95e1 160000 (submodule)
--- a/submodules/pdcurses
+++ b/submodules/pdcurses
@@ -1 +1 @@
-Subproject commit 618e0aaa31b4728eb4df78ec4de6c2b873908eda
+Subproject commit 2fa0f10dd844da47ee83c05a40a1ec541ceb95e1

diff --git a/sys/msdos/Install.dos b/sys/msdos/Install.dos
index 2504324c7252073efec834cf79af9bc9560175bf..a49665efda186955da30d5ba03fd962b8473a49a 100644 (file)
--- a/sys/msdos/Install.dos
+++ b/sys/msdos/Install.dos
@@ -44,7 +44,7 @@ II. There once was a time when people built NetHack right on their DOS machine.
     and pdcurses from:
         https://github.com/wmcbrine/PDCurses.git
     and Lua from:
-        http://www.lua.org/ftp/lua-5.4.3.tar.gz
+        http://www.lua.org/ftp/lua-5.4.4.tar.gz
 
     - A shell script to download the above-mentioned djgpp cross-compiler and
       associated support pieces for either linux or macOS is available:

diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC
index c50e2ef9b869bee9c510c92b169756339a3780d7..b7c725d9990bf3a3cb150ea0d49fb2679ff50e9a 100644 (file)
--- a/sys/msdos/Makefile.GCC
+++ b/sys/msdos/Makefile.GCC
@@ -42,13 +42,13 @@ GAMEDIR =../binary
 ifeq "$(LUA_VERSION)" "5.3.5"
 LUAVER=5.3.5
 else
-LUAVER=5.4.3
+LUAVER=5.4.4
 endif
 #---------------------------------------------------------------
 # Location of LUA
 #
 # Original source needs to be obtained from: 
-#    http://www.lua.org/ftp/lua-5.4.3.tar.gz
+#    http://www.lua.org/ftp/lua-5.4.4.tar.gz
 #
 #    This build assumes that the LUA sources are located
 #    at the specified location. If they are actually elsewhere
@@ -305,7 +305,7 @@ ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ)
 
 #===============-=================================================
 # LUA library
-# Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
+# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz
 #=================================================================
 
 LUASRC   = $(LUATOP)/src

diff --git a/sys/msdos/fetch-cross-compiler.sh b/sys/msdos/fetch-cross-compiler.sh
index 97791c1e6100816a09f5407885f1370cb161204a..72dbf05c9569a5034f1f05bf541ce95bc0e75d19 100644 (file)
--- a/sys/msdos/fetch-cross-compiler.sh
+++ b/sys/msdos/fetch-cross-compiler.sh
@@ -12,7 +12,7 @@ if [ -z "$GCCVER" ]; then
 fi
 
 if [ -z "$LUA_VERSION" ]; then
-       export LUA_VERSION=5.4.3
+       export LUA_VERSION=5.4.4
 fi
 
 if [ ! -d "$(pwd)/lib" ]; then

diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top
index 32d051e0c6bc89a587d6985adad1ce04972621d7..b02aa29483b13b120d26fe85599a60e0167214b9 100644 (file)
--- a/sys/unix/Makefile.top
+++ b/sys/unix/Makefile.top
@@ -85,7 +85,7 @@ VARDAT = $(VARDATD) $(VARDATND)
 #CHGRP = chgrp
 
 # Lua version
-LUA_VERSION = 5.4.3
+LUA_VERSION = 5.4.4
 
 #
 # end of configuration

diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj
index 882576412571fe4e863d7831d6b116ed203d2c9a..a4eddb963c88d017fd904ff91a528b45d36b4fa2 100644 (file)
--- a/sys/unix/NetHack.xcodeproj/project.pbxproj
+++ b/sys/unix/NetHack.xcodeproj/project.pbxproj
@@ -1341,7 +1341,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd \"${NH_INC_DIR}\"\necho '/* nhlua.h - generated by Xcode script */' > nhlua.h\necho '#include \"../lib/lua-5.4.3/src/lua.h\"' >> nhlua.h\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < \"${NH_LIB_DIR}\"/lua-5.4.3/src/lua.h >> nhlua.h\necho '#include \"../lib/lua-5.4.3/src/lualib.h\"' >> nhlua.h\necho '#include \"../lib/lua-5.4.3/src/lauxlib.h\"' >> nhlua.h\necho '/*nhlua.h*/' >> nhlua.h\n";
+                       shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd \"${NH_INC_DIR}\"\necho '/* nhlua.h - generated by Xcode script */' > nhlua.h\necho '#include \"../lib/lua-5.4.4/src/lua.h\"' >> nhlua.h\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < \"${NH_LIB_DIR}\"/lua-5.4.4/src/lua.h >> nhlua.h\necho '#include \"../lib/lua-5.4.4/src/lualib.h\"' >> nhlua.h\necho '#include \"../lib/lua-5.4.4/src/lauxlib.h\"' >> nhlua.h\necho '/*nhlua.h*/' >> nhlua.h\n";
                };
                544768B8239954B9004B9739 /* Build Lua library */ = {
                        isa = PBXShellScriptBuildPhase;
@@ -1360,7 +1360,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd \"${NH_LIB_DIR}\"\nmkdir -p lua\ncd \"${NH_LIB_DIR}\"/lua-5.4.3/src\nmake a\ncp liblua.a ../../lua\ncd ../../..\n\n";
+                       shellScript = "# Type a script or drag a script file from your workspace to insert its path.\ncd \"${NH_LIB_DIR}\"\nmkdir -p lua\ncd \"${NH_LIB_DIR}\"/lua-5.4.4/src\nmake a\ncp liblua.a ../../lua\ncd ../../..\n\n";
                };
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/sys/unix/hints/include/cross-pre.370 b/sys/unix/hints/include/cross-pre.370
index 15986b813111da683745f0462b0acc27c7fc12c1..710f15d0991610718514f9047e19a22e24d87f62 100644 (file)
--- a/sys/unix/hints/include/cross-pre.370
+++ b/sys/unix/hints/include/cross-pre.370
@@ -36,9 +36,9 @@ endif
 ifdef BUILD_TARGET_LUA
 #===============-=================================================
 # LUA library
-# Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
+# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz
 #=================================================================
-LUA_VERSION ?=5.4.3
+LUA_VERSION ?=5.4.4
 LUATOP ?= ../lib/lua-$(LUA_VERSION)
 LUASRCDIR ?= $(LUATOP)/src
 LUAOBJFILES1 =  $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \
@@ -129,7 +129,7 @@ ifdef CROSS_TO_MSDOS
 # 2. Then
 #     make CROSS_TO_MSDOS=1 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 all
 #
-# Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
+# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz
 #=================================================================
 
 CFLAGS += -DCROSSCOMPILE

diff --git a/sys/windows/Install.windows b/sys/windows/Install.windows
index addeac8f9383d6d2ba3397ad179146898a9f1698..1938313e819b1f558142c88ed15b17029ad8712a 100644 (file)
--- a/sys/windows/Install.windows
+++ b/sys/windows/Install.windows
@@ -48,7 +48,7 @@ version.  You can use one of the following build environments:
                                   |           |                 |
                               +------+      +------+      +-----------+
                               |      |      |      |      |           |
-                            share windows tty   win32  Lua-5.4.3    pdcurses
+                            share windows tty   win32  Lua-5.4.4    pdcurses
                                      |
                                     vs
 
@@ -56,11 +56,11 @@ version.  You can use one of the following build environments:
 | Building And Running Using Visual Studio 2017, 2019, 2022  |
 \-----------------------------------------------------------/
 
-Before proceeding, please obtain the lua-5.4.3 sources and copy them to
-the new directory lib\lua-5.4.3\src.  This source can be obtained either from
-http://www.lua.org/ftp/lua-5.4.3.tar.gz or from the git hub mirror
-https://github.com/lua/lua.git using the tag 'v5.4.3'.  The build expects
-to find lua files such as 'lua.h' at 'lib\lua-5.4.3\src\lua.h'.
+Before proceeding, please obtain the lua-5.4.4 sources and copy them to
+the new directory lib\lua-5.4.4\src.  This source can be obtained either from
+http://www.lua.org/ftp/lua-5.4.4.tar.gz or from the git hub mirror
+https://github.com/lua/lua.git using the tag 'v5.4.4'.  The build expects
+to find lua files such as 'lua.h' at 'lib\lua-5.4.4\src\lua.h'.
 
 If you are NOT using Visual Studio IDE, or you prefer to build
 using a Make utility and a Makefile proceed to "Building Using Make".

diff --git a/sys/windows/Makefile.gcc b/sys/windows/Makefile.gcc
index e9d5416439a0fe58db93e31f3e7f90e503456148..2bd5c69323d08e429eead74614bb0d74b429369d 100644 (file)
--- a/sys/windows/Makefile.gcc
+++ b/sys/windows/Makefile.gcc
@@ -128,7 +128,7 @@ TARGET_CPU=x86
 #
 #---------------------------------------------------------------
 ifndef LUA_VERSION
-LUAVER=5.4.3
+LUAVER=5.4.4
 else
 LUAVER=$(LUA_VERSION)
 endif
@@ -136,7 +136,7 @@ endif
 # Location of LUA
 #
 # Original source needs to be obtained from:
-#    http://www.lua.org/ftp/lua-5.4.3.tar.gz
+#    http://www.lua.org/ftp/lua-5.4.4.tar.gz
 #
 #    This build assumes that the LUA sources are located
 #    at the specified location. If they are actually elsewhere
@@ -458,11 +458,11 @@ OPTIONS_FILE = $(DAT)\options
 
 #===============-=================================================
 # LUA library
-# Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
+# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz
 #=================================================================
 
 ifndef LUAVER
-LUAVER   = 5.4.3
+LUAVER   = 5.4.4
 endif
 ifndef LUASRC
 LUASRC   = $(LUATOP)/src

diff --git a/sys/windows/Makefile.msc b/sys/windows/Makefile.msc
index 09d50854f9ced4f77009af4ff77f2fccda8b8baf..5a0783a60a2613c890756fea0a66c9a88b2ca53e 100644 (file)
--- a/sys/windows/Makefile.msc
+++ b/sys/windows/Makefile.msc
@@ -142,7 +142,7 @@ DEBUGINFO = Y
 # This marks the end of the BUILD DECISIONS section.
 #==============================================================================
 !IFNDEF LUA_VERSION
-LUAVER=5.4.3
+LUAVER=5.4.4
 !ELSE
 LUAVER=$(LUA_VERSION)
 !ENDIF
@@ -151,7 +151,7 @@ LUAVER=$(LUA_VERSION)
 # Location of LUA
 #
 # Original source needs to be obtained from:
-#    http://www.lua.org/ftp/lua-5.4.3.tar.gz
+#    http://www.lua.org/ftp/lua-5.4.4.tar.gz
 #
 #    This build assumes that the LUA sources are located
 #    at the specified location. If they are actually elsewhere
@@ -437,7 +437,7 @@ OPTIONS_FILE = $(DAT)\options
 
 #===============-=================================================
 # LUA library
-# Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
+# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz
 #=================================================================
 
 !IFNDEF LUAVER
@@ -453,8 +453,8 @@ LUAVER   = 5.4.1
 !IF "$(LUATMP)" == "5.4.2"
 LUAVER   = 5.4.2
 !ENDIF
-!IF "$(LUATMP)" == "5.4.3"
-LUAVER   = 5.4.3
+!IF "$(LUATMP)" == "5.4.4"
+LUAVER   = 5.4.4
 !ENDIF
 !ELSE
 !ERROR NetHack 3.7 requires LUA so LUATOP must be defined
@@ -466,7 +466,7 @@ LUATMP   = $(LUATMP:-BETA=)         #strip suffix if exists "-BETA"
 !IF "$(LUATMP)" == "5.3.5"
 LUAVER   = 5.3.5
 !ELSE
-LUAVER   = 5.4.3
+LUAVER   = 5.4.4
 !ENDIF
 !ENDIF
 !ENDIF

diff --git a/sys/windows/travis-gcc.sh b/sys/windows/travis-gcc.sh
index ad2c1d1e5b2faf4d19c1b48035bc0fe9819b7d9c..fdbd5637c53adef15cd9d0475e671804f18cb49c 100644 (file)
--- a/sys/windows/travis-gcc.sh
+++ b/sys/windows/travis-gcc.sh
@@ -3,6 +3,6 @@ mkdir -p lib
 cd lib
 git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses
 #git clone --depth 1 https://github.com/universal-ctags/ctags.git ctags
-curl -R -O http://www.lua.org/ftp/lua-5.4.3.tar.gz
-tar zxf lua-5.4.3.tar.gz
+curl -R -O http://www.lua.org/ftp/lua-5.4.4.tar.gz
+tar zxf lua-5.4.4.tar.gz
 cd ../

diff --git a/sys/windows/vs/NetHackProperties.props b/sys/windows/vs/NetHackProperties.props
index ffb6908be0f9197ef0aabc82ecfe05dde4553fd3..451aabf4b2ba0884d05cc88da4c2094c33c8c6d6 100644 (file)
--- a/sys/windows/vs/NetHackProperties.props
+++ b/sys/windows/vs/NetHackProperties.props
@@ -7,7 +7,7 @@
     <PATCHLEVEL>0</PATCHLEVEL>
        <LUA_MAJOR_VERSION>5</LUA_MAJOR_VERSION>
        <LUA_MINOR_VERSION>4</LUA_MINOR_VERSION>
-       <LUA_PATCH_LEVEL>3></LUA_PATCH_LEVEL>
+       <LUA_PATCH_LEVEL>4></LUA_PATCH_LEVEL>
     <LUA_VERSION>$(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION).$(LUA_PATCH_LEVEL)</LUA_VERSION>
     <ADD_PACKAGE>true</ADD_PACKAGE>
   </PropertyGroup>