diff --git a/.travis.yml b/.travis.yml index ceba99f72..81bb145b9 100644 --- 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 3f5a99d8e..70c8ccd1f 100644 --- 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 bd04dc986..abe561180 100644 --- 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 12d861fd3..b5267b590 100644 --- 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 740c8b979..4860b56dd 100644 --- 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 78a8a4b3b..a22cb1e31 100644 --- 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 562a1934d..e61d4191e 100644 --- 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 9149a985f..8e5ac62cf 100644 --- 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 5deb4dccb..a226fe50d 100644 --- 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 996c73e6d..b8acaf51f 100644 --- 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 28322938f..b1c0cc7ca 100644 --- 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 bcf44b5b8..ecdb79a9e 100644 --- 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 3905afd7b..992ae9534 100644 --- a/win/win32/vs/NetHack.vcxproj +++ b/win/win32/vs/NetHack.vcxproj @@ -58,6 +58,7 @@ true + true false diff --git a/win/win32/vs/NetHackProperties.props b/win/win32/vs/NetHackProperties.props index 8c3665ce3..c9a904613 100644 --- a/win/win32/vs/NetHackProperties.props +++ b/win/win32/vs/NetHackProperties.props @@ -5,7 +5,7 @@ 3 7 0 - 5.4.0 + 5.4.1 true diff --git a/win/win32/vs/NetHackW.vcxproj b/win/win32/vs/NetHackW.vcxproj index afc39bbcc..61026d3a0 100644 --- a/win/win32/vs/NetHackW.vcxproj +++ b/win/win32/vs/NetHackW.vcxproj @@ -52,6 +52,7 @@ true + true false @@ -354,4 +355,4 @@ - \ No newline at end of file + diff --git a/win/win32/vs/travisci.sh b/win/win32/vs/travisci.sh index 6eb4fa64a..0a8f9a01c 100644 --- 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