From 2c571dcfe7208b7f1d0f48e21dda3ab9429b7a0e Mon Sep 17 00:00:00 2001 From: nhmall Date: Mon, 6 Jul 2020 09:37:26 -0400 Subject: [PATCH 1/3] more outdated code move follow-up --- include/optlist.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/optlist.h b/include/optlist.h index 6d82e1f0c..085b527b1 100644 --- a/include/optlist.h +++ b/include/optlist.h @@ -83,6 +83,13 @@ pfx_##a, "status window alignment") NHOPTC(altkeyhandler, 20, opt_in, set_in_game, No, Yes, No, No, NoAlias, "alternate key handler") +#ifdef ALTMETA + NHOPTB(altmeta, 0, opt_out, set_in_game, Off, No, No, No, NoAlias, + &iflags.altmeta) +#else + NHOPTB(altmeta, 0, opt_out, set_in_config, Off, No, No, No, NoAlias, + (boolean *) 0) +#endif NHOPTB(ascii_map, 0, opt_in, set_in_game, Off, Yes, No, No, NoAlias, &iflags.wc_ascii_map) NHOPTB(autodescribe, 0, opt_out, set_in_game, On, Yes, No, No, NoAlias, From bcd6665ccf18733655e15b85b5afd55b1e6b2ce4 Mon Sep 17 00:00:00 2001 From: PatR Date: Tue, 7 Jul 2020 03:39:03 -0700 Subject: [PATCH 2/3] history/Credits update Fix two of the unresolved issues from the previous reconciliation between dat/history and doc/Guidebook.*: synchronize the list of devteam members for 3.0 and also the information about Izchak's death. Add a description of the Y2K situation. It's been moved to its own paragraph and rephrased from the earlier draft(s), both the introduction and a switch from present to past tense. Parentheses around a whole paragraph look a bit odd but including the paragraph without them also looks unusual because the context is so different from adjacent paragraphs. Maybe use "Note: Blah blah..." instead of "(Blah blah...)"? Redo the paragraph about 3.0 version numbering since the situation was more complex than I realized. --- dat/history | 33 +++++++++++++++++++--------- doc/Guidebook.mn | 55 +++++++++++++++++++++++++++++++++-------------- doc/Guidebook.tex | 49 ++++++++++++++++++++++++++++++----------- 3 files changed, 98 insertions(+), 39 deletions(-) diff --git a/dat/history b/dat/history index 4c904cc8f..d1d6dd084 100644 --- a/dat/history +++ b/dat/history @@ -39,9 +39,11 @@ Dungeoneers, they continued to enhance the PC, Macintosh, and Amiga ports through the later revisions of 3.0. Version 3.0 went through ten relatively rapidly released "patch-level" -revisions. Versions at the time were designated "3.0 patchlevel 10" or -"3.0pl10" rather than 3.0.10; that three component numbering scheme began -to be used with 3.1.0. +revisions. Versions at the time were known as 3.0 for the base release +and variously as "3.0a" through "3.0j", "3.0 patchlevel 1" through +"3.0 patchlevel 10", or "3.0pl1" through "3.0pl10" rather than 3.0.0 and +3.0.1 through 3.0.10; the three component numbering scheme began to be used +with 3.1.0. Headed by Mike Stephenson and coordinated by Izchak Miller and Janet Walz, the NetHack Development Team which now included Ken Arromdee, David Cohrs, @@ -50,7 +52,7 @@ Dean Luick, Pat Rankin, Eric Raymond, and Eric Smith undertook a radical revision of 3.0. They re-structured the game's design, and re-wrote major parts of the code. They added multiple dungeons, a new display, special individual character quests, a new endgame and many other new features, and -produced NetHack 3.1. +produced NetHack 3.1. Version 3.1.0 was released in January of 1993. Ken Lorber, Gregg Wonderly and Greg Olson, with help from Richard Addison, Mike Passaretti, and Olaf Seibert, developed NetHack 3.1 for the Amiga. @@ -87,15 +89,15 @@ other games. NetHack's tiles support was then implemented on other platforms The 3.2 NetHack Development Team, comprised of Michael Allison, Ken Arromdee, David Cohrs, Jessie Collet, Steve Creps, Kevin Darcy, Timo Hakulinen, Steve Linhart, Dean Luick, Pat Rankin, Eric Smith, Mike Stephenson, Janet Walz, -and Paul Winner, released version 3.2 in April of 1996. +and Paul Winner, released version 3.2.0 in April of 1996. Version 3.2 marked the tenth anniversary of the formation of the development team. In a testament to their dedication to the game, all thirteen members -of the original NetHack Development Team remained on the team at the start of -work on that release. During the interval between the release of 3.1.3 and -3.2, one of the founding members of the NetHack Development Team, -Dr. Izchak Miller, passed away. That release of the game was dedicated to -him by the development and porting teams. +of the original NetHack Development Team remained on the team at the start +of work on that release. During the interval between the release of 3.1.3 +and 3.2.0, one of the founding members of the NetHack Development Team, +Dr. Izchak Miller, was diagnosed with cancer and passed away. That release +of the game was dedicated to him by the development and porting teams. Version 3.2 proved to be more stable than previous versions. Many bugs were fixed, abuses eliminated, and game features tuned for better game @@ -120,6 +122,17 @@ NetHack 3.3. The final update to 3.2 was the bug fix release 3.2.3, which was released simultaneously with 3.3.0 in December 1999 just in time for the Year 2000. +Because of the newer version, 3.2.3 was released as a source code patch only, +without any ready-to-play distribution for systems that usually had such. + +(To anyone considering resurrecting an old version: all versions before +3.2.3 had a Y2K bug. The high scores file and the log file contained dates +which were formatted using a two-digit year, and 1999's year 99 was followed +by 2000's year 100. That got written out successfully but it unintentionally +introduced an extra column in the file layout which prevented score entries +from being read back in correctly, interfering with insertion of new high +scores and with retrieval of old character names to use for random ghost and +statue names in the current game.) The 3.3 NetHack Development Team, consisting of Michael Allison, Ken Arromdee, David Cohrs, Jessie Collet, Steve Creps, Kevin Darcy, Timo Hakulinen, diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn index 91c6260e2..0981f465c 100644 --- a/doc/Guidebook.mn +++ b/doc/Guidebook.mn @@ -1,4 +1,4 @@ -.\" $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.388 $ $NHDT-Date: 1593953329 2020/07/05 12:48:49 $ +.\" $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.389 $ $NHDT-Date: 1594118318 2020/07/07 10:38:38 $ .\" .\" This is an excerpt from the 'roff' man page from the 'groff' package. .\" Guidebook.mn currently does *not* fully adhere to these guidelines. @@ -5417,8 +5417,9 @@ He then coordinated a cast of thousands in enhancing and debugging NetHack 1.4 and released NetHack versions 2.2 and 2.3. .pg Later, Mike coordinated a major re-write of the game, heading a -team which included \fBKen Arromdee\fP, \fBJean-Christophe Collet\fP, \fBSteve -Creps\fP, \fBEric Hendrickson\fP, \fBIzchak Miller\fP, \fBJohn Rupley\fP, +team which included \fBKen Arromdee\fP, \fBJean-Christophe Collet\fP, +\fBSteve Creps\fP, \fBEric Hendrickson\fP, \fBIzchak Miller\fP, +\fBEric S. Raymond\fP, \fBJohn Rupley\fP, \fBMike Threepoint\fP, and \fBJanet Walz\fP, to produce NetHack 3.0c. .pg NetHack 3.0 was ported to the Atari by \fBEric R. Smith\fP, to OS/2 by @@ -5435,20 +5436,26 @@ revisions of 3.0. .pg Version 3.0 went through ten relatively rapidly released \(lqpatch-level\(rq revisions. -Versions at the time were designated \(lq3.0 patchlevel 10\(rq -or \(lq3.0pl10\(rq rather than 3.0.10; that three component numbering scheme -began to be used with 3.1.0. +Versions at the time were known as 3.0 for the base release and variously +as \(lq3.0a\(rq through \(lq3.0j\(rq, +\(lq3.0\ patchlevel\ 1\(rq through \(lq3.0\ patchlevel\ 10\(rq, +or \(lq3.0pl1\(rq through \(lq3.0pl10\(rq +rather than 3.0.0 and 3.0.1 through 3.0.10; +the three component numbering scheme began to be used with 3.1.0. .pg Headed by \fBMike Stephenson\fP and coordinated by \fBIzchak Miller\fP and \fBJanet Walz\fP, the NetHack Development Team which now included \fBKen Arromdee\fP, \fBDavid Cohrs\fP, \fBJean-Christophe Collet\fP, \fBKevin Darcy\fP, \fBMatt Day\fP, \fBTimo Hakulinen\fP, \fBSteve Linhart\fP, \fBDean Luick\fP, -\fBPat Rankin\fP, \fBEric Raymond\fP, and \fBEric Smith\fP undertook a radical -revision of 3.0. They re-structured the game's design, and re-wrote major -parts of the code. They added multiple dungeons, a new display, special +\fBPat Rankin\fP, \fBEric Raymond\fP, and \fBEric Smith\fP undertook a +radical revision of 3.0. +They re-structured the game's design, and re-wrote major +parts of the code. +They added multiple dungeons, a new display, special individual character quests, a new endgame and many other new features, and produced NetHack 3.1. +Version 3.1.0 was released in January of 1993. .pg \fBKen Lorber\fP, \fBGregg Wonderly\fP and \fBGreg Olson\fP, with help from \fBRichard Addison\fP, \fBMike Passaretti\fP, and \fBOlaf Seibert\fP, @@ -5494,15 +5501,18 @@ The 3.2 NetHack Development Team, comprised of \fBMichael Allison\fP, \fBKen Arromdee\fP, \fBDavid Cohrs\fP, \fBJessie Collet\fP, \fBSteve Creps\fP, \fBKevin Darcy\fP, \fBTimo Hakulinen\fP, \fBSteve Linhart\fP, \fBDean Luick\fP, \fBPat Rankin\fP, \fBEric Smith\fP, \fBMike Stephenson\fP, -\fBJanet Walz\fP, and \fBPaul Winner\fP, released version 3.2 in April of +\fBJanet Walz\fP, and \fBPaul Winner\fP, released version 3.2.0 in April of 1996. .pg -Version 3.2 marked the tenth anniversary of the formation of the development -team. In a testament to their dedication to the game, all thirteen members -of the original NetHack Development Team remained on the team at the start of work -on that release. During the interval between the release of 3.1.3 -and 3.2, one of the founding members of the NetHack Development Team, \fBDr. Izchak -Miller\fP, was diagnosed with cancer and passed away. That release of the +Version 3.2 marked the tenth anniversary of the formation of the +development team. +In a testament to their dedication to the game, all thirteen members +of the original NetHack Development Team remained on the team at the +start of work on that release. +During the interval between the release of 3.1.3 +and 3.2.0, one of the founding members of the NetHack Development Team, +\fBDr. Izchak Miller\fP, was diagnosed with cancer and passed away. +That release of the game was dedicated to him by the development and porting teams. .pg Version 3.2 proved to be more stable than previous versions. @@ -5532,6 +5542,19 @@ of these ideas into NetHack 3.3. .pg The final update to 3.2 was the bug fix release 3.2.3, which was released simultaneously with 3.3.0 in December 1999 just in time for the Year 2000. +Because of the newer version, 3.2.3 was released as a source code patch only, +without any ready-to-play distribution for systems that usually had such. +.pg +(To anyone considering resurrecting an old version: all versions before +3.2.3 had a \fIY2K\fP bug. +The high scores file and the log file contained +dates which were formatted using a two-digit year, and 1999's year 99 was +followed by 2000's year 100. +That got written out successfully but it +unintentionally introduced an extra column in the file layout which prevented +score entries from being read back in correctly, interfering with insertion +of new high scores and with retrieval of old character names to use for +random ghost and statue names in the current game.) .pg The 3.3 NetHack Development Team, consisting of \fBMichael Allison\fP, \fBKen Arromdee\fP, diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex index 4bf57af49..62e7144cc 100644 --- a/doc/Guidebook.tex +++ b/doc/Guidebook.tex @@ -5938,9 +5938,12 @@ revisions of 3.0. %.pg Version 3.0 went through ten relatively rapidly released ``patch-level'' revisions. -Versions at the time were designated ``3.0 patchlevel 10'' -or ``3.0pl10'' rather than 3.0.10; that three component numbering scheme -began to be used with 3.1.0. +Versions at the time were known as 3.0 for the base release and variously +as ``3.0a'' through ``3.0j'', +``3.0~patchlevel~1'' through ``3.0~patchlevel~10'', +or ``3.0pl1'' through ``3.0pl10'' +rather than 3.0.0 and 3.0.1 through 3.0.10; +the three component numbering scheme began to be used with 3.1.0. %.pg \medskip @@ -5949,11 +5952,14 @@ and {\it Janet Walz}, the {\it NetHack Development Team} which now included {\it Ken Arromdee}, {\it David Cohrs}, {\it Jean-Christophe Collet}, {\it Kevin Darcy}, {\it Matt Day}, {\it Timo Hakulinen}, {\it Steve Linhart}, {\it Dean Luick}, -{\it Pat Rankin}, {\it Eric Raymond}, and {\it Eric Smith\/} undertook a radical -revision of 3.0. They re-structured the game's design, and re-wrote major -parts of the code. They added multiple dungeons, a new display, special +{\it Pat Rankin}, {\it Eric Raymond}, and {\it Eric Smith\/} undertook a +radical revision of 3.0. +They re-structured the game's design, and re-wrote major +parts of the code. +They added multiple dungeons, a new display, special individual character quests, a new endgame and many other new features, and produced {\it NetHack\/} 3.1. +Version 3.1.0 was released in January of 1993. %.pg \medskip @@ -6015,16 +6021,19 @@ picked up by various other games. Arromdee}, {\it David Cohrs}, {\it Jessie Collet}, {\it Steve Creps}, {\it Kevin Darcy}, {\it Timo Hakulinen}, {\it Steve Linhart}, {\it Dean Luick}, {\it Pat Rankin}, {\it Eric Smith}, {\it Mike Stephenson}, {\it Janet Walz}, -and {\it Paul Winner}, released version 3.2 in April of 1996. +and {\it Paul Winner}, released version 3.2.0 in April of 1996. %.pg \medskip -\nd Version 3.2 marked the tenth anniversary of the formation of the development -team. In a testament to their dedication to the game, all thirteen members -of the original {\it NetHack Development Team} remained on the team at the start of work on -that release. During the interval between the release of 3.1.3 and 3.2, -one of the founding members of the {\it NetHack Development Team}, {\it Dr. Izchak Miller}, -was diagnosed with cancer and passed away. That release of the game was +\nd Version 3.2 marked the tenth anniversary of the formation of the +development team. +In a testament to their dedication to the game, all thirteen members +of the original {\it NetHack Development Team} remained on the team at the +start of work on that release. +During the interval between the release of 3.1.3 and 3.2.0, +one of the founding members of the {\it NetHack Development Team}, +{\it Dr. Izchak Miller}, was diagnosed with cancer and passed away. +That release of the game was dedicated to him by the development and porting teams. %.pg @@ -6064,6 +6073,20 @@ the best of these ideas into {\it NetHack\/} 3.3. \medskip The final update to 3.2 was the bug fix release 3.2.3, which was released simultaneously with 3.3.0 in December 1999 just in time for the Year 2000. +Because of the newer version, 3.2.3 was released as a source code patch only, +without any ready-to-play distribution for systems that usually had such. + +%.pg +(To anyone considering resurrecting an old version: all versions before +3.2.3 had a {\it Y2K\/} bug. +The high scores file and the log file contained +dates which were formatted using a two-digit year, and 1999's year 99 was +followed by 2000's year 100. +That got written out successfully but it +unintentionally introduced an extra column in the file layout which prevented +score entries from being read back in correctly, interfering with insertion +of new high scores and with retrieval of old character names to use for +random ghost and statue names in the current game.) %.pg \medskip From b967f73b9649453e3466b72aeb6ad083337acb03 Mon Sep 17 00:00:00 2001 From: nhmall Date: Tue, 7 Jul 2020 17:36:23 -0400 Subject: [PATCH 3/3] build with the current Lua version 5.4.0 by default if not overridden --- .travis.yml | 20 +++++++------- Cross-compiling | 2 +- Porting | 4 +-- sys/msdos/Makefile.GCC | 25 ++++++++++------- sys/msdos/Makefile1.cross | 14 +++++++--- sys/msdos/Makefile2.cross | 28 +++++++++++++------ sys/unix/Makefile.top | 4 +-- sys/unix/NetHack.xcodeproj/project.pbxproj | 4 +-- sys/vms/Makefile.src | 22 +++++++++++---- sys/winnt/Install.nt | 4 +-- sys/winnt/Makefile.gcc | 32 ++++++++++++++-------- sys/winnt/Makefile.msc | 25 +++++++++++------ sys/winnt/travis-gcc.sh | 4 +-- win/win32/vs2017/NetHack.vcxproj | 5 +++- win/win32/vs2017/NetHackProperties.props | 10 +++++++ win/win32/vs2017/NetHackW.vcxproj | 5 +++- win/win32/vs2017/dirs.props | 2 +- win/win32/vs2017/makedefs.vcxproj | 6 ++-- win/win32/vs2017/travisci.sh | 6 ++-- 19 files changed, 143 insertions(+), 79 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbac8cbe3..4ed41b36f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ matrix: include: - name: linux-xenial-gcc os: linux - env: HINTS=linux LUA_VERSION=5.3.5 + env: HINTS=linux LUA_VERSION=5.4.0 compiler: gcc script: - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ @@ -12,7 +12,7 @@ matrix: - make install - name: linux-xenial-gcc-nocommon os: linux - env: HINTS=linux LUA_VERSION=5.3.5 + env: HINTS=linux LUA_VERSION=5.4.0 compiler: gcc script: - echo "CFLAGS+=-fno-common" >>sys/unix/hints/$HINTS @@ -22,7 +22,7 @@ matrix: - make install - name: linux-bionic-gcc os: linux - env: HINTS=linux LUA_VERSION=5.3.5 + env: HINTS=linux LUA_VERSION=5.4.0 dist: bionic compiler: gcc script: @@ -32,7 +32,7 @@ matrix: - make install - name: linux-xenial-clang os: linux - env: HINTS=linux LUA_VERSION=5.3.5 + env: HINTS=linux LUA_VERSION=5.4.0 compiler: clang script: - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ @@ -41,7 +41,7 @@ matrix: - make install - name: linux-xenial-gcc-x11 os: linux - env: HINTS=linux-x11 LUA_VERSION=5.3.5 + env: HINTS=linux-x11 LUA_VERSION=5.4.0 compiler: gcc addons: apt: @@ -56,7 +56,7 @@ matrix: - make install - name: linux-xenial-gcc-qt5 os: linux - env: HINTS=linux-qt5 LUA_VERSION=5.3.5 + env: HINTS=linux-qt5 LUA_VERSION=5.4.0 compiler: gcc addons: apt: @@ -74,7 +74,7 @@ matrix: - make QT_SELECT=5 MOC=moc install - name: linux-bionic-gcc-x11 os: linux - env: HINTS=linux-x11 LUA_VERSION=5.3.5 + env: HINTS=linux-x11 LUA_VERSION=5.4.0 dist: bionic compiler: gcc addons: @@ -90,7 +90,7 @@ matrix: - make install - name: linux-xenial-gcc-minimal os: linux - env: HINTS=linux-minimal LUA_VERSION=5.3.5 + env: HINTS=linux-minimal LUA_VERSION=5.4.0 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.3.5 + - export LUA_VERSION=5.4.0 - sh sys/winnt/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 install - name: msdos-linuxhost-crosscompile os: linux - env: HINTS=linux LUA_VERSION=5.3.5 + env: HINTS=linux LUA_VERSION=5.4.0 compiler: gcc script: # - export diff --git a/Cross-compiling b/Cross-compiling index e0f6df401..b7fc4b58b 100644 --- a/Cross-compiling +++ b/Cross-compiling @@ -407,7 +407,7 @@ Using the cross-compiler, build the following targets: b) Lua (mandatory in 3.7) - lib/lua-5.3.5/src + lib/lua-5.4.0/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 cc27f9965..7d4d5153a 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.3.5 (or other folder +your platform. Place the Lua source into lib/lua-5.4.0 (or other folder representing an appropriate Lua version); place the compiled Lua library into lib. @@ -266,6 +266,6 @@ by code within the game itself. That was done to facilitate cross-compiling of NetHack on one platform for game execution on another. -# NetHack 3.6 Porting $NHDT-Date: 1524689603 2018/04/25 20:53:23 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.5 $ +# NetHack 3.6 Porting $NHDT-Date: 1594155866 2020/07/07 21:04:26 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.8 $ # Copyright (c) 2005 by Michael Allison # NetHack may be freely redistributed. See license for details. diff --git a/sys/msdos/Makefile.GCC b/sys/msdos/Makefile.GCC index 95598d5d3..4c7bd6998 100644 --- a/sys/msdos/Makefile.GCC +++ b/sys/msdos/Makefile.GCC @@ -1,4 +1,4 @@ -# NetHack 3.6 Makefile.GCC $NHDT-Date: 1519600525 2018/02/25 23:15:25 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.34 $ +# NetHack 3.6 Makefile.GCC $NHDT-Date: 1594155873 2020/07/07 21:04:33 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.51 $ # Copyright (c) NetHack PC Development Team 1996-2019. # PC NetHack 3.6 Makefile for djgpp V2 # @@ -38,11 +38,17 @@ GAMEDIR =../binary ADD_CURSES=Y PDCURSES_TOP=../../pdcurses +#--------------------------------------------------------------- +ifeq "$(LUA_VERSION)" "5.3.5" +LUAVER=5.3.5 +else +LUAVER=5.4.0 +endif #--------------------------------------------------------------- # Location of LUA # # Original source needs to be obtained from: -# http://www.lua.org/ftp/lua-5.3.5.tar.gz +# http://www.lua.org/ftp/lua-5.4.0.tar.gz # # This build assumes that the LUA sources are located # at the specified location. If they are actually elsewhere @@ -50,8 +56,7 @@ PDCURSES_TOP=../../pdcurses # successfully build NetHack-3.7. # ADD_LUA=Y -LUATOP=../lib/lua535 - +LUATOP=../lib/lua$(subst .,, $(LUAVER)) # #============================================================================== # This marks the end of the BUILD DECISIONS section. @@ -300,12 +305,12 @@ ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ) #===============-================================================= # LUA library -# Source from http://www.lua.org/ftp/lua-5.3.5.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz #================================================================= LUASRC = $(LUATOP)/src -LUALIB = $(O)lua535s.a -LUADLL = $(O)lua535.a +LUALIB = $(O)lua$(subst .,, $(LUAVER))s.a +LUADLL = $(O)lua$(subst .,, $(LUAVER)).a LUAINCL = -I$(LUASRC) #LUAFLAGS = unix added -lm here? LUATARGETS = lua.exe luac.exe $(LUADLL) $(LUALIB) @@ -951,14 +956,14 @@ $(PATCHLEV_H): lua.exe: $(O)lua.o $(LUALIB) $(link) $(LFLAGS) -o$@ $(O)lua.o $(LUALIB) -luac.exe: $(O)luac.o $(O)lua535s.a +luac.exe: $(O)luac.o $(O)lua$(subst .,, $(LUAVER))s.a $(link) $(LFLAGSU) -o$@ $(O)luac.o $(LUALIB) -$(O)lua535.a: $(LUAOBJFILES) +$(O)lua$(subst .,, $(LUAVER)).a: $(LUAOBJFILES) $(cc) -shared -Wl,--export-all-symbols \ -Wl,--add-stdcall-alias -o $@ $< -$(O)lua535s.a: $(LUAOBJFILES) +$(O)lua$(subst .,, $(LUAVER))s.a: $(LUAOBJFILES) ar rcS $@ $(LUAOBJFILES1) ar rcS $@ $(LUAOBJFILES2) ar rcs $@ $(LUAOBJFILES3) diff --git a/sys/msdos/Makefile1.cross b/sys/msdos/Makefile1.cross index 88f7efdd0..ae7e3fe19 100644 --- a/sys/msdos/Makefile1.cross +++ b/sys/msdos/Makefile1.cross @@ -312,13 +312,19 @@ $(HOST_O)prereq.tag: $(INCL)/nhlua.h hobj.tag $(U)makedefs \ $(HOST_O)utility.tag $(DAT)/nhdat echo prereq done >$@ +ifeq "$(LUA_VERSION)" "5.3.5" +LUAVER=5.3.5 +else +LUAVER=5.4.0 +endif + $(INCL)/nhlua.h: cd $(INCL); \ echo '/* nhlua.h - generated by Makefile1.cross */' > $@; \ - echo '#include "../lib/lua-5.3.5/src/lua.h"' >> $@; \ - sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < $(LIB)/lua-5.3.5/src/lua.h >> $@; \ - echo '#include "../lib/lua-5.3.5/src/lualib.h"' >> $@; \ - echo '#include "../lib/lua-5.3.5/src/lauxlib.h"' >> $@; \ + echo '#include "../lib/lua-$(LUAVER)/src/lua.h"' >> $@; \ + sed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < $(LIB)/lua-$(LUAVER)/src/lua.h >> $@; \ + echo '#include "../lib/lua-$(LUAVER)/src/lualib.h"' >> $@; \ + echo '#include "../lib/lua-$(LUAVER)/src/lauxlib.h"' >> $@; \ echo '/*nhlua.h*/' >> $@; \ cd $(SRC) diff --git a/sys/msdos/Makefile2.cross b/sys/msdos/Makefile2.cross index 8cd94ffc2..d81f80746 100644 --- a/sys/msdos/Makefile2.cross +++ b/sys/msdos/Makefile2.cross @@ -43,11 +43,17 @@ PDCURSES_TOP=../lib/pdcurses # Set top of djgpp if not specified through ENV variables prior to make: #DJGPP_TOP = $(HOME)/lib/djgpp +#--------------------------------------------------------------- +ifeq "$(LUA_VERSION)" "5.3.5" +LUAVER=5.3.5 +else +LUAVER=5.4.0 +endif #--------------------------------------------------------------- # Location of LUA # # Original source needs to be obtained from: -# http://www.lua.org/ftp/lua-5.3.5.tar.gz +# http://www.lua.org/ftp/lua-5.4.0.tar.gz # # This build assumes that the LUA sources are located # at the specified location. If they are actually elsewhere @@ -55,7 +61,7 @@ PDCURSES_TOP=../lib/pdcurses # successfully build NetHack-3.7. # ADD_LUA=Y -LUATOP=../lib/lua-5.3.5 +LUATOP=../lib/lua-$(LUAVER) # # #============================================================================== @@ -308,18 +314,18 @@ ALLOBJ = $(VOBJ) $(SOBJ) $(TILOBJ) $(TILOBJ2) $(VVOBJ) ifeq "$(ADD_LUA)" "Y" #===============-================================================= # LUA library -# Source from http://www.lua.org/ftp/lua-5.3.5.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz #================================================================= LUASRC = $(LUATOP)/src -LUALIB = $(O)lua535s.a -#LUADLL = $(O)lua535.a +LUALIB = $(O)lua$(subst .,, $(LUAVER))s.a +#LUADLL = $(O)lua$(subst .,, $(LUAVER)).a LUAINCL = -I$(LUASRC) #LUAFLAGS = unix added -lm here? LUATARGETS = lua.exe luac.exe $(LUALIB) #LUATARGETS = $(LUADLL) $(LUALIB) -LUASRCFILES = lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c \ +LUASRCFILES = lapi.c lauxlib.c lbaselib.c lcode.c \ lcorolib.c lctype.c ldblib.c ldebug.c ldo.c \ ldump.c lfunc.c lgc.c linit.c liolib.c llex.c \ lmathlib.c lmem.c loadlib.c lobject.c lopcodes.c \ @@ -327,7 +333,7 @@ LUASRCFILES = lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c \ ltable.c ltablib.c ltm.c lundump.c lutf8lib.c \ lvm.c lzio.c -LUAOBJFILES1 = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o $(O)lbitlib.o \ +LUAOBJFILES1 = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \ $(O)lcode.o $(O)lcorolib.o $(O)lctype.o $(O)ldblib.o LUAOBJFILES2 = $(O)ldebug.o $(O)ldo.o $(O)ldump.o $(O)lfunc.o \ $(O)lgc.o $(O)linit.o $(O)liolib.o $(O)llex.o @@ -336,7 +342,7 @@ LUAOBJFILES3 = $(O)lmathlib.o $(O)lmem.o $(O)loadlib.o $(O)lobject.o \ LUAOBJFILES4 = $(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 -#LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o $(O)lbitlib.o \ +#LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \ # $(O)lcode.o $(O)lcorolib.o $(O)lctype.o $(O)ldblib.o \ # $(O)ldebug.o $(O)ldo.o $(O)ldump.o $(O)lfunc.o \ # $(O)lgc.o $(O)linit.o $(O)liolib.o $(O)llex.o \ @@ -345,9 +351,13 @@ LUAOBJFILES4 = $(O)lstring.o $(O)lstrlib.o $(O)ltable.o $(O)ltablib.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 -LUALIBOBJS = $(LUAOBJFILES1) $(LUAOBJFILES2) $(LUAOBJFILES3) $(LUAOBJFILES4) +ifeq "$(LUAVER)" "5.3.5" +LUASRCFILES = $(LUASRCFILES) lbitlib.c +LUAOBJFILES1 = $(LUAOBJFILES1) $(O)lbitlib.o endif +LUALIBOBJS = $(LUAOBJFILES1) $(LUAOBJFILES2) $(LUAOBJFILES3) $(LUAOBJFILES4) +endif ifeq "$(ADD_CURSES)" "Y" #========================================== # PDCurses build macros diff --git a/sys/unix/Makefile.top b/sys/unix/Makefile.top index 6da467db0..9070d60e8 100644 --- a/sys/unix/Makefile.top +++ b/sys/unix/Makefile.top @@ -1,5 +1,5 @@ # NetHack Top-level Makefile. -# NetHack 3.6 Makefile.top $NHDT-Date: 1589911654 2020/05/19 18:07:34 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.49 $ +# NetHack 3.6 Makefile.top $NHDT-Date: 1594155882 2020/07/07 21:04:42 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.50 $ # Copyright (c) 2015 by Kenneth Lorber, Kensington, Maryland # NetHack may be freely redistributed. See license for details. @@ -75,7 +75,7 @@ VARDAT = $(VARDATD) $(VARDATND) #CHGRP = chgrp # Lua version -LUA_VERSION = 5.3.5 +LUA_VERSION = 5.4.0 # # end of configuration diff --git a/sys/unix/NetHack.xcodeproj/project.pbxproj b/sys/unix/NetHack.xcodeproj/project.pbxproj index ca03331a8..78a8a4b3b 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.3.5/src/lua.h\"' >> nhlua.h\nsed -e '/(lua_error)/!d' -e '/(lua_error)/s/;/ NORETURN;/1' < ${NH_LIB_DIR}/lua-5.3.5/src/lua.h >> nhlua.h\necho '#include \"../lib/lua-5.3.5/src/lualib.h\"' >> nhlua.h\necho '#include \"../lib/lua-5.3.5/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.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"; }; 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.3.5/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.0/src\nmake a\ncp liblua.a ../../lua\ncd ../../..\n\n"; }; /* End PBXShellScriptBuildPhase section */ diff --git a/sys/vms/Makefile.src b/sys/vms/Makefile.src index e215ad04d..3ce32ad5c 100644 --- a/sys/vms/Makefile.src +++ b/sys/vms/Makefile.src @@ -1,5 +1,5 @@ # NetHack Makefile (VMS) - for building nethack itself. -# NetHack 3.6 Makefile.src $NHDT-Date: 1573165004 2019/11/07 22:16:44 $ $NHDT-Branch: paxed-lua-v2-merged $:$NHDT-Revision: 1.38 $ +# NetHack 3.6 Makefile.src $NHDT-Date: 1594155889 2020/07/07 21:04:49 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.50 $ # Copyright (c) 2011 by Robert Patrick Rankin # NetHack may be freely redistributed. See license for details. @@ -29,7 +29,7 @@ VMS = [-.sys.vms] WINSHR = [-.win.share] X11 = [-.win.X11] #LUA source tree parallel to NetHack tree in lua535 directory -LUA = [-.-.lua535.src] +LUA = [-.-.lua540.src] MAKEFILE= $(SRC)Makefile. # if you are using gcc as your compiler: @@ -214,8 +214,17 @@ HOBJ = $(FIRSTOBJ) $(SYSOBJ) $(WINOBJ) $(RANDOBJ) \ $(HOBJ1) $(HOBJ2) $(HOBJ3) $(HOBJ4) $(HOBJ5) $(HOBJ6) LUAOBJ = nhlua.o,nhlsel.o + +# 5.4.0 adds 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 = +#LUA535SRCFILES = $(LUA)lbitlib.c +#LUA535OBJFILES = lbitlib.o, +endif + LUALIBSRC = $(LUA)lapi.c $(LUA)lauxlib.c $(LUA)lbaselib.c \ - $(LUA)lbitlib.c $(LUA)lcode.c $(LUA)lcorolib.c \ + $(LUA535SRCFILES) $(LUA)lcode.c $(LUA)lcorolib.c \ $(LUA)lctype.c $(LUA)ldblib.c $(LUA)ldebug.c \ $(LUA)ldo.c $(LUA)ldump.c $(LUA)lfunc.c $(LUA)lgc.c \ $(LUA)linit.c $(LUA)liolib.c $(LUA)llex.c \ @@ -226,7 +235,7 @@ LUALIBSRC = $(LUA)lapi.c $(LUA)lauxlib.c $(LUA)lbaselib.c \ $(LUA)ltm.c $(LUA)lundump.c $(LUA)lutf8lib.c \ $(LUA)lvm.c $(LUA)lzio.c -LUALIBOBJ1 = lapi.obj,lauxlib.obj,lbaselib.obj,lbitlib.obj, \ +LUALIBOBJ1 = lapi.obj,lauxlib.obj,lbaselib.obj, $(LUA535OBJFILES) \ lcode.obj,lcorolib.obj,lctype.obj,ldblib.obj LUALIBOBJ2 = ldebug.obj,ldo.obj,ldump.obj,lfunc.obj, \ lgc.obj,linit.obj,liolib.obj,llex.obj @@ -448,11 +457,12 @@ wintext.obj : $(X11)wintext.c $(HACK_H) $(INC)winX.h $(INC)xwindow.h winval.obj : $(X11)winval.c $(HACK_H) $(INC)winX.h tile.obj : $(SRC)tile.c $(HACK_H) vis_tab.obj : vis_tab.c $(CONFIG_H) $(INC)vis_tab.h -# lua 5.3.5 code +# lua 5.4.0 code lapi.obj : $(LUA)lapi.c lauxlib.obj : $(LUA)lauxlib.c lbaselib.obj : $(LUA)lbaselib.c -lbitlib.obj : $(LUA)lbitlib.c +#uncomment this for 5.3.5 +#lbitlib.obj : $(LUA)lbitlib.c lcode.obj : $(LUA)lcode.c lcorolib.obj : $(LUA)lcorolib.c lctype.obj : $(LUA)lctype.c diff --git a/sys/winnt/Install.nt b/sys/winnt/Install.nt index 4eb5d1348..22c9f4484 100644 --- a/sys/winnt/Install.nt +++ b/sys/winnt/Install.nt @@ -5,7 +5,7 @@ NetHack 3.7 on a Windows system (Windows 7/8.x/10 or later only) ============================================================== - Last revision: $NHDT-Date: 1575245156 2019/12/02 00:05:56 $ + Last revision: $NHDT-Date: 1594155895 2020/07/07 21:04:55 $ Credit for the porting of NetHack to the Win32 Console Subsystem goes to the NT Porting Team started by Michael Allison. @@ -47,7 +47,7 @@ version. You can use one of the following build environments: | | | +----+ +------+ +-----------+ | | | | | | - share winnt tty win32 Lua-5.3.5 pdcurses + share winnt tty win32 Lua-5.4.0 pdcurses | vs2017 diff --git a/sys/winnt/Makefile.gcc b/sys/winnt/Makefile.gcc index 29da0a377..363b0d454 100644 --- a/sys/winnt/Makefile.gcc +++ b/sys/winnt/Makefile.gcc @@ -1,4 +1,4 @@ -# NetHack 3.7 Makefile.gcc $NHDT-Date: 1546174698 2018/12/30 12:58:18 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.71 $ +# NetHack 3.7 Makefile.gcc $NHDT-Date: 1594155895 2020/07/07 21:04:55 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.109 $ # Copyright (c) 2010 by Michael Allison # NetHack may be freely redistributed. See license for details. # @@ -126,10 +126,16 @@ TARGET_CPU=x86 # x86libs or x64libs depending on whether you're building for 64 bits. # #--------------------------------------------------------------- +ifndef LUA_VERSION +LUAVER=5.4.0 +else +LUAVER=$(LUA_VERSION) +endif +#--------------------------------------------------------------- # Location of LUA # # Original source needs to be obtained from: -# http://www.lua.org/ftp/lua-5.3.5.tar.gz +# http://www.lua.org/ftp/lua-5.4.0.tar.gz # # This build assumes that the LUA sources are located # at the specified location. If they are actually elsewhere @@ -137,11 +143,7 @@ TARGET_CPU=x86 # successfully build NetHack-3.7. # ADD_LUA=Y -LUATOP=../lib/lua-5.3.5 -ifndef LUA_VERSION -LUA_VERSION=5.3.5 -endif - +LUATOP=../lib/lua-$(LUAVER) # #============================================================================== # This marks the end of the BUILD DECISIONS section. @@ -412,10 +414,12 @@ OPTIONS_FILE = $(DAT)\options #===============-================================================= # LUA library -# Source from http://www.lua.org/ftp/lua-5.3.5.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz #================================================================= -LUAVER = 5.3.5 +ifndef LUAVER +LUAVER = 5.4.0 +endif LUASRC = $(LUATOP)/src LUALIB = $(O)lua-$(LUAVER).static.a LUADLL = $(O)lua-$(LUAVER).a @@ -423,7 +427,7 @@ LUAINCL = -I$(LUASRC) #LUAFLAGS = unix added -lm here? LUATARGETS = lua.exe luac.exe $(LUADLL) $(LUALIB) -LUASRCFILES = lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c \ +LUASRCFILES = lapi.c lauxlib.c lbaselib.c lcode.c \ lcorolib.c lctype.c ldblib.c ldebug.c ldo.c \ ldump.c lfunc.c lgc.c linit.c liolib.c llex.c \ lmathlib.c lmem.c loadlib.c lobject.c lopcodes.c \ @@ -431,7 +435,7 @@ LUASRCFILES = lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c \ ltable.c ltablib.c ltm.c lundump.c lutf8lib.c \ lvm.c lzio.c -LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o $(O)lbitlib.o \ +LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \ $(O)lcode.o $(O)lcorolib.o $(O)lctype.o $(O)ldblib.o \ $(O)ldebug.o $(O)ldo.o $(O)ldump.o $(O)lfunc.o \ $(O)lgc.o $(O)linit.o $(O)liolib.o $(O)llex.o \ @@ -439,6 +443,12 @@ LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o $(O)lbitlib.o \ $(O)lopcodes.o $(O)loslib.o $(O)lparser.o $(O)lstate.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 +# so we have to tack those on for the previous version (5.3.5) +LUASRCFILES = $(LUASRCFILES) lbitlib.c +LUAOBJFILES = $(LUAOBJFILES) lbitlib.o +endif ifeq "$(ADD_CURSES)" "Y" #========================================== diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index 7a89b93cb..0441ab35a 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/winnt/Makefile.msc @@ -130,12 +130,17 @@ DEBUGINFO = Y #============================================================================== # This marks the end of the BUILD DECISIONS section. #============================================================================== +!IFNDEF LUA_VERSION +LUAVER=5.4.0 +!ELSE +LUAVER=$(LUA_VERSION) +!ENDIF #============================================================================== # # Location of LUA # # Original source needs to be obtained from: -# http://www.lua.org/ftp/lua-5.3.5.tar.gz +# http://www.lua.org/ftp/lua-5.4.0.tar.gz # # This build assumes that the LUA sources are located # at the specified location. If they are actually elsewhere @@ -143,7 +148,7 @@ DEBUGINFO = Y # successfully build NetHack-3.7. You cannot build a functional # version of NetHack-3.7 Work-in-progress without including Lua. # -LUATOP=..\lib\lua-5.3.5 +LUATOP=..\lib\lua-$(LUAVER) # # #============================================================================== @@ -380,11 +385,12 @@ OPTIONS_FILE = $(DAT)\options #===============-================================================= # LUA library -# Source from http://www.lua.org/ftp/lua-5.3.5.tar.gz +# Source from http://www.lua.org/ftp/lua-5.4.0.tar.gz #================================================================= +!IFNDEF LUAVER !IFDEF LUATOP -LUATMP = $(LUATOP:..\..\lua-=) #strip leading "..\..\lua-" +LUATMP = $(LUATOP:..\lib\lua-=) #strip leading "..\lib\lua-" LUATMP = $(LUATMP:-beta=) #strip suffix if exists "-beta" !IF "$(LUATMP)" == "5.4.0" LUAVER = 5.4.0 @@ -394,12 +400,13 @@ LUAVER = 5.4.0 !ENDIF !IFNDEF LUAVER -LUATMP = $(LUATOP:..\..\LUA-=) #strip leading "..\..\LUA-" +LUATMP = $(LUATOP:..\lib\LUA-=) #strip leading "..\lib\LUA-" LUATMP = $(LUATMP:-BETA=) #strip suffix if exists "-BETA" -!IF "$(LUATMP)" == "5.4.0" -LUAVER = 5.4.0 -!ELSE +!IF "$(LUATMP)" == "5.3.5" LUAVER = 5.3.5 +!ELSE +LUAVER = 5.4.0 +!ENDIF !ENDIF !ENDIF @@ -429,7 +436,7 @@ LUAOBJFILES = $(O)lapi.o $(O)lauxlib.o $(O)lbaselib.o \ !IF "$(LUAVER)" == "5.3.5" LUASRCFILES = $(LUASRCFILES) lbitlib.c LUAOBJFILES = $(LUAOBJFILES) $(O)lbitlib.o -!ELSEIF "$(LUAVER)" == "5.4.0" +!ELSE # 5.4.0 adds 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 6f731cea8..bcf44b5b8 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.3.5.tar.gz -tar zxf lua-5.3.5.tar.gz +curl -R -O http://www.lua.org/ftp/lua-5.4.0.tar.gz +tar zxf lua-5.4.0.tar.gz cd ../ diff --git a/win/win32/vs2017/NetHack.vcxproj b/win/win32/vs2017/NetHack.vcxproj index 485081cd5..d31325331 100644 --- a/win/win32/vs2017/NetHack.vcxproj +++ b/win/win32/vs2017/NetHack.vcxproj @@ -56,7 +56,10 @@ - + + true + false + diff --git a/win/win32/vs2017/NetHackProperties.props b/win/win32/vs2017/NetHackProperties.props index 227fe601d..8c3665ce3 100644 --- a/win/win32/vs2017/NetHackProperties.props +++ b/win/win32/vs2017/NetHackProperties.props @@ -5,6 +5,8 @@ 3 7 0 + 5.4.0 + true @@ -21,5 +23,13 @@ $(PATCHLEVEL) true + + $(LUA_VERSION) + true + + + $(ADD_PACKAGE) + true + diff --git a/win/win32/vs2017/NetHackW.vcxproj b/win/win32/vs2017/NetHackW.vcxproj index e2845b42c..5f8f7a415 100644 --- a/win/win32/vs2017/NetHackW.vcxproj +++ b/win/win32/vs2017/NetHackW.vcxproj @@ -50,7 +50,10 @@ - + + true + false + diff --git a/win/win32/vs2017/dirs.props b/win/win32/vs2017/dirs.props index 8e884b1d0..05b6543ac 100644 --- a/win/win32/vs2017/dirs.props +++ b/win/win32/vs2017/dirs.props @@ -10,7 +10,7 @@ $(RootDir)dat\ $(RootDir)doc\ $(RootDir)include\ - $(RootDir)lib\lua-5.3.5\src\ + $(RootDir)lib\lua-$(LUA_VERSION)\src\ $(RootDir)src\ $(RootDir)sys\ $(RootDir)util\ diff --git a/win/win32/vs2017/makedefs.vcxproj b/win/win32/vs2017/makedefs.vcxproj index 00dab103c..190952a6a 100644 --- a/win/win32/vs2017/makedefs.vcxproj +++ b/win/win32/vs2017/makedefs.vcxproj @@ -55,10 +55,10 @@ Outputs="$(IncDir)\nhlua.h"> - + - - + + diff --git a/win/win32/vs2017/travisci.sh b/win/win32/vs2017/travisci.sh index 7c16f6c9c..6eb4fa64a 100644 --- a/win/win32/vs2017/travisci.sh +++ b/win/win32/vs2017/travisci.sh @@ -24,13 +24,13 @@ 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.3.5 +export LUA_VERSION=5.4.0 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.3.5.tar.gz -tar zxf lua-5.3.5.tar.gz +curl -R -O http://www.lua.org/ftp/lua-$LUA_VERSION.tar.gz +tar zxf lua-$LUA_VERSION.tar.gz #cd ctags #nmake -f mk_mvc.mak #cd ../../