From 642cf9a93e86973857800e0edfe51d890fe7b7b4 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sun, 4 Jan 2026 11:12:50 -0500 Subject: [PATCH] bump Lua references from 5.4.6 to 5.4.8 --- Cross-compiling | 2 +- Porting | 2 +- azure-pipelines.yml | 4 +- outdated/.travis.yml | 16 ++--- .../sys/unix/hints/include/cross-amiga-pre | 4 +- outdated/sys/windows/travis-gcc.sh | 4 +- sys/msdos/Install.dos | 4 +- sys/msdos/Makefile.GCC | 4 +- sys/msdos/fetch-cross-compiler.sh | 2 +- sys/unix/Makefile.src | 2 +- sys/unix/Makefile.top | 2 +- sys/unix/NetHack.xcodeproj/project.pbxproj | 72 +++++++++---------- sys/unix/hints/include/cross-pre2.370 | 6 +- sys/vms/Makefile_dat.vms | 4 +- sys/vms/Makefile_doc.vms | 4 +- sys/vms/Makefile_src.vms | 4 +- sys/vms/Makefile_top.vms | 4 +- sys/vms/Makefile_utl.vms | 4 +- sys/vms/vmsbuild.com | 6 +- sys/windows/GNUmakefile | 8 +-- sys/windows/Makefile.nmake | 14 ++-- sys/windows/build-msys2.txt | 2 +- sys/windows/build-nmake.txt | 2 +- sys/windows/build-vs.txt | 2 +- sys/windows/fetch.cmd | 2 +- sys/windows/fetch.sh | 6 +- sys/windows/vs/FetchPrereq/fetchprereq.nmake | 2 +- sys/windows/vs/NetHackProperties.props | 2 +- sys/windows/vs/dirs.props | 2 +- 29 files changed, 96 insertions(+), 96 deletions(-) diff --git a/Cross-compiling b/Cross-compiling index 0eb9488a7..d609ab585 100644 --- a/Cross-compiling +++ b/Cross-compiling @@ -413,7 +413,7 @@ Using the cross-compiler, build the following targets: b) Lua (mandatory in 3.7) - lib/lua-5.4.6/src + lib/lua-5.4.8/src from sources: lua.c, lapi.c, lauxlib.c, lbaselib.c, lcode.c, lcorolib.c, lctype.c, ldblib.c, ldebug.c, diff --git a/Porting b/Porting index 1abba0d93..45aa1bfc5 100644 --- a/Porting +++ b/Porting @@ -201,7 +201,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.6 (or other folder +your platform. Place the Lua source into lib/lua-5.4.8 (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 4c0a5b5d2..fa0dcc7e9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -129,7 +129,7 @@ steps: export LUASRC=../submodules/lua export ADD_CURSES=Y export PDCURSES_TOP=../submodules/pdcursesmod - export LUA_VERSION=5.4.6 + export LUA_VERSION=5.4.8 # # 64-bit #export CURLSRC=https://github.com/brechtsanders/winlibs_mingw/releases/download/14.2.0posix-19.1.1-12.0.0-ucrt-r2/winlibs-x86_64-posix-seh-gcc-14.2.0-llvm-19.1.1-mingw-w64ucrt-12.0.0-r2.zip @@ -235,7 +235,7 @@ steps: sys/msdos/fetch-cross-compiler.sh retVal=$? if [ $retVal -eq 0 ]; then - make LUA_VERSION=5.4.6 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 $IN_CI package + make LUA_VERSION=5.4.8 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 $IN_CI package fi condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.toolchain, 'cross')) workingDirectory: $(Agent.BuildDirectory)/$(netHackPath) diff --git a/outdated/.travis.yml b/outdated/.travis.yml index 889051258..b0f0dfc3b 100644 --- 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.6 + env: HINTS=linux.370 LUA_VERSION=5.4.8 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.6 + env: HINTS=linux.370 LUA_VERSION=5.4.8 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.6 + env: HINTS=linux.370 LUA_VERSION=5.4.8 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.6 + env: HINTS=linux.370 LUA_VERSION=5.4.8 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.6 + env: HINTS=linux.370 LUA_VERSION=5.4.8 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.6 + env: HINTS=linux-minimal LUA_VERSION=5.4.8 compiler: gcc script: | cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ @@ -128,7 +128,7 @@ matrix: script: - export ADD_CURSES=Y - export PDCURSES_TOP=../lib/pdcurses - - export LUA_VERSION=5.4.6 + - export LUA_VERSION=5.4.8 - sh sys/windows/travis-gcc.sh - test -d "lib/lua-$LUA_VERSION/src" || exit 0 - test -d "lib/pdcurses" || exit 0 @@ -137,7 +137,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.6 + env: HINTS=linux.370 LUA_VERSION=5.4.8 dist: focal compiler: gcc script: diff --git a/outdated/sys/unix/hints/include/cross-amiga-pre b/outdated/sys/unix/hints/include/cross-amiga-pre index 5c59f102d..2d5b24ede 100644 --- a/outdated/sys/unix/hints/include/cross-amiga-pre +++ b/outdated/sys/unix/hints/include/cross-amiga-pre @@ -24,9 +24,9 @@ endif ifdef BUILD_TARGET_LUA #===============-================================================= # LUA library -# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.8.tar.gz #================================================================= -LUA_VERSION ?=5.4.6 +LUA_VERSION ?=5.4.8 LUATOP ?= ../lib/lua-$(LUA_VERSION) LUASRCDIR ?= $(LUATOP)/src LUAOBJFILES1 = $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \ diff --git a/outdated/sys/windows/travis-gcc.sh b/outdated/sys/windows/travis-gcc.sh index c61137790..e6092375f 100644 --- a/outdated/sys/windows/travis-gcc.sh +++ b/outdated/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.6.tar.gz -tar zxf lua-5.4.6.tar.gz +curl -R -O http://www.lua.org/ftp/lua-5.4.8.tar.gz +tar zxf lua-5.4.8.tar.gz cd ../ diff --git a/sys/msdos/Install.dos b/sys/msdos/Install.dos index 10b94888d..e60eb72b3 100644 --- a/sys/msdos/Install.dos +++ b/sys/msdos/Install.dos @@ -42,7 +42,7 @@ II. There once was a time when people built NetHack right on their DOS machine. a DOS-extender (for including in msdos packaging) from: http://sandmann.dotster.com/cwsdpmi/csdpmi7b.zip and Lua from: - http://www.lua.org/ftp/lua-5.4.6.tar.gz + http://www.lua.org/ftp/lua-5.4.8.tar.gz If you want the DOSVGA build, to support higher resolutions and Unicode symbols, you also need: @@ -123,7 +123,7 @@ Appendix B - Common Difficulties Encountered For example: make CROSS_TO_MSDOS=1 package - ( cd src ; make LUA_VERSION=5.4.6 nethack ) + ( cd src ; make LUA_VERSION=5.4.8 nethack ) make[1]: Entering directory '/home/johndoe/NHsource/src' mkdir -p ../targets/msdos ; make ../targets/msdos/exceptn.o ; make[2]: Entering directory '/home/johndoe/NHsource/src' diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC index 069b2679a..8ae2be4dc 100644 --- a/sys/msdos/Makefile.GCC +++ b/sys/msdos/Makefile.GCC @@ -56,7 +56,7 @@ endif # Location of LUA # # Original source needs to be obtained from: -# http://www.lua.org/ftp/lua-5.4.6.tar.gz +# http://www.lua.org/ftp/lua-5.4.8.tar.gz # # This build assumes that the LUA sources are located # at the specified location. If they are actually elsewhere @@ -324,7 +324,7 @@ ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ) #===============-================================================= # LUA library -# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.8.tar.gz #================================================================= LUASRC = $(LUATOP)/src diff --git a/sys/msdos/fetch-cross-compiler.sh b/sys/msdos/fetch-cross-compiler.sh index 36558a00c..037d3aaf3 100755 --- a/sys/msdos/fetch-cross-compiler.sh +++ b/sys/msdos/fetch-cross-compiler.sh @@ -15,7 +15,7 @@ if [ -z "$GCCVER" ]; then fi if [ -z "$LUA_VERSION" ]; then - export LUA_VERSION=5.4.6 + export LUA_VERSION=5.4.8 fi if [ ! -d "$(pwd)/lib" ]; then diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src index e5763785f..e5a30e3c1 100644 --- a/sys/unix/Makefile.src +++ b/sys/unix/Makefile.src @@ -502,7 +502,7 @@ TARGET_HACKLIB = $(TARGETPFX)hacklib.a MAKEDEFS = ../util/makedefs # -lm required by lua -LUA_VERSION ?=5.4.6 +LUA_VERSION ?=5.4.8 LUABASE = liblua-$(LUA_VERSION).a LUALIB = ../lib/lua/$(LUABASE) LUALIBS = $(LUALIB) -lm $(DLLIB) diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top index 6e45eafa9..af0a966ef 100644 --- 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.6 +LUA_VERSION = 5.4.8 # # end of configuration diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj index 0ba3338fb..99cd6d6ac 100644 --- a/sys/unix/NetHack.xcodeproj/project.pbxproj +++ b/sys/unix/NetHack.xcodeproj/project.pbxproj @@ -561,40 +561,40 @@ 54FB2B4A246310A600397C0E /* symbols.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = symbols.c; path = ../../src/symbols.c; sourceTree = ""; }; 54FCE8282223261F00F393C8 /* isaac64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isaac64.c; path = ../../src/isaac64.c; sourceTree = ""; }; BAE8010A27B97760002B3786 /* libnhlua.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libnhlua.a; sourceTree = BUILT_PRODUCTS_DIR; }; - BAE8011427B99CAB002B3786 /* lopcodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lopcodes.c; path = "../../lib/lua-5.4.6/src/lopcodes.c"; sourceTree = ""; }; - BAE8011527B99CAB002B3786 /* linit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = linit.c; path = "../../lib/lua-5.4.6/src/linit.c"; sourceTree = ""; }; - BAE8011627B99CAB002B3786 /* lobject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lobject.c; path = "../../lib/lua-5.4.6/src/lobject.c"; sourceTree = ""; }; - BAE8011727B99CAC002B3786 /* loslib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loslib.c; path = "../../lib/lua-5.4.6/src/loslib.c"; sourceTree = ""; }; - BAE8011827B99CAC002B3786 /* lcorolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcorolib.c; path = "../../lib/lua-5.4.6/src/lcorolib.c"; sourceTree = ""; }; - BAE8011927B99CAC002B3786 /* lutf8lib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lutf8lib.c; path = "../../lib/lua-5.4.6/src/lutf8lib.c"; sourceTree = ""; }; - BAE8011A27B99CAC002B3786 /* ltable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltable.c; path = "../../lib/lua-5.4.6/src/ltable.c"; sourceTree = ""; }; - BAE8011B27B99CAC002B3786 /* ltablib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltablib.c; path = "../../lib/lua-5.4.6/src/ltablib.c"; sourceTree = ""; }; - BAE8011C27B99CAC002B3786 /* llex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = llex.c; path = "../../lib/lua-5.4.6/src/llex.c"; sourceTree = ""; }; - BAE8011D27B99CAC002B3786 /* lcode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcode.c; path = "../../lib/lua-5.4.6/src/lcode.c"; sourceTree = ""; }; - BAE8011E27B99CAC002B3786 /* lua.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lua.c; path = "../../lib/lua-5.4.6/src/lua.c"; sourceTree = ""; }; - BAE8011F27B99CAC002B3786 /* ldo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldo.c; path = "../../lib/lua-5.4.6/src/ldo.c"; sourceTree = ""; }; - BAE8012027B99CAC002B3786 /* ldump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldump.c; path = "../../lib/lua-5.4.6/src/ldump.c"; sourceTree = ""; }; - BAE8012127B99CAC002B3786 /* lparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lparser.c; path = "../../lib/lua-5.4.6/src/lparser.c"; sourceTree = ""; }; - BAE8012227B99CAC002B3786 /* lstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstate.c; path = "../../lib/lua-5.4.6/src/lstate.c"; sourceTree = ""; }; - BAE8012327B99CAC002B3786 /* lapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lapi.c; path = "../../lib/lua-5.4.6/src/lapi.c"; sourceTree = ""; }; - BAE8012427B99CAC002B3786 /* ldebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldebug.c; path = "../../lib/lua-5.4.6/src/ldebug.c"; sourceTree = ""; }; - BAE8012527B99CAC002B3786 /* lstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstring.c; path = "../../lib/lua-5.4.6/src/lstring.c"; sourceTree = ""; }; - BAE8012627B99CAC002B3786 /* ltm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltm.c; path = "../../lib/lua-5.4.6/src/ltm.c"; sourceTree = ""; }; - BAE8012727B99CAC002B3786 /* lmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmem.c; path = "../../lib/lua-5.4.6/src/lmem.c"; sourceTree = ""; }; - BAE8012827B99CAC002B3786 /* lvm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lvm.c; path = "../../lib/lua-5.4.6/src/lvm.c"; sourceTree = ""; }; - BAE8012927B99CAC002B3786 /* lfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lfunc.c; path = "../../lib/lua-5.4.6/src/lfunc.c"; sourceTree = ""; }; - BAE8012A27B99CAC002B3786 /* lgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lgc.c; path = "../../lib/lua-5.4.6/src/lgc.c"; sourceTree = ""; }; - BAE8012B27B99CAD002B3786 /* lundump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lundump.c; path = "../../lib/lua-5.4.6/src/lundump.c"; sourceTree = ""; }; - BAE8012C27B99CAD002B3786 /* lbaselib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lbaselib.c; path = "../../lib/lua-5.4.6/src/lbaselib.c"; sourceTree = ""; }; - BAE8012D27B99CAD002B3786 /* ldblib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldblib.c; path = "../../lib/lua-5.4.6/src/ldblib.c"; sourceTree = ""; }; - BAE8012E27B99CAD002B3786 /* lauxlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lauxlib.c; path = "../../lib/lua-5.4.6/src/lauxlib.c"; sourceTree = ""; }; - BAE8012F27B99CAD002B3786 /* liolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liolib.c; path = "../../lib/lua-5.4.6/src/liolib.c"; sourceTree = ""; }; - BAE8013027B99CAD002B3786 /* lctype.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lctype.c; path = "../../lib/lua-5.4.6/src/lctype.c"; sourceTree = ""; }; - BAE8013127B99CAD002B3786 /* luac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = luac.c; path = "../../lib/lua-5.4.6/src/luac.c"; sourceTree = ""; }; - BAE8013227B99CAD002B3786 /* loadlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loadlib.c; path = "../../lib/lua-5.4.6/src/loadlib.c"; sourceTree = ""; }; - BAE8013327B99CAD002B3786 /* lmathlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmathlib.c; path = "../../lib/lua-5.4.6/src/lmathlib.c"; sourceTree = ""; }; - BAE8013427B99CAD002B3786 /* lstrlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstrlib.c; path = "../../lib/lua-5.4.6/src/lstrlib.c"; sourceTree = ""; }; - BAE8013527B99CAD002B3786 /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzio.c; path = "../../lib/lua-5.4.6/src/lzio.c"; sourceTree = ""; }; + BAE8011427B99CAB002B3786 /* lopcodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lopcodes.c; path = "../../lib/lua-5.4.8/src/lopcodes.c"; sourceTree = ""; }; + BAE8011527B99CAB002B3786 /* linit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = linit.c; path = "../../lib/lua-5.4.8/src/linit.c"; sourceTree = ""; }; + BAE8011627B99CAB002B3786 /* lobject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lobject.c; path = "../../lib/lua-5.4.8/src/lobject.c"; sourceTree = ""; }; + BAE8011727B99CAC002B3786 /* loslib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loslib.c; path = "../../lib/lua-5.4.8/src/loslib.c"; sourceTree = ""; }; + BAE8011827B99CAC002B3786 /* lcorolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcorolib.c; path = "../../lib/lua-5.4.8/src/lcorolib.c"; sourceTree = ""; }; + BAE8011927B99CAC002B3786 /* lutf8lib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lutf8lib.c; path = "../../lib/lua-5.4.8/src/lutf8lib.c"; sourceTree = ""; }; + BAE8011A27B99CAC002B3786 /* ltable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltable.c; path = "../../lib/lua-5.4.8/src/ltable.c"; sourceTree = ""; }; + BAE8011B27B99CAC002B3786 /* ltablib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltablib.c; path = "../../lib/lua-5.4.8/src/ltablib.c"; sourceTree = ""; }; + BAE8011C27B99CAC002B3786 /* llex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = llex.c; path = "../../lib/lua-5.4.8/src/llex.c"; sourceTree = ""; }; + BAE8011D27B99CAC002B3786 /* lcode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lcode.c; path = "../../lib/lua-5.4.8/src/lcode.c"; sourceTree = ""; }; + BAE8011E27B99CAC002B3786 /* lua.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lua.c; path = "../../lib/lua-5.4.8/src/lua.c"; sourceTree = ""; }; + BAE8011F27B99CAC002B3786 /* ldo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldo.c; path = "../../lib/lua-5.4.8/src/ldo.c"; sourceTree = ""; }; + BAE8012027B99CAC002B3786 /* ldump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldump.c; path = "../../lib/lua-5.4.8/src/ldump.c"; sourceTree = ""; }; + BAE8012127B99CAC002B3786 /* lparser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lparser.c; path = "../../lib/lua-5.4.8/src/lparser.c"; sourceTree = ""; }; + BAE8012227B99CAC002B3786 /* lstate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstate.c; path = "../../lib/lua-5.4.8/src/lstate.c"; sourceTree = ""; }; + BAE8012327B99CAC002B3786 /* lapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lapi.c; path = "../../lib/lua-5.4.8/src/lapi.c"; sourceTree = ""; }; + BAE8012427B99CAC002B3786 /* ldebug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldebug.c; path = "../../lib/lua-5.4.8/src/ldebug.c"; sourceTree = ""; }; + BAE8012527B99CAC002B3786 /* lstring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstring.c; path = "../../lib/lua-5.4.8/src/lstring.c"; sourceTree = ""; }; + BAE8012627B99CAC002B3786 /* ltm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ltm.c; path = "../../lib/lua-5.4.8/src/ltm.c"; sourceTree = ""; }; + BAE8012727B99CAC002B3786 /* lmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmem.c; path = "../../lib/lua-5.4.8/src/lmem.c"; sourceTree = ""; }; + BAE8012827B99CAC002B3786 /* lvm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lvm.c; path = "../../lib/lua-5.4.8/src/lvm.c"; sourceTree = ""; }; + BAE8012927B99CAC002B3786 /* lfunc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lfunc.c; path = "../../lib/lua-5.4.8/src/lfunc.c"; sourceTree = ""; }; + BAE8012A27B99CAC002B3786 /* lgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lgc.c; path = "../../lib/lua-5.4.8/src/lgc.c"; sourceTree = ""; }; + BAE8012B27B99CAD002B3786 /* lundump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lundump.c; path = "../../lib/lua-5.4.8/src/lundump.c"; sourceTree = ""; }; + BAE8012C27B99CAD002B3786 /* lbaselib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lbaselib.c; path = "../../lib/lua-5.4.8/src/lbaselib.c"; sourceTree = ""; }; + BAE8012D27B99CAD002B3786 /* ldblib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ldblib.c; path = "../../lib/lua-5.4.8/src/ldblib.c"; sourceTree = ""; }; + BAE8012E27B99CAD002B3786 /* lauxlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lauxlib.c; path = "../../lib/lua-5.4.8/src/lauxlib.c"; sourceTree = ""; }; + BAE8012F27B99CAD002B3786 /* liolib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liolib.c; path = "../../lib/lua-5.4.8/src/liolib.c"; sourceTree = ""; }; + BAE8013027B99CAD002B3786 /* lctype.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lctype.c; path = "../../lib/lua-5.4.8/src/lctype.c"; sourceTree = ""; }; + BAE8013127B99CAD002B3786 /* luac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = luac.c; path = "../../lib/lua-5.4.8/src/luac.c"; sourceTree = ""; }; + BAE8013227B99CAD002B3786 /* loadlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loadlib.c; path = "../../lib/lua-5.4.8/src/loadlib.c"; sourceTree = ""; }; + BAE8013327B99CAD002B3786 /* lmathlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lmathlib.c; path = "../../lib/lua-5.4.8/src/lmathlib.c"; sourceTree = ""; }; + BAE8013427B99CAD002B3786 /* lstrlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lstrlib.c; path = "../../lib/lua-5.4.8/src/lstrlib.c"; sourceTree = ""; }; + BAE8013527B99CAD002B3786 /* lzio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lzio.c; path = "../../lib/lua-5.4.8/src/lzio.c"; sourceTree = ""; }; F515A6F32DED074D006E1F63 /* sfctool.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = sfctool.c; path = ../../util/sfctool.c; sourceTree = ""; }; F515A6F52DED0916006E1F63 /* date.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = date.c; path = ../../src/date.c; sourceTree = ""; }; F515A6F62DED0916006E1F63 /* sfbase.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = sfbase.c; path = ../../src/sfbase.c; sourceTree = ""; }; @@ -2189,7 +2189,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include"; - LUA_VERSION = 5.4.6; + LUA_VERSION = 5.4.8; MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -2272,7 +2272,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include"; - LUA_VERSION = 5.4.6; + LUA_VERSION = 5.4.8; MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; diff --git a/sys/unix/hints/include/cross-pre2.370 b/sys/unix/hints/include/cross-pre2.370 index efa4ca3e0..d0cdf513a 100644 --- a/sys/unix/hints/include/cross-pre2.370 +++ b/sys/unix/hints/include/cross-pre2.370 @@ -7,9 +7,9 @@ ifdef BUILD_TARGET_LUA #===============-================================================= # LUA library -# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.8.tar.gz #================================================================= -LUA_VERSION ?=5.4.6 +LUA_VERSION ?=5.4.8 LUATOP ?= ../lib/lua-$(LUA_VERSION) LUASRCDIR ?= $(LUATOP)/src LUAOBJFILES1 = $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \ @@ -119,7 +119,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.6.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.8.tar.gz #================================================================= CFLAGS += -DCROSSCOMPILE diff --git a/sys/vms/Makefile_dat.vms b/sys/vms/Makefile_dat.vms index 37dd5e2d3..4059aca4d 100644 --- a/sys/vms/Makefile_dat.vms +++ b/sys/vms/Makefile_dat.vms @@ -25,8 +25,8 @@ WINCHAIN=[-.win.chain] # Lua location relative to src LUAVER=546 -LUADOTVER=5.4.6 -LUAUNDERVER=5_4_6 +LUADOTVER=5.4.8 +LUAUNDERVER=5_4_8 LUAINC=[-.lib.lua.lua$(LUAVER).src] LUALIB=[-.lib.lua]lua$(LUAVER).olb LUASRCDIR =[-.lib.lua.lua$(LUAVER).src] diff --git a/sys/vms/Makefile_doc.vms b/sys/vms/Makefile_doc.vms index f797df0b7..854a303dd 100644 --- a/sys/vms/Makefile_doc.vms +++ b/sys/vms/Makefile_doc.vms @@ -26,8 +26,8 @@ WINCHAIN=[-.win.chain] # Lua location relative to src LUAVER=546 -LUADOTVER=5.4.6 -LUAUNDERVER=5_4_6 +LUADOTVER=5.4.8 +LUAUNDERVER=5_4_8 LUAINC=[-.lib.lua.lua$(LUAVER).src] LUALIB=[-.lib.lua]lua$(LUAVER).olb LUASRCDIR =[-.lib.lua.lua$(LUAVER).src] diff --git a/sys/vms/Makefile_src.vms b/sys/vms/Makefile_src.vms index bf7355722..937200a20 100644 --- a/sys/vms/Makefile_src.vms +++ b/sys/vms/Makefile_src.vms @@ -36,8 +36,8 @@ WINCHAIN=[-.win.chain] # Lua LUAVER=546 -LUADOTVER=5.4.6 -LUAUNDERVER=5_4_6 +LUADOTVER=5.4.8 +LUAUNDERVER=5_4_8 # Lua location relative to src LUAINC=[-.lib.lua.lua$(LUAVER).src] LUALIB=[-.lib.lua]lua$(LUAVER).olb diff --git a/sys/vms/Makefile_top.vms b/sys/vms/Makefile_top.vms index 7a28ff098..94e506fea 100644 --- a/sys/vms/Makefile_top.vms +++ b/sys/vms/Makefile_top.vms @@ -55,8 +55,8 @@ WINCHAIN=[.win.chain] # Lua macros LUAVER=546 -LUADOTVER=5.4.6 -LUAUNDERVER=5_4_6 +LUADOTVER=5.4.8 +LUAUNDERVER=5_4_8 LUAINC=[.lib.lua.lua$(LUAVER).src] LUALIB=[.lib.lua]lua$(LUAVER).olb LUASRCDIR =[.lib.lua.lua$(LUAVER).src] diff --git a/sys/vms/Makefile_utl.vms b/sys/vms/Makefile_utl.vms index 83c112c95..d30d0b629 100644 --- a/sys/vms/Makefile_utl.vms +++ b/sys/vms/Makefile_utl.vms @@ -31,8 +31,8 @@ WINCHAIN=[-.win.chain] # Lua location relative to here LUAVER=546 -LUADOTVER=5.4.6 -LUAUNDERVER=5_4_6 +LUADOTVER=5.4.8 +LUAUNDERVER=5_4_8 LUAINC=[-.lib.lua.lua$(LUAVER).src] LUALIB=[-.lib.lua]lua$(LUAVER).olb LUASRCDIR =[-.lib.lua.lua$(LUAVER).src] diff --git a/sys/vms/vmsbuild.com b/sys/vms/vmsbuild.com index 737fbf015..e34309fce 100755 --- a/sys/vms/vmsbuild.com +++ b/sys/vms/vmsbuild.com @@ -28,9 +28,9 @@ $ ! one, use "" in the earlier one's position, such as $ ! $ @[-.sys.vms]vmsbuild "" "" "" "" "TTY+CURSES" $ ! $ ! Lua Version -$ luaver = "546" -$ luadotver = "5.4.6" -$ luaunderver = "5_4_6" +$ luaver = "548" +$ luadotver = "5.4.8" +$ luaunderver = "5_4_8" $ $ decc_dflt = f$trnlnm("DECC$CC_DEFAULT") $ j = (decc_dflt.nes."") .and. 1 diff --git a/sys/windows/GNUmakefile b/sys/windows/GNUmakefile index 48fc53e03..0341d4aa9 100644 --- a/sys/windows/GNUmakefile +++ b/sys/windows/GNUmakefile @@ -104,7 +104,7 @@ USE_LUADLL = Y WANT_LUAC = N ifndef LUA_VERSION -LUAVER=5.4.6 +LUAVER=5.4.8 else LUAVER=$(LUA_VERSION) endif @@ -393,7 +393,7 @@ CLEAN_DIR = $(GAMEDIR) $(OBJ) #================================================================= # LUA library -# Source from http://www.lua.org/ftp/lua-5.4.6.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.8.tar.gz #================================================================= OLUA = $(O)lua @@ -1065,8 +1065,8 @@ fetchpdcurses: git submodule update ../submodules/$(PDCURSES) ; fi # git submodule update --remote ../submodules/$(PDCURSES) ; fi else # GIT_AVAILABLE no -CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz -CURLLUADST=lua-5.4.6.tar.gz +CURLLUASRC=http://www.lua.org/ftp/lua-5.4.8.tar.gz +CURLLUADST=lua-5.4.8.tar.gz CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.5.1.zip CURLPDCDST=$(PDCURSES).zip diff --git a/sys/windows/Makefile.nmake b/sys/windows/Makefile.nmake index a6bae9d28..e5a180663 100644 --- a/sys/windows/Makefile.nmake +++ b/sys/windows/Makefile.nmake @@ -142,7 +142,7 @@ Q=@ SKIP_NETHACKW = N !IFNDEF LUA_VERSION -LUAVER=5.4.6 +LUAVER=5.4.8 !ELSE LUAVER=$(LUA_VERSION) !ENDIF @@ -534,9 +534,9 @@ GITBRANCH = -DNETHACK_GIT_BRANCH=\"$(GIT_BRANCH)\" GITPREFIX = -DNETHACK_GIT_PREFIX=\"$(GIT_PREFIX)\" !ENDIF -#===============-================================================= +#================================================================= # LUA library -# Official source for Lua is http://www.lua.org/ftp/lua-5.4.6.tar.gz +# Official source for Lua is http://www.lua.org/ftp/lua-5.4.8.tar.gz # # Source for the NetHack repository submodule in ../submodules/lua # is https://github.com/lua/lua.git @@ -545,7 +545,7 @@ GITPREFIX = -DNETHACK_GIT_PREFIX=\"$(GIT_PREFIX)\" # Location of LUA # # Original source needs to be obtained from: -# http://www.lua.org/ftp/lua-5.4.6.tar.gz +# http://www.lua.org/ftp/lua-5.4.8.tar.gz # # This build assumes that the LUA sources are located # at the specified location. If they are actually elsewhere @@ -555,7 +555,7 @@ GITPREFIX = -DNETHACK_GIT_PREFIX=\"$(GIT_PREFIX)\" # !IFNDEF LUAVER -LUAVER=5.4.6 +LUAVER=5.4.8 !ENDIF LUALIB = $(LIBDIR)lua$(LUAVER)-$(TARGET_CPU)-static.lib @@ -1603,8 +1603,8 @@ $(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 -CURLLUADST=lua-5.4.6.tar.gz +CURLLUASRC=http://www.lua.org/ftp/lua-5.4.8.tar.gz +CURLLUADST=lua-5.4.8.tar.gz #CURLPDCSRC=https://github.com/wmcbrine/PDCurses/archive/refs/tags/3.9.zip CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.4.0.zip diff --git a/sys/windows/build-msys2.txt b/sys/windows/build-msys2.txt index 1258f7be9..06938bfaa 100644 --- a/sys/windows/build-msys2.txt +++ b/sys/windows/build-msys2.txt @@ -30,7 +30,7 @@ Prerequisite Requirements: +----------+ +------+ +----+ +----+ | | | | | | | | | | | | | | | | - lua-5.4.6 pdcursesmod share windows tty win32 lua pdcursesmod + lua-5.4.8 pdcursesmod share windows tty win32 lua pdcursesmod | vs | diff --git a/sys/windows/build-nmake.txt b/sys/windows/build-nmake.txt index a917eb3ad..35c339e7e 100644 --- a/sys/windows/build-nmake.txt +++ b/sys/windows/build-nmake.txt @@ -43,7 +43,7 @@ You can use one of the following build environments: +----------+ +------+ +----+ +----+ | | | | | | | | | | | | | | | | - lua-5.4.6 pdcursesmod share windows tty win32 lua pdcursesmod + lua-5.4.8 pdcursesmod share windows tty win32 lua pdcursesmod | vs | diff --git a/sys/windows/build-vs.txt b/sys/windows/build-vs.txt index 04f69c9e1..bd939a81b 100644 --- a/sys/windows/build-vs.txt +++ b/sys/windows/build-vs.txt @@ -68,7 +68,7 @@ versions: +----------+ +------+ +----+ +----+ | | | | | | | | | | | | | | | | - lua-5.4.6 pdcursesmod share windows tty win32 lua pdcursesmod + lua-5.4.8 pdcursesmod share windows tty win32 lua pdcursesmod | vs | diff --git a/sys/windows/fetch.cmd b/sys/windows/fetch.cmd index c484f9b13..a508ad8dc 100644 --- a/sys/windows/fetch.cmd +++ b/sys/windows/fetch.cmd @@ -2,7 +2,7 @@ if not exist lib\* mkdir lib if [%1] == [lua] ( - set LUA_VERSION=5.4.6 + set LUA_VERSION=5.4.8 set LUASRC=../lib/lua set CURLLUASRC=http://www.lua.org/ftp/lua-%LUA_VERSION%.tar.gz set CURLLUADST=lua-%LUA_VERSION%.tar.gz diff --git a/sys/windows/fetch.sh b/sys/windows/fetch.sh index 4d9b36202..e04dd31d3 100644 --- a/sys/windows/fetch.sh +++ b/sys/windows/fetch.sh @@ -6,12 +6,12 @@ fi if [ $1 == "lua" ]; then if [ -z "$LUA_VERSION" ]; then - export LUA_VERSION=5.4.6 + export LUA_VERSION=5.4.8 export LUASRC=../lib/lua fi - export CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz - export CURLLUADST=lua-5.4.6.tar.gz + export CURLLUASRC=http://www.lua.org/ftp/lua-5.4.8.tar.gz + export CURLLUADST=lua-5.4.8.tar.gz if [ ! -f lib/lua.h ] ;then cd lib diff --git a/sys/windows/vs/FetchPrereq/fetchprereq.nmake b/sys/windows/vs/FetchPrereq/fetchprereq.nmake index 2b826a302..2d4f69913 100644 --- a/sys/windows/vs/FetchPrereq/fetchprereq.nmake +++ b/sys/windows/vs/FetchPrereq/fetchprereq.nmake @@ -9,7 +9,7 @@ NHV=$(NETHACK_VERSION:.=) NHV=$(NHV:"=) # The version of Lua we want -LUA_VERSION=5.4.6 +LUA_VERSION=5.4.8 CURLLUASRC=https://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz CURLLUADST=lua-$(LUA_VERSION).tar.gz diff --git a/sys/windows/vs/NetHackProperties.props b/sys/windows/vs/NetHackProperties.props index 1bda6a0f0..164cc760e 100644 --- a/sys/windows/vs/NetHackProperties.props +++ b/sys/windows/vs/NetHackProperties.props @@ -8,7 +8,7 @@ $(VERSION_MAJOR).$(VERSION_MINOR).$(PATCHLEVEL) 5 4 - 6> + 8> $(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION).$(LUA_PATCH_LEVEL) $(ROOTDIR)lib\fmod\api\core\ fmod_vc.lib diff --git a/sys/windows/vs/dirs.props b/sys/windows/vs/dirs.props index 640a5aa41..82d8dc1b1 100644 --- a/sys/windows/vs/dirs.props +++ b/sys/windows/vs/dirs.props @@ -1,7 +1,7 @@ - 5.4.6 + 5.4.8 $(MSBuildProjectDirectory)\..\..\..\..\ $(RootDir)binary\$(Configuration)\$(Platform)\ $(ProjectDir)obj\$(Configuration)\$(Platform)\$(TargetName)\