support for build with current Lua version 5.4.1

This may require
	make spotless
	make fetch-lua
for some platforms.

diff --git a/.travis.yml b/.travis.yml
index ceba99f721f0f971169e32473b0fc5091425bde1..81bb145b960f731fafa207cef5916a752fd55b63 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ matrix:
   include:
     - name: linux-xenial-gcc-win-all
       os: linux
-      env: HINTS=linux.2020 LUA_VERSION=5.4.0
+      env: HINTS=linux.2020 LUA_VERSION=5.4.1
       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.2020 LUA_VERSION=5.4.0
+      env: HINTS=linux.2020 LUA_VERSION=5.4.1
       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.2020 LUA_VERSION=5.4.0
+      env: HINTS=linux.2020 LUA_VERSION=5.4.1
       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.2020 LUA_VERSION=5.4.0
+      env: HINTS=linux.2020 LUA_VERSION=5.4.1
       dist: xenial
       compiler: gcc
       script:
@@ -70,7 +70,7 @@ matrix:
         - make install
     - name: linux-focal-gcc9-win-all
       os: linux
-      env: HINTS=linux.2020 LUA_VERSION=5.4.0
+      env: HINTS=linux.2020 LUA_VERSION=5.4.1
       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.0
+      env: HINTS=linux-minimal LUA_VERSION=5.4.1
       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.0
+        - export LUA_VERSION=5.4.1
         - sh sys/winnt/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.2020 LUA_VERSION=5.4.0
+      env: HINTS=linux.2020 LUA_VERSION=5.4.1
       dist: focal
       compiler: gcc
       script:

diff --git a/Porting b/Porting
index 3f5a99d8e6b21030da87c9140dfa039daf652d4a..70c8ccd1fa31a6efd9c87ce210f4d06ecd571127 100644 (file)
--- a/Porting
+++ b/Porting
@@ -207,7 +207,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.0 (or other folder
+your platform. Place the Lua source into lib/lua-5.4.1 (or other folder
 representing an appropriate Lua version); place the compiled Lua library into
 lib.
 

diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC
index bd04dc9867b3f2bf33424d61a8062c2f74e743d0..abe5611804ab53bad72b8a6bb327c592da39a680 100644 (file)
--- a/sys/msdos/Makefile.GCC
+++ b/sys/msdos/Makefile.GCC
@@ -42,13 +42,13 @@ PDCURSES_TOP=../../pdcurses
 ifeq "$(LUA_VERSION)" "5.3.5"
 LUAVER=5.3.5
 else
-LUAVER=5.4.0
+LUAVER=5.4.1
 endif
 #---------------------------------------------------------------
 # Location of LUA
 #
 # Original source needs to be obtained from: 
-#    http://www.lua.org/ftp/lua-5.4.0.tar.gz
+#    http://www.lua.org/ftp/lua-5.4.1.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.0.tar.gz
+# Source from http://www.lua.org/ftp/lua-5.4.1.tar.gz
 #=================================================================
 
 LUASRC   = $(LUATOP)/src

diff --git a/sys/msdos/fetch-cross-compiler.sh b/sys/msdos/fetch-cross-compiler.sh
index 12d861fd30f264969044c5b65f36159e8dccc97b..b5267b59068db64ee31b07d835b023bf72a3ab86 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.0
+       export LUA_VERSION=5.4.1
 fi
 
 if [ ! -d "$(pwd)/lib" ]; then

diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top
index 740c8b979bce5b75ebde32ad2cff66c31ad68d2e..4860b56dd3e08e1207989cb763da0ef6c618ec00 100644 (file)
--- a/sys/unix/Makefile.top
+++ b/sys/unix/Makefile.top
@@ -75,7 +75,7 @@ VARDAT = $(VARDATD) $(VARDATND)
 #CHGRP = chgrp
 
 # Lua version
-LUA_VERSION = 5.4.0
+LUA_VERSION = 5.4.1
 
 #
 # end of configuration

diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj
index 78a8a4b3b0145722b897bf97d0905a4f4de2e06f..a22cb1e3192d4b212755d2384d9a73110bf6e942 100644 (file)
--- a/sys/unix/NetHack.xcodeproj/project.pbxproj
+++ b/sys/unix/NetHack.xcodeproj/project.pbxproj
@@ -1381,7 +1381,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.0/src/lua.h\"' >> nhlua.h\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < ${NH_LIB_DIR}/lua-5.4.0/src/lua.h >> nhlua.h\necho '#include \"../lib/lua-5.4.0/src/lualib.h\"' >> nhlua.h\necho '#include \"../lib/lua-5.4.0/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.1/src/lua.h\"' >> nhlua.h\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < ${NH_LIB_DIR}/lua-5.4.1/src/lua.h >> nhlua.h\necho '#include \"../lib/lua-5.4.1/src/lualib.h\"' >> nhlua.h\necho '#include \"../lib/lua-5.4.1/src/lauxlib.h\"' >> nhlua.h\necho '/*nhlua.h*/' >> nhlua.h\n";
                };
                544768B8239954B9004B9739 /* Build Lua library */ = {
                        isa = PBXShellScriptBuildPhase;
@@ -1400,7 +1400,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.0/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.1/src\nmake a\ncp liblua.a ../../lua\ncd ../../..\n\n";
                };
 /* End PBXShellScriptBuildPhase section */
 

diff --git a/sys/unix/hints/include/cross-pre.2020 b/sys/unix/hints/include/cross-pre.2020
index 562a1934de671081571d282103346abad57987db..e61d4191e4acd7e97886885af7a7679b90cdfbdc 100644 (file)
--- a/sys/unix/hints/include/cross-pre.2020
+++ b/sys/unix/hints/include/cross-pre.2020
@@ -47,9 +47,9 @@ endif
 ifdef BUILD_TARGET_LUA
 #===============-=================================================
 # LUA library
-# Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz
+# Source from http://www.lua.org/ftp/lua-5.4.1.tar.gz
 #=================================================================
-LUA_VERSION ?=5.4.0
+LUA_VERSION ?=5.4.1
 LUATOP ?= ../lib/lua-$(LUA_VERSION)
 LUASRCDIR ?= $(LUATOP)/src
 LUAOBJFILES1 =  $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \
@@ -148,7 +148,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.0.tar.gz
+# Source from http://www.lua.org/ftp/lua-5.4.1.tar.gz
 #=================================================================
 
 CFLAGS += -DCROSSCOMPILE

diff --git a/sys/vms/Makefile.src b/sys/vms/Makefile.src
index 9149a985f6ccccb5fbfc7ba672e19fd3c64a1733..8e5ac62cf93de9a2575adfea54a2d539e07e35be 100644 (file)
--- a/sys/vms/Makefile.src
+++ b/sys/vms/Makefile.src
@@ -215,7 +215,7 @@ HOBJ  = $(FIRSTOBJ) $(SYSOBJ) $(WINOBJ) $(RANDOBJ) \
 
 LUAOBJ = nhlua.o,nhlsel.o
 
-#  5.4.0 adds header files ljumptab.h and lopnames.h and removes lbitlib.c
+#  5.4.0 added header files ljumptab.h and lopnames.h and removes lbitlib.c
 #  so comment top two and uncomment bottom two for the previous version (5.3.5)
 LUA535SRCFILES =
 LUA535OBJFILES =

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

diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc
index 996c73e6de81406f7467d3e7b6c4df2c553a38f5..b8acaf51f22dc4d5d3fb8cba1b79d5fb3ddfaf8b 100644 (file)
--- a/sys/winnt/Makefile.gcc
+++ b/sys/winnt/Makefile.gcc
@@ -127,7 +127,7 @@ TARGET_CPU=x86
 #
 #---------------------------------------------------------------
 ifndef LUA_VERSION
-LUAVER=5.4.0
+LUAVER=5.4.1
 else
 LUAVER=$(LUA_VERSION)
 endif
@@ -135,7 +135,7 @@ endif
 # Location of LUA
 #
 # Original source needs to be obtained from: 
-#    http://www.lua.org/ftp/lua-5.4.0.tar.gz
+#    http://www.lua.org/ftp/lua-5.4.1.tar.gz
 #
 #    This build assumes that the LUA sources are located
 #    at the specified location. If they are actually elsewhere
@@ -416,11 +416,11 @@ OPTIONS_FILE = $(DAT)\options
 
 #===============-=================================================
 # LUA library
-# Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz
+# Source from http://www.lua.org/ftp/lua-5.4.1.tar.gz
 #=================================================================
 
 ifndef LUAVER
-LUAVER   = 5.4.0
+LUAVER   = 5.4.1
 endif
 LUASRC   = $(LUATOP)/src
 LUALIB   = $(O)lua-$(LUAVER).static.a
@@ -446,7 +446,7 @@ LUAOBJFILES =   $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \
                $(O)lstring.o $(O)lstrlib.o $(O)ltable.o $(O)ltablib.o \
                $(O)ltm.o $(O)lundump.o $(O)lutf8lib.o $(O)lvm.o $(O)lzio.o
 ifeq "$(LUAVER)" "5.3.5"
-#  5.4.0 adds header files ljumptab.h and lopnames.h and removes lbitlib.c
+#  5.4.0 added header files ljumptab.h and lopnames.h and removes lbitlib.c
 #  so we have to tack those on for the previous version (5.3.5)
 LUASRCFILES = $(LUASRCFILES) lbitlib.c
 LUAOBJFILES = $(LUAOBJFILES) lbitlib.o

diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc
index 28322938f43e617be657dc1fef6b243c3e1628f6..b1c0cc7cafd33e8ae7f2d8085ab10e4e7fea35ad 100644 (file)
--- a/sys/winnt/Makefile.msc
+++ b/sys/winnt/Makefile.msc
@@ -131,7 +131,7 @@ DEBUGINFO = Y
 # This marks the end of the BUILD DECISIONS section.
 #==============================================================================
 !IFNDEF LUA_VERSION
-LUAVER=5.4.0
+LUAVER=5.4.1
 !ELSE
 LUAVER=$(LUA_VERSION)
 !ENDIF
@@ -140,7 +140,7 @@ LUAVER=$(LUA_VERSION)
 # Location of LUA
 #
 # Original source needs to be obtained from: 
-#    http://www.lua.org/ftp/lua-5.4.0.tar.gz
+#    http://www.lua.org/ftp/lua-5.4.1.tar.gz
 #
 #    This build assumes that the LUA sources are located
 #    at the specified location. If they are actually elsewhere
@@ -385,7 +385,7 @@ OPTIONS_FILE = $(DAT)\options
 
 #===============-=================================================
 # LUA library
-# Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz
+# Source from http://www.lua.org/ftp/lua-5.4.1.tar.gz
 #=================================================================
 
 !IFNDEF LUAVER
@@ -395,6 +395,9 @@ LUATMP   = $(LUATMP:-beta=)         #strip suffix if exists "-beta"
 !IF "$(LUATMP)" == "5.4.0"
 LUAVER   = 5.4.0
 !ENDIF
+!IF "$(LUATMP)" == "5.4.1"
+LUAVER   = 5.4.1
+!ENDIF
 !ELSE
 !ERROR NetHack 3.7 requires LUA so LUATOP must be defined
 !ENDIF
@@ -405,7 +408,7 @@ LUATMP   = $(LUATMP:-BETA=)         #strip suffix if exists "-BETA"
 !IF "$(LUATMP)" == "5.3.5"
 LUAVER   = 5.3.5
 !ELSE
-LUAVER   = 5.4.0
+LUAVER   = 5.4.1
 !ENDIF
 !ENDIF
 !ENDIF
@@ -437,7 +440,7 @@ LUAOBJFILES =   $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o                \
 LUASRCFILES = $(LUASRCFILES) lbitlib.c
 LUAOBJFILES =   $(LUAOBJFILES) $(O)lbitlib.o
 !ELSE
-#  5.4.0 adds header files ljumptab.h and lopnames.h
+#  5.4.0 added header files ljumptab.h and lopnames.h
 #        and removes lbitlib.c
 !ENDIF
 

diff --git a/sys/winnt/travis-gcc.sh b/sys/winnt/travis-gcc.sh
index bcf44b5b82aa8833e30ac47a7e90e9af76473c9d..ecdb79a9edea0208da8a92576774460ff0596073 100644 (file)
--- a/sys/winnt/travis-gcc.sh
+++ b/sys/winnt/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.0.tar.gz
-tar zxf lua-5.4.0.tar.gz
+curl -R -O http://www.lua.org/ftp/lua-5.4.1.tar.gz
+tar zxf lua-5.4.1.tar.gz
 cd ../

diff --git a/win/win32/vs/NetHack.vcxproj b/win/win32/vs/NetHack.vcxproj
index 3905afd7bfa1a503f6e44da151bee2a2ce549263..992ae95347e84e1c43132df5c89a95bc95886498 100644 (file)
--- a/win/win32/vs/NetHack.vcxproj
+++ b/win/win32/vs/NetHack.vcxproj
@@ -58,6 +58,7 @@
     <ClCompile Include="$(LuaDir)lbaselib.c" />\r
     <ClCompile Include="$(LuaDir)lbitlib.c">\r
         <ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.0'">true</ExcludedFromBuild>\r
+        <ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.1'">true</ExcludedFromBuild>\r
         <ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.3.5'">false</ExcludedFromBuild>\r
     </ClCompile>\r
     <ClCompile Include="$(LuaDir)lcode.c" />\r

diff --git a/win/win32/vs/NetHackProperties.props b/win/win32/vs/NetHackProperties.props
index 8c3665ce3df5a57ae76d1ae4846905fa835197ae..c9a9046138269a20abc1439565295dd4a695630b 100644 (file)
--- a/win/win32/vs/NetHackProperties.props
+++ b/win/win32/vs/NetHackProperties.props
@@ -5,7 +5,7 @@
     <VERSION_MAJOR>3</VERSION_MAJOR>
     <VERSION_MINOR>7</VERSION_MINOR>
     <PATCHLEVEL>0</PATCHLEVEL>
-    <LUA_VERSION>5.4.0</LUA_VERSION>
+    <LUA_VERSION>5.4.1</LUA_VERSION>
     <ADD_PACKAGE>true</ADD_PACKAGE>
   </PropertyGroup>
   <PropertyGroup />

diff --git a/win/win32/vs/NetHackW.vcxproj b/win/win32/vs/NetHackW.vcxproj
index afc39bbcce8198c948fa22e5d59d0f3b2f6f56c8..61026d3a06ad6feb31b4ab3bb827fc9106ad12be 100644 (file)
--- a/win/win32/vs/NetHackW.vcxproj
+++ b/win/win32/vs/NetHackW.vcxproj
@@ -52,6 +52,7 @@
     <ClCompile Include="$(LuaDir)lbaselib.c" />\r
     <ClCompile Include="$(LuaDir)lbitlib.c">\r
       <ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.0'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.4.1'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(LUA_VERSION)'=='5.3.5'">false</ExcludedFromBuild>\r
     </ClCompile>\r
     <ClCompile Include="$(LuaDir)lcode.c" />\r
@@ -354,4 +355,4 @@
   <Target Name="AfterRebuild">\r
     <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />\r
   </Target>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/win/win32/vs/travisci.sh b/win/win32/vs/travisci.sh
index 6eb4fa64a071e5c5968c3e94c1c6bf205e924335..0a8f9a01c2b0a8eef72b10a099b37b18dcc358fc 100644 (file)
--- a/win/win32/vs/travisci.sh
+++ b/win/win32/vs/travisci.sh
@@ -24,7 +24,7 @@ export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER
 export LIB=/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/$VSVER/$TOOLSVER/VC/Tools/MSVC/$MSVER/lib/x86:$LIB
 export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/ucrt/x86:$LIB
 export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB
-export LUA_VERSION=5.4.0
+export LUA_VERSION=5.4.1
 mkdir -p lib
 cd lib
 git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses