From: nhmall Date: Fri, 11 Dec 2020 14:20:26 +0000 (-0500) Subject: support for build with current Lua version 5.4.2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=affb60dd97dc53c286132670d90326313f7f97f4;p=nethack support for build with current Lua version 5.4.2 This may require make spotless make fetch-lua for some platforms. --- diff --git a/Porting b/Porting index 6a57e1aae..120292d2e 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.1 (or other folder +your platform. Place the Lua source into lib/lua-5.4.2 (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 abe561180..6ffb918d0 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.1 +LUAVER=5.4.2 endif #--------------------------------------------------------------- # Location of LUA # # Original source needs to be obtained from: -# http://www.lua.org/ftp/lua-5.4.1.tar.gz +# http://www.lua.org/ftp/lua-5.4.2.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.1.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.2.tar.gz #================================================================= LUASRC = $(LUATOP)/src diff --git a/sys/msdos/fetch-cross-compiler.sh b/sys/msdos/fetch-cross-compiler.sh index b5267b590..fc78feae7 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.1 + export LUA_VERSION=5.4.2 fi if [ ! -d "$(pwd)/lib" ]; then diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top index 6c1363aeb..a0824a155 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.1 +LUA_VERSION = 5.4.2 # # end of configuration diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj index a22cb1e31..807c7231e 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.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"; + 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.2/src/lua.h\"' >> nhlua.h\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < ${NH_LIB_DIR}/lua-5.4.2/src/lua.h >> nhlua.h\necho '#include \"../lib/lua-5.4.2/src/lualib.h\"' >> nhlua.h\necho '#include \"../lib/lua-5.4.2/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.1/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.2/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 d3cb72a50..99de7f559 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.1.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.2.tar.gz #================================================================= -LUA_VERSION ?=5.4.1 +LUA_VERSION ?=5.4.2 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.1.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.2.tar.gz #================================================================= CFLAGS += -DCROSSCOMPILE diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt index 101fb965a..a5ebaca2b 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.1 pdcurses + share winnt tty win32 Lua-5.4.2 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.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'. +Before proceeding, please obtain the lua-5.4.2 sources and copy them to +the new directory lib\lua-5.4.2\src. This source can be obtain either from +http://www.lua.org/ftp/lua-5.4.2.tar.gz or from the git hub mirror +https://github.com/lua/lua.git using the tag 'v5.4.2'. The build expects +to find lua files such as 'lua.h' at 'lib\lua-5.4.2\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 2df3b9eb6..c2b2d1c16 100644 --- a/sys/winnt/Makefile.gcc +++ b/sys/winnt/Makefile.gcc @@ -127,7 +127,7 @@ TARGET_CPU=x86 # #--------------------------------------------------------------- ifndef LUA_VERSION -LUAVER=5.4.1 +LUAVER=5.4.2 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.1.tar.gz +# http://www.lua.org/ftp/lua-5.4.2.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.1.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.2.tar.gz #================================================================= ifndef LUAVER -LUAVER = 5.4.1 +LUAVER = 5.4.2 endif LUASRC = $(LUATOP)/src LUALIB = $(O)lua-$(LUAVER).static.a diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index 3a2d0749a..c793dd878 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.1 +LUAVER=5.4.2 !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.1.tar.gz +# http://www.lua.org/ftp/lua-5.4.2.tar.gz # # This build assumes that the LUA sources are located # at the specified location. If they are actually elsewhere @@ -384,7 +384,7 @@ OPTIONS_FILE = $(DAT)\options #===============-================================================= # LUA library -# Source from http://www.lua.org/ftp/lua-5.4.1.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.2.tar.gz #================================================================= !IFNDEF LUAVER @@ -397,6 +397,9 @@ LUAVER = 5.4.0 !IF "$(LUATMP)" == "5.4.1" LUAVER = 5.4.1 !ENDIF +!IF "$(LUATMP)" == "5.4.2" +LUAVER = 5.4.2 +!ENDIF !ELSE !ERROR NetHack 3.7 requires LUA so LUATOP must be defined !ENDIF @@ -407,7 +410,7 @@ LUATMP = $(LUATMP:-BETA=) #strip suffix if exists "-BETA" !IF "$(LUATMP)" == "5.3.5" LUAVER = 5.3.5 !ELSE -LUAVER = 5.4.1 +LUAVER = 5.4.2 !ENDIF !ENDIF !ENDIF diff --git a/sys/winnt/travis-gcc.sh b/sys/winnt/travis-gcc.sh index ecdb79a9e..e1d5bf6b7 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.1.tar.gz -tar zxf lua-5.4.1.tar.gz +curl -R -O http://www.lua.org/ftp/lua-5.4.2.tar.gz +tar zxf lua-5.4.2.tar.gz cd ../ diff --git a/win/win32/vs/NetHack.vcxproj b/win/win32/vs/NetHack.vcxproj index 992ae9534..a3c2e0c26 100644 --- a/win/win32/vs/NetHack.vcxproj +++ b/win/win32/vs/NetHack.vcxproj @@ -57,8 +57,9 @@ - true + true true + true false diff --git a/win/win32/vs/travisci.sh b/win/win32/vs/travisci.sh index 0a8f9a01c..d7d48e3f0 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.1 +export LUA_VERSION=5.4.2 mkdir -p lib cd lib git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses