nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

support for build with current Lua version 5.4.3

Browse Source 
On some platforms this may require:
	make spotless
	make fetch-lua

I did attempt to force a reminder message about the latter to
Makefile.top this time, and hope that works correctly for everyone.
This commit is contained in:
nhmall
2021-06-02 19:12:47 -04:00
parent 9e59977c79
commit e69808987e
15 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Porting
+1 -1
View File
@@ -206,7 +206,7 @@ need to be included in the packaging of the game.
4.3. Lua 4.3. Lua
Compile and link into a library, or obtain a prebuilt Lua library for Compile and link into a library, or obtain a prebuilt Lua library for
your platform. Place the Lua source into lib/lua-5.4.2 (or other folder your platform. Place the Lua source into lib/lua-5.4.3 (or other folder
representing an appropriate Lua version); place the compiled Lua library into representing an appropriate Lua version); place the compiled Lua library into
lib. lib.
azure-pipelines.yml
+3 -3
View File
@@ -130,7 +130,7 @@ steps:
export LUASRC=../submodules/lua export LUASRC=../submodules/lua
export ADD_CURSES=Y export ADD_CURSES=Y
export PDCURSES_TOP=../submodules/pdcurses export PDCURSES_TOP=../submodules/pdcurses
export LUA_VERSION=5.4.2 export LUA_VERSION=5.4.3
export TRAVIS_COMPILER=1 export TRAVIS_COMPILER=1
cp ../sys/winnt/Makefile.gcc ./Makefile cp ../sys/winnt/Makefile.gcc ./Makefile
mingw32-make LUA_VERSION=$LUA_VERSION install mingw32-make LUA_VERSION=$LUA_VERSION install
@@ -202,8 +202,8 @@ steps:
cd ../.. cd ../..
make fetch-lua make fetch-lua
sh sys/msdos/fetch-cross-compiler.sh sh sys/msdos/fetch-cross-compiler.sh
make LUA_VERSION=5.4.2 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 all
make LUA_VERSION=5.4.2 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 package make LUA_VERSION=5.4.3 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 CROSS_TO_MSDOS=1 package
condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.toolchain, 'cross')) condition: and(eq( variables['Agent.OS'], 'Linux' ), eq( variables.toolchain, 'cross'))
workingDirectory: $(Agent.BuildDirectory)/$(netHackPath) workingDirectory: $(Agent.BuildDirectory)/$(netHackPath)
displayName: 'Building MSDOS build' displayName: 'Building MSDOS build'
outdated/.travis.yml
+8 -8
View File
@@ -3,7 +3,7 @@ matrix:
include: include:
- name: linux-xenial-gcc-win-all - name: linux-xenial-gcc-win-all
os: linux os: linux
env: HINTS=linux.2020 LUA_VERSION=5.4.2 env: HINTS=linux.2020 LUA_VERSION=5.4.3
compiler: gcc compiler: gcc
addons: addons:
apt: apt:
@@ -21,7 +21,7 @@ matrix:
- make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
- name: linux-bionic-gcc-win-all - name: linux-bionic-gcc-win-all
os: linux os: linux
env: HINTS=linux.2020 LUA_VERSION=5.4.2 env: HINTS=linux.2020 LUA_VERSION=5.4.3
dist: bionic dist: bionic
compiler: gcc compiler: gcc
addons: addons:
@@ -40,7 +40,7 @@ matrix:
- make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
- name: linux-focal-clang-win-all - name: linux-focal-clang-win-all
os: linux os: linux
env: HINTS=linux.2020 LUA_VERSION=5.4.2 env: HINTS=linux.2020 LUA_VERSION=5.4.3
dist: focal dist: focal
compiler: clang compiler: clang
addons: addons:
@@ -59,7 +59,7 @@ matrix:
- make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
- name: linux-xenial-gcc-nocommon - name: linux-xenial-gcc-nocommon
os: linux os: linux
env: HINTS=linux.2020 LUA_VERSION=5.4.2 env: HINTS=linux.2020 LUA_VERSION=5.4.3
dist: xenial dist: xenial
compiler: gcc compiler: gcc
script: script:
@@ -70,7 +70,7 @@ matrix:
- make install - make install
- name: linux-focal-gcc9-win-all - name: linux-focal-gcc9-win-all
os: linux os: linux
env: HINTS=linux.2020 LUA_VERSION=5.4.2 env: HINTS=linux.2020 LUA_VERSION=5.4.3
dist: focal dist: focal
compiler: gcc compiler: gcc
addons: addons:
@@ -91,7 +91,7 @@ matrix:
- make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
- name: linux-xenial-gcc-minimal - name: linux-xenial-gcc-minimal
os: linux os: linux
env: HINTS=linux-minimal LUA_VERSION=5.4.2 env: HINTS=linux-minimal LUA_VERSION=5.4.3
compiler: gcc compiler: gcc
script: | script: |
cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
@@ -129,7 +129,7 @@ matrix:
script: script:
- export ADD_CURSES=Y - export ADD_CURSES=Y
- export PDCURSES_TOP=../lib/pdcurses - export PDCURSES_TOP=../lib/pdcurses
- export LUA_VERSION=5.4.2 - export LUA_VERSION=5.4.3
- sh sys/winnt/travis-gcc.sh - sh sys/winnt/travis-gcc.sh
- test -d "lib/lua-$LUA_VERSION/src" || exit 0 - test -d "lib/lua-$LUA_VERSION/src" || exit 0
- test -d "lib/pdcurses" || exit 0 - test -d "lib/pdcurses" || exit 0
@@ -138,7 +138,7 @@ matrix:
- mingw32-make LUA_VERSION=$LUA_VERSION install - mingw32-make LUA_VERSION=$LUA_VERSION install
- name: msdos-linux-focal-djgpp-crosscompile - name: msdos-linux-focal-djgpp-crosscompile
os: linux os: linux
env: HINTS=linux.2020 LUA_VERSION=5.4.2 env: HINTS=linux.2020 LUA_VERSION=5.4.3
dist: focal dist: focal
compiler: gcc compiler: gcc
script: script:
submodules/lua
+1 -1
Submodule submodules/lua updated: e2ea3b31c9...eadd8c7178
sys/msdos/Makefile.GCC
+3 -3
View File
@@ -42,13 +42,13 @@ PDCURSES_TOP=../../pdcurses
ifeq "$(LUA_VERSION)" "5.3.5" ifeq "$(LUA_VERSION)" "5.3.5"
LUAVER=5.3.5 LUAVER=5.3.5
else else
LUAVER=5.4.2 LUAVER=5.4.3
endif endif
#--------------------------------------------------------------- #---------------------------------------------------------------
# Location of LUA # Location of LUA
# #
# Original source needs to be obtained from: # Original source needs to be obtained from:
# http://www.lua.org/ftp/lua-5.4.2.tar.gz # http://www.lua.org/ftp/lua-5.4.3.tar.gz
# #
# This build assumes that the LUA sources are located # This build assumes that the LUA sources are located
# at the specified location. If they are actually elsewhere # at the specified location. If they are actually elsewhere
@@ -305,7 +305,7 @@ ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ)
#===============-================================================= #===============-=================================================
# LUA library # LUA library
# Source from http://www.lua.org/ftp/lua-5.4.2.tar.gz # Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
#================================================================= #=================================================================
LUASRC = $(LUATOP)/src LUASRC = $(LUATOP)/src
sys/msdos/fetch-cross-compiler.sh
+1 -1
View File
@@ -12,7 +12,7 @@ if [ -z "$GCCVER" ]; then
fi fi
if [ -z "$LUA_VERSION" ]; then if [ -z "$LUA_VERSION" ]; then
export LUA_VERSION=5.4.2 export LUA_VERSION=5.4.3
fi fi
if [ ! -d "$(pwd)/lib" ]; then if [ ! -d "$(pwd)/lib" ]; then
sys/unix/Makefile.top
+4 -1
View File
@@ -85,7 +85,7 @@ VARDAT = $(VARDATD) $(VARDATND)
#CHGRP = chgrp #CHGRP = chgrp
# Lua version # Lua version
LUA_VERSION = 5.4.2 LUA_VERSION = 5.4.3
# #
# end of configuration # end of configuration
@@ -131,6 +131,9 @@ include/nhlua.h: $(TOPLUALIB)
@echo '#include "../lib/lua-$(LUA_VERSION)/src/lualib.h"' >> $@ @echo '#include "../lib/lua-$(LUA_VERSION)/src/lualib.h"' >> $@
@echo '#include "../lib/lua-$(LUA_VERSION)/src/lauxlib.h"' >> $@ @echo '#include "../lib/lua-$(LUA_VERSION)/src/lauxlib.h"' >> $@
@echo '/*nhlua.h*/' >> $@ @echo '/*nhlua.h*/' >> $@
lib/lua-$(LUA_VERSION)/src/lua.h:
echo "Please do 'make fetch-lua' to obtain lua-$(LUA_VERSION)"
false
# Note: many of the dependencies below are here to allow parallel make # Note: many of the dependencies below are here to allow parallel make
# to generate valid output # to generate valid output
sys/unix/NetHack.xcodeproj/project.pbxproj
+2 -2
View File
@@ -1338,7 +1338,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; 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.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"; 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";
}; };
544768B8239954B9004B9739 /* Build Lua library */ = { 544768B8239954B9004B9739 /* Build Lua library */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
@@ -1357,7 +1357,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; 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.2/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.3/src\nmake a\ncp liblua.a ../../lua\ncd ../../..\n\n";
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
sys/unix/hints/include/cross-pre.2020
+3 -3
View File
@@ -36,9 +36,9 @@ endif
ifdef BUILD_TARGET_LUA ifdef BUILD_TARGET_LUA
#===============-================================================= #===============-=================================================
# LUA library # LUA library
# Source from http://www.lua.org/ftp/lua-5.4.2.tar.gz # Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
#================================================================= #=================================================================
LUA_VERSION ?=5.4.2 LUA_VERSION ?=5.4.3
LUATOP ?= ../lib/lua-$(LUA_VERSION) LUATOP ?= ../lib/lua-$(LUA_VERSION)
LUASRCDIR ?= $(LUATOP)/src LUASRCDIR ?= $(LUATOP)/src
LUAOBJFILES1 = $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \ LUAOBJFILES1 = $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \
@@ -129,7 +129,7 @@ ifdef CROSS_TO_MSDOS
# 2. Then # 2. Then
# make CROSS_TO_MSDOS=1 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 all # make CROSS_TO_MSDOS=1 WANT_WIN_TTY=1 WANT_WIN_CURSES=1 all
# #
# Source from http://www.lua.org/ftp/lua-5.4.2.tar.gz # Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
#================================================================= #=================================================================
CFLAGS += -DCROSSCOMPILE CFLAGS += -DCROSSCOMPILE
sys/winnt/Install.nt
+6 -6
View File
@@ -47,7 +47,7 @@ version. You can use one of the following build environments:
| | | | | |
+----+ +------+ +-----------+ +----+ +------+ +-----------+
| | | | | | | | | | | |
share winnt tty win32 Lua-5.4.2 pdcurses share winnt tty win32 Lua-5.4.3 pdcurses
| |
vs vs
@@ -55,11 +55,11 @@ version. You can use one of the following build environments:
| Building And Running Using Visual Studio 2017 or 2019 | | Building And Running Using Visual Studio 2017 or 2019 |
\--------------------------------------------------------/ \--------------------------------------------------------/
Before proceeding, please obtain the lua-5.4.2 sources and copy them to Before proceeding, please obtain the lua-5.4.3 sources and copy them to
the new directory lib\lua-5.4.2\src. This source can be obtain either from the new directory lib\lua-5.4.3\src. This source can be obtained either from
http://www.lua.org/ftp/lua-5.4.2.tar.gz or from the git hub mirror 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.2'. The build expects 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.2\src\lua.h'. to find lua files such as 'lua.h' at 'lib\lua-5.4.3\src\lua.h'.
If you are NOT using Visual Studio 2017 or 2019 IDE, or you prefer to build 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". using a Make utility and a Makefile proceed to "Building Using Make".
sys/winnt/Makefile.gcc
+4 -4
View File
@@ -127,7 +127,7 @@ TARGET_CPU=x86
# #
#--------------------------------------------------------------- #---------------------------------------------------------------
ifndef LUA_VERSION ifndef LUA_VERSION
LUAVER=5.4.2 LUAVER=5.4.3
else else
LUAVER=$(LUA_VERSION) LUAVER=$(LUA_VERSION)
endif endif
@@ -135,7 +135,7 @@ endif
# Location of LUA # Location of LUA
# #
# Original source needs to be obtained from: # Original source needs to be obtained from:
# http://www.lua.org/ftp/lua-5.4.2.tar.gz # http://www.lua.org/ftp/lua-5.4.3.tar.gz
# #
# This build assumes that the LUA sources are located # This build assumes that the LUA sources are located
# at the specified location. If they are actually elsewhere # at the specified location. If they are actually elsewhere
@@ -418,11 +418,11 @@ OPTIONS_FILE = $(DAT)\options
#===============-================================================= #===============-=================================================
# LUA library # LUA library
# Source from http://www.lua.org/ftp/lua-5.4.2.tar.gz # Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
#================================================================= #=================================================================
ifndef LUAVER ifndef LUAVER
LUAVER = 5.4.2 LUAVER = 5.4.3
endif endif
ifndef LUASRC ifndef LUASRC
LUASRC = $(LUATOP)/src LUASRC = $(LUATOP)/src
sys/winnt/Makefile.msc
+7 -4
View File
@@ -131,7 +131,7 @@ DEBUGINFO = Y
# This marks the end of the BUILD DECISIONS section. # This marks the end of the BUILD DECISIONS section.
#============================================================================== #==============================================================================
!IFNDEF LUA_VERSION !IFNDEF LUA_VERSION
LUAVER=5.4.2 LUAVER=5.4.3
!ELSE !ELSE
LUAVER=$(LUA_VERSION) LUAVER=$(LUA_VERSION)
!ENDIF !ENDIF
@@ -140,7 +140,7 @@ LUAVER=$(LUA_VERSION)
# Location of LUA # Location of LUA
# #
# Original source needs to be obtained from: # Original source needs to be obtained from:
# http://www.lua.org/ftp/lua-5.4.2.tar.gz # http://www.lua.org/ftp/lua-5.4.3.tar.gz
# #
# This build assumes that the LUA sources are located # This build assumes that the LUA sources are located
# at the specified location. If they are actually elsewhere # at the specified location. If they are actually elsewhere
@@ -384,7 +384,7 @@ OPTIONS_FILE = $(DAT)\options
#===============-================================================= #===============-=================================================
# LUA library # LUA library
# Source from http://www.lua.org/ftp/lua-5.4.2.tar.gz # Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
#================================================================= #=================================================================
!IFNDEF LUAVER !IFNDEF LUAVER
@@ -400,6 +400,9 @@ LUAVER = 5.4.1
!IF "$(LUATMP)" == "5.4.2" !IF "$(LUATMP)" == "5.4.2"
LUAVER = 5.4.2 LUAVER = 5.4.2
!ENDIF !ENDIF
!IF "$(LUATMP)" == "5.4.3"
LUAVER = 5.4.3
!ENDIF
!ELSE !ELSE
!ERROR NetHack 3.7 requires LUA so LUATOP must be defined !ERROR NetHack 3.7 requires LUA so LUATOP must be defined
!ENDIF !ENDIF
@@ -410,7 +413,7 @@ LUATMP = $(LUATMP:-BETA=) #strip suffix if exists "-BETA"
!IF "$(LUATMP)" == "5.3.5" !IF "$(LUATMP)" == "5.3.5"
LUAVER = 5.3.5 LUAVER = 5.3.5
!ELSE !ELSE
LUAVER = 5.4.2 LUAVER = 5.4.3
!ENDIF !ENDIF
!ENDIF !ENDIF
!ENDIF !ENDIF
sys/winnt/travis-gcc.sh
+2 -2
View File
@@ -3,6 +3,6 @@ mkdir -p lib
cd lib cd lib
git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses
#git clone --depth 1 https://github.com/universal-ctags/ctags.git ctags #git clone --depth 1 https://github.com/universal-ctags/ctags.git ctags
curl -R -O http://www.lua.org/ftp/lua-5.4.2.tar.gz curl -R -O http://www.lua.org/ftp/lua-5.4.3.tar.gz
tar zxf lua-5.4.2.tar.gz tar zxf lua-5.4.3.tar.gz
cd ../ cd ../
win/win32/vs/NetHackProperties.props
+1 -1
View File
@@ -7,7 +7,7 @@
<PATCHLEVEL>0</PATCHLEVEL> <PATCHLEVEL>0</PATCHLEVEL>
<LUA_MAJOR_VERSION>5</LUA_MAJOR_VERSION> <LUA_MAJOR_VERSION>5</LUA_MAJOR_VERSION>
<LUA_MINOR_VERSION>4</LUA_MINOR_VERSION> <LUA_MINOR_VERSION>4</LUA_MINOR_VERSION>
<LUA_PATCH_LEVEL>2></LUA_PATCH_LEVEL> <LUA_PATCH_LEVEL>3></LUA_PATCH_LEVEL>
<LUA_VERSION>$(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION).$(LUA_PATCH_LEVEL)</LUA_VERSION> <LUA_VERSION>$(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION).$(LUA_PATCH_LEVEL)</LUA_VERSION>
<ADD_PACKAGE>true</ADD_PACKAGE> <ADD_PACKAGE>true</ADD_PACKAGE>
</PropertyGroup> </PropertyGroup>
win/win32/vs/travisci.sh
+1 -1
View File
@@ -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\)/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/ucrt/x86:$LIB
export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB
export LUA_VERSION=5.4.2 export LUA_VERSION=5.4.3
mkdir -p lib mkdir -p lib
cd lib cd lib
git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses git clone --depth 1 https://github.com/wmcbrine/PDCurses.git pdcurses