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

support for build with current Lua version 5.4.4

Browse Source 
On some platforms this may require:
       re-using a sys/unix/hints file to generate updated Makefiles
       make spotless
       make fetch-lua
This commit is contained in:
nhmall
2022-01-26 17:24:59 -05:00
parent 5928f8f70a
commit 13ee03be1f
16 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys/msdos/Install.dos
View File

@@ -44,7 +44,7 @@ II. There once was a time when people built NetHack right on their DOS machine.
and pdcurses from:
https://github.com/wmcbrine/PDCurses.git
and Lua from:
http://www.lua.org/ftp/lua-5.4.3.tar.gz
http://www.lua.org/ftp/lua-5.4.4.tar.gz
- A shell script to download the above-mentioned djgpp cross-compiler and
associated support pieces for either linux or macOS is available:

6
sys/msdos/Makefile.GCC
View File

@@ -42,13 +42,13 @@ GAMEDIR =../binary
ifeq "$(LUA_VERSION)" "5.3.5"
LUAVER=5.3.5
else
LUAVER=5.4.3
LUAVER=5.4.4
endif
#---------------------------------------------------------------
# Location of LUA
#
# Original source needs to be obtained from:
# http://www.lua.org/ftp/lua-5.4.3.tar.gz
# http://www.lua.org/ftp/lua-5.4.4.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.3.tar.gz
# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz
#=================================================================
LUASRC = $(LUATOP)/src

2
sys/msdos/fetch-cross-compiler.sh
View File

@@ -12,7 +12,7 @@ if [ -z "$GCCVER" ]; then
fi
if [ -z "$LUA_VERSION" ]; then
export LUA_VERSION=5.4.3
export LUA_VERSION=5.4.4
fi
if [ ! -d "$(pwd)/lib" ]; then

2
sys/unix/Makefile.top
View File

@@ -85,7 +85,7 @@ VARDAT = $(VARDATD) $(VARDATND)
#CHGRP = chgrp
# Lua version
LUA_VERSION = 5.4.3
LUA_VERSION = 5.4.4
#
# end of configuration

4
sys/unix/NetHack.xcodeproj/project.pbxproj
View File

@@ -1341,7 +1341,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.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";
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.4/src/lua.h\"' >> nhlua.h\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < \"${NH_LIB_DIR}\"/lua-5.4.4/src/lua.h >> nhlua.h\necho '#include \"../lib/lua-5.4.4/src/lualib.h\"' >> nhlua.h\necho '#include \"../lib/lua-5.4.4/src/lauxlib.h\"' >> nhlua.h\necho '/*nhlua.h*/' >> nhlua.h\n";
};
544768B8239954B9004B9739 /* Build Lua library */ = {
isa = PBXShellScriptBuildPhase;
@@ -1360,7 +1360,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.3/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.4/src\nmake a\ncp liblua.a ../../lua\ncd ../../..\n\n";
};
/* End PBXShellScriptBuildPhase section */

6
sys/unix/hints/include/cross-pre.370
View File

@@ -36,9 +36,9 @@ endif
ifdef BUILD_TARGET_LUA
#===============-=================================================
# LUA library
# Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz
#=================================================================
LUA_VERSION ?=5.4.3
LUA_VERSION ?=5.4.4
LUATOP ?= ../lib/lua-$(LUA_VERSION)
LUASRCDIR ?= $(LUATOP)/src
LUAOBJFILES1 = $(TARGETPFX)lapi.o $(TARGETPFX)lauxlib.o \
@@ -129,7 +129,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.3.tar.gz
# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz
#=================================================================
CFLAGS += -DCROSSCOMPILE

12
sys/windows/Install.windows
View File

@@ -48,7 +48,7 @@ version. You can use one of the following build environments:
| | |
+------+ +------+ +-----------+
| | | | | |
share windows tty win32 Lua-5.4.3 pdcurses
share windows tty win32 Lua-5.4.4 pdcurses
|
vs
@@ -56,11 +56,11 @@ version. You can use one of the following build environments:
| Building And Running Using Visual Studio 2017, 2019, 2022 |
\-----------------------------------------------------------/
Before proceeding, please obtain the lua-5.4.3 sources and copy them to
the new directory lib\lua-5.4.3\src. This source can be obtained either from
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.3'. The build expects
to find lua files such as 'lua.h' at 'lib\lua-5.4.3\src\lua.h'.
Before proceeding, please obtain the lua-5.4.4 sources and copy them to
the new directory lib\lua-5.4.4\src. This source can be obtained either from
http://www.lua.org/ftp/lua-5.4.4.tar.gz or from the git hub mirror
https://github.com/lua/lua.git using the tag 'v5.4.4'. The build expects
to find lua files such as 'lua.h' at 'lib\lua-5.4.4\src\lua.h'.
If you are NOT using Visual Studio IDE, or you prefer to build
using a Make utility and a Makefile proceed to "Building Using Make".

8
sys/windows/Makefile.gcc
View File

@@ -128,7 +128,7 @@ TARGET_CPU=x86
#
#---------------------------------------------------------------
ifndef LUA_VERSION
LUAVER=5.4.3
LUAVER=5.4.4
else
LUAVER=$(LUA_VERSION)
endif
@@ -136,7 +136,7 @@ endif
# Location of LUA
#
# Original source needs to be obtained from:
# http://www.lua.org/ftp/lua-5.4.3.tar.gz
# http://www.lua.org/ftp/lua-5.4.4.tar.gz
#
# This build assumes that the LUA sources are located
# at the specified location. If they are actually elsewhere
@@ -458,11 +458,11 @@ OPTIONS_FILE = $(DAT)\options
#===============-=================================================
# LUA library
# Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz
#=================================================================
ifndef LUAVER
LUAVER = 5.4.3
LUAVER = 5.4.4
endif
ifndef LUASRC
LUASRC = $(LUATOP)/src

12
sys/windows/Makefile.msc
View File

@@ -142,7 +142,7 @@ DEBUGINFO = Y
# This marks the end of the BUILD DECISIONS section.
#==============================================================================
!IFNDEF LUA_VERSION
LUAVER=5.4.3
LUAVER=5.4.4
!ELSE
LUAVER=$(LUA_VERSION)
!ENDIF
@@ -151,7 +151,7 @@ LUAVER=$(LUA_VERSION)
# Location of LUA
#
# Original source needs to be obtained from:
# http://www.lua.org/ftp/lua-5.4.3.tar.gz
# http://www.lua.org/ftp/lua-5.4.4.tar.gz
#
# This build assumes that the LUA sources are located
# at the specified location. If they are actually elsewhere
@@ -437,7 +437,7 @@ OPTIONS_FILE = $(DAT)\options
#===============-=================================================
# LUA library
# Source from http://www.lua.org/ftp/lua-5.4.3.tar.gz
# Source from http://www.lua.org/ftp/lua-5.4.4.tar.gz
#=================================================================
!IFNDEF LUAVER
@@ -453,8 +453,8 @@ LUAVER = 5.4.1
!IF "$(LUATMP)" == "5.4.2"
LUAVER = 5.4.2
!ENDIF
!IF "$(LUATMP)" == "5.4.3"
LUAVER = 5.4.3
!IF "$(LUATMP)" == "5.4.4"
LUAVER = 5.4.4
!ENDIF
!ELSE
!ERROR NetHack 3.7 requires LUA so LUATOP must be defined
@@ -466,7 +466,7 @@ LUATMP = $(LUATMP:-BETA=) #strip suffix if exists "-BETA"
!IF "$(LUATMP)" == "5.3.5"
LUAVER = 5.3.5
!ELSE
LUAVER = 5.4.3
LUAVER = 5.4.4
!ENDIF
!ENDIF
!ENDIF

4
sys/windows/travis-gcc.sh
View File

@@ -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.3.tar.gz
tar zxf lua-5.4.3.tar.gz
curl -R -O http://www.lua.org/ftp/lua-5.4.4.tar.gz
tar zxf lua-5.4.4.tar.gz
cd ../

2
sys/windows/vs/NetHackProperties.props
View File

@@ -7,7 +7,7 @@
<PATCHLEVEL>0</PATCHLEVEL>
<LUA_MAJOR_VERSION>5</LUA_MAJOR_VERSION>
<LUA_MINOR_VERSION>4</LUA_MINOR_VERSION>
<LUA_PATCH_LEVEL>3></LUA_PATCH_LEVEL>
<LUA_PATCH_LEVEL>4></LUA_PATCH_LEVEL>
<LUA_VERSION>$(LUA_MAJOR_VERSION).$(LUA_MINOR_VERSION).$(LUA_PATCH_LEVEL)</LUA_VERSION>
<ADD_PACKAGE>true</ADD_PACKAGE>
</PropertyGroup>