diff --git a/Cross-compiling b/Cross-compiling index 0e3f0bb7f..062fbadff 100644 --- a/Cross-compiling +++ b/Cross-compiling @@ -468,7 +468,7 @@ Cross-compiler pre-built binary downloads: sh sys/msdos/fetch-cross-compiler.sh That script won't install anything, it just does file fetches and stores - them in subfolders of lib. The linux.2020 and macOS.2020 hints files are + them in subfolders of lib. The linux.370 and macOS.370 hints files are configured to find the cross-compiler there if you add CROSS_TO_MSDOS=1 on your make command line. @@ -479,12 +479,12 @@ Cross-compiler pre-built binary downloads: On your linux host: - cd sys/unix ; sh setup.sh hints/linux.2020 ; cd ../.. + cd sys/unix ; sh setup.sh hints/linux.370 ; cd ../.. make fetch-lua On your macOS host: - cd sys/unix ; sh setup.sh hints/macOS.2020 ; cd ../.. + cd sys/unix ; sh setup.sh hints/macOS.370 ; cd ../.. make fetch-lua The MSDOS cross-compile can then be carried out by specifying @@ -563,12 +563,12 @@ Cross-compiler url: https://github.com/bebbo/amiga-gcc On your linux host: - cd sys/unix ; sh setup.sh hints/linux.2020 ; cd ../.. + cd sys/unix ; sh setup.sh hints/linux.370 ; cd ../.. make fetch-lua On your macOS host: - cd sys/unix ; sh setup.sh hints/macOS.2020 ; cd ../.. + cd sys/unix ; sh setup.sh hints/macOS.370 ; cd ../.. make fetch-lua The Amiga cross-compile can then be carried out by specifying @@ -657,12 +657,12 @@ Cross-compiler url: https://emscripten.org/docs/getting_started/downloads.html On your linux host, prepare to cross-compile NetHack as follows: - cd sys/unix ; sh setup.sh hints/linux.2020 ; cd ../.. + cd sys/unix ; sh setup.sh hints/linux.370 ; cd ../.. make fetch-lua On your macOS host, prepare to cross-compile NetHack as follows: - cd sys/unix ; sh setup.sh hints/macOS.2020 ; cd ../.. + cd sys/unix ; sh setup.sh hints/macOS.370 ; cd ../.. make fetch-lua Then, cross-compile to targets/wasm as follows: @@ -685,7 +685,7 @@ Cross-compiler url: https://emscripten.org/docs/getting_started/downloads.html The cross-compiler hints additions are enclosed inside ifdef sections and shouldn't interfere with the non-cross-compile builds using - hints/linux.2020 or hints/macOS.2020. + hints/linux.370 or hints/macOS.370. --- diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0fe621965..d135e8985 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -154,7 +154,7 @@ steps: - bash: | cd sys/unix - sh setup.sh hints/linux.2020 + sh setup.sh hints/linux.370 cd ../.. make fetch-lua make WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc all @@ -193,7 +193,7 @@ steps: - bash: | cd sys/unix - sh setup.sh hints/macos.2020 + sh setup.sh hints/macos.370 cd ../.. make fetch-lua make all @@ -204,7 +204,7 @@ steps: - bash: | export GCCVER=gcc1020 cd sys/unix - sh setup.sh hints/linux.2020 + sh setup.sh hints/linux.370 cd ../.. make fetch-lua sh sys/msdos/fetch-cross-compiler.sh diff --git a/outdated/.travis.yml b/outdated/.travis.yml index 90e33f3be..6932e8815 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.2020 LUA_VERSION=5.4.3 + env: HINTS=linux.370 LUA_VERSION=5.4.3 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.2020 LUA_VERSION=5.4.3 + env: HINTS=linux.370 LUA_VERSION=5.4.3 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.2020 LUA_VERSION=5.4.3 + env: HINTS=linux.370 LUA_VERSION=5.4.3 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.2020 LUA_VERSION=5.4.3 + env: HINTS=linux.370 LUA_VERSION=5.4.3 dist: xenial compiler: gcc script: @@ -70,7 +70,7 @@ matrix: - make install - name: linux-focal-gcc9-win-all os: linux - env: HINTS=linux.2020 LUA_VERSION=5.4.3 + env: HINTS=linux.370 LUA_VERSION=5.4.3 dist: focal compiler: gcc addons: @@ -138,7 +138,7 @@ matrix: - mingw32-make LUA_VERSION=$LUA_VERSION install - name: msdos-linux-focal-djgpp-crosscompile os: linux - env: HINTS=linux.2020 LUA_VERSION=5.4.3 + env: HINTS=linux.370 LUA_VERSION=5.4.3 dist: focal compiler: gcc script: diff --git a/sys/unix/hints/linux b/outdated/sys/unix/hints/linux similarity index 100% rename from sys/unix/hints/linux rename to outdated/sys/unix/hints/linux diff --git a/sys/unix/hints/linux-chroot b/outdated/sys/unix/hints/linux-chroot similarity index 100% rename from sys/unix/hints/linux-chroot rename to outdated/sys/unix/hints/linux-chroot diff --git a/sys/unix/hints/linux-minimal b/outdated/sys/unix/hints/linux-minimal similarity index 100% rename from sys/unix/hints/linux-minimal rename to outdated/sys/unix/hints/linux-minimal diff --git a/sys/unix/hints/linux-qt4 b/outdated/sys/unix/hints/linux-qt4 similarity index 100% rename from sys/unix/hints/linux-qt4 rename to outdated/sys/unix/hints/linux-qt4 diff --git a/sys/unix/hints/linux-qt5 b/outdated/sys/unix/hints/linux-qt5 similarity index 100% rename from sys/unix/hints/linux-qt5 rename to outdated/sys/unix/hints/linux-qt5 diff --git a/sys/unix/hints/linux-x11 b/outdated/sys/unix/hints/linux-x11 similarity index 100% rename from sys/unix/hints/linux-x11 rename to outdated/sys/unix/hints/linux-x11 diff --git a/sys/unix/hints/macosx b/outdated/sys/unix/hints/macosx similarity index 100% rename from sys/unix/hints/macosx rename to outdated/sys/unix/hints/macosx diff --git a/sys/unix/hints/macosx10.10 b/outdated/sys/unix/hints/macosx10.10 similarity index 100% rename from sys/unix/hints/macosx10.10 rename to outdated/sys/unix/hints/macosx10.10 diff --git a/sys/unix/hints/macosx10.10-qt b/outdated/sys/unix/hints/macosx10.10-qt similarity index 100% rename from sys/unix/hints/macosx10.10-qt rename to outdated/sys/unix/hints/macosx10.10-qt diff --git a/sys/unix/hints/macosx10.14 b/outdated/sys/unix/hints/macosx10.14 similarity index 100% rename from sys/unix/hints/macosx10.14 rename to outdated/sys/unix/hints/macosx10.14 diff --git a/sys/unix/hints/macosx10.5 b/outdated/sys/unix/hints/macosx10.5 similarity index 100% rename from sys/unix/hints/macosx10.5 rename to outdated/sys/unix/hints/macosx10.5 diff --git a/sys/unix/hints/macosx10.7 b/outdated/sys/unix/hints/macosx10.7 similarity index 100% rename from sys/unix/hints/macosx10.7 rename to outdated/sys/unix/hints/macosx10.7 diff --git a/sys/unix/hints/macosx10.8 b/outdated/sys/unix/hints/macosx10.8 similarity index 100% rename from sys/unix/hints/macosx10.8 rename to outdated/sys/unix/hints/macosx10.8 diff --git a/sys/libnh/README.md b/sys/libnh/README.md index 8258323b7..062f1e605 100644 --- a/sys/libnh/README.md +++ b/sys/libnh/README.md @@ -12,14 +12,14 @@ Generally the build is the same as the unix build: [Edit Oct 4, 2020: Use the existing Makefile and hints, hints/include system for cross-compiles] 1. `cd sys/unix` -2. `./setup.sh hints/macOS.2020` +2. `./setup.sh hints/macOS.370` 3. `cd ../..` 4. For `libnethack.a`: `make WANT_LIBNH=1 all` 5. For `nethack.js`: `make CROSS_TO_WASM=1 all` [Original text was:] 1. `cd sys/lib` -2. For `libnethack.a`: `./setup.sh hints/macOS.2020`; for `nethack.js`: `./setup.sh hints/wasm` +2. For `libnethack.a`: `./setup.sh hints/macOS.370`; for `nethack.js`: `./setup.sh hints/wasm` 3. `cd ../..` 4. `make` diff --git a/sys/libnh/test/run.sh b/sys/libnh/test/run.sh index e930684c4..2c415d095 100755 --- a/sys/libnh/test/run.sh +++ b/sys/libnh/test/run.sh @@ -6,7 +6,7 @@ if [ x$1 == "xlib" ]; then make spotless fi cd sys/unix - ./setup.sh hints/macOS.2020 + ./setup.sh hints/macOS.370 cd ../.. make WANT_LIBNH=1 fi @@ -25,7 +25,7 @@ if [ x$1 == "xwasm" ]; then make spotless fi cd sys/unix - ./setup.sh hints/macOS.2020 + ./setup.sh hints/macOS.370 cd ../.. make CROSS_TO_WASM=1 fi @@ -38,7 +38,7 @@ if [ x$1 == "xbin" ]; then echo Doing bin... make spotless cd sys/unix - ./setup.sh hints/macOS.2020 + ./setup.sh hints/macOS.370 cd ../.. make fi diff --git a/sys/msdos/Install.dos b/sys/msdos/Install.dos index a706d46e8..2504324c7 100644 --- a/sys/msdos/Install.dos +++ b/sys/msdos/Install.dos @@ -51,7 +51,7 @@ II. There once was a time when people built NetHack right on their DOS machine. sh sys/msdos/fetch-cross-compiler.sh That script won't install anything, it just does file fetches and stores - them in subfolders of lib. The linux.2020 and macOS.2020 hints files are + them in subfolders of lib. The linux.370 and macOS.370 hints files are configured to find the cross-compiler there if you add CROSS_TO_MSDOS=1 on your make command line. @@ -62,12 +62,12 @@ II. There once was a time when people built NetHack right on their DOS machine. On your linux host: - cd sys/unix ; sh setup.sh hints/linux.2020 ; cd ../.. + cd sys/unix ; sh setup.sh hints/linux.370 ; cd ../.. make fetch-lua On your macOS host: - cd sys/unix ; sh setup.sh hints/macOS.2020 ; cd ../.. + cd sys/unix ; sh setup.sh hints/macOS.370 ; cd ../.. make fetch-lua The MSDOS cross-compile can then be carried out by specifying diff --git a/sys/msdos/fetch-cross-compiler.sh b/sys/msdos/fetch-cross-compiler.sh index 5676d5c40..97791c1e6 100644 --- a/sys/msdos/fetch-cross-compiler.sh +++ b/sys/msdos/fetch-cross-compiler.sh @@ -27,13 +27,13 @@ if [ "$(uname)" = "Darwin" ]; then #Mac DJGPP_FILE="djgpp-osx-$GCCVER.tar.bz2" if [ -z "HINTS" ]; then - export HINTS=macOS.2020 + export HINTS=macOS.370 fi elif [ "$(expr substr $(uname -s) 1 5)" = "Linux" ]; then #Linux DJGPP_FILE="djgpp-linux64-$GCCVER.tar.bz2" if [ -z "$HINTS" ]; then - export HINTS=linux.2020 + export HINTS=linux.370 fi elif [ "$(expr substr $(uname -s) 1 10)" = "MINGW32_NT" ]; then #mingw diff --git a/sys/unix/hints/include/compiler.2020 b/sys/unix/hints/include/compiler.370 similarity index 96% rename from sys/unix/hints/include/compiler.2020 rename to sys/unix/hints/include/compiler.370 index 1cca25530..d1fc1a3e4 100755 --- a/sys/unix/hints/include/compiler.2020 +++ b/sys/unix/hints/include/compiler.370 @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -# NetHack 3.7 compiler.2020 $NHDT-Date: 1637992237 2021/11/27 05:50:37 $ $NHDT-Branch: NetHack-3.7 $ +# NetHack 3.7 compiler.370 $NHDT-Date: 1637992237 2021/11/27 05:50:37 $ $NHDT-Branch: NetHack-3.7 $ # compiler flags: CCFLAGS is used to construct a value for CFLAGS with # various -I, -D, and -W settings appended below; @@ -106,5 +106,5 @@ endif # clang-specific ends here CFLAGS+=-DGCC_WARN CCXXFLAGS+=-DGCC_WARN -#end of compiler.2020 +#end of compiler.370 #------------------------------------------------------------------------------ diff --git a/sys/unix/hints/include/cross-post.2020 b/sys/unix/hints/include/cross-post.370 similarity index 100% rename from sys/unix/hints/include/cross-post.2020 rename to sys/unix/hints/include/cross-post.370 diff --git a/sys/unix/hints/include/cross-pre.2020 b/sys/unix/hints/include/cross-pre.370 similarity index 99% rename from sys/unix/hints/include/cross-pre.2020 rename to sys/unix/hints/include/cross-pre.370 index 8d8dbfff6..14a870c76 100644 --- a/sys/unix/hints/include/cross-pre.2020 +++ b/sys/unix/hints/include/cross-pre.370 @@ -260,7 +260,7 @@ WASM_CFLAGS += -Wshadow # WASM_CFLAGS += -Wwrite-strings # WASM_CFLAGS += -Werror # Nethack C flags -WASM_CFLAGS += $(WINCFLAGS) #WINCFLAGS set from multiw-2.2020 +WASM_CFLAGS += $(WINCFLAGS) #WINCFLAGS set from multiw-2.370 WASM_CFLAGS += -DSYSCF -DSYSCF_FILE=\"/sysconf\" -DSECURE WASM_CFLAGS += -g -I../include -DNOTPARMDECL WASM_CFLAGS += -DGCC_WARN diff --git a/sys/unix/hints/include/multiw-1.2020 b/sys/unix/hints/include/multiw-1.370 similarity index 86% rename from sys/unix/hints/include/multiw-1.2020 rename to sys/unix/hints/include/multiw-1.370 index a7d934e4a..cd7651730 100644 --- a/sys/unix/hints/include/multiw-1.2020 +++ b/sys/unix/hints/include/multiw-1.370 @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# NetHack 3.7 multiw-1.2020 $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-3.7 $ +# NetHack 3.7 multiw-1.370 $NHDT-Date: 1597332785 2020/08/13 15:33:05 $ $NHDT-Branch: NetHack-3.7 $ # 1. Which windowing interface(s) should be included in this binary? # One or more of these can be manually uncommented and/or can be specified @@ -19,5 +19,5 @@ #WANT_DEFAULT=Qt #WANT_DEFAULT=X11 -#end of multiw-1.2020 +#end of multiw-1.370 #------------------------------------------------------------------------------ diff --git a/sys/unix/hints/include/multiw-2.2020 b/sys/unix/hints/include/multiw-2.370 similarity index 92% rename from sys/unix/hints/include/multiw-2.2020 rename to sys/unix/hints/include/multiw-2.370 index 7c956acb5..d708290bb 100644 --- a/sys/unix/hints/include/multiw-2.2020 +++ b/sys/unix/hints/include/multiw-2.370 @@ -1,11 +1,11 @@ #------------------------------------------------------------------------------ -# NetHack 3.7 multiw-2.2020 $NHDT-Date: 1599337709 2020/09/05 20:28:29 $ $NHDT-Branch: NetHack-3.7 $ +# NetHack 3.7 multiw-2.370 $NHDT-Date: 1599337709 2020/09/05 20:28:29 $ $NHDT-Branch: NetHack-3.7 $ # # Sorts out support for multiple window ports (interfaces) to included in the build. # # Included from: -# hints/linux.2020 -# hints/macOS.2020 +# hints/linux.370 +# hints/macOS.370 # # The following will be set appropriately following this: # - WANT_WIN_XXX (at least one will be set; default is TTY) @@ -104,6 +104,6 @@ WINSRC += $(WINQTSRC) WINOBJ0 += $(WINQTOBJ) endif -#end of hints/include/multiw-2.2020 +#end of hints/include/multiw-2.370 #------------------------------------------------------------------------------ diff --git a/sys/unix/hints/linux.2020 b/sys/unix/hints/linux.370 similarity index 92% rename from sys/unix/hints/linux.2020 rename to sys/unix/hints/linux.370 index 8be9a7e17..07d8e319a 100755 --- a/sys/unix/hints/linux.2020 +++ b/sys/unix/hints/linux.370 @@ -1,4 +1,4 @@ -# NetHack 3.7 linux.2020 $NHDT-Date: 1599687610 2020/09/09 21:40:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.11 $ +# NetHack 3.7 linux.370 $NHDT-Date: 1599687610 2020/09/09 21:40:10 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.11 $ # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007. # NetHack may be freely redistributed. See license for details. # @@ -13,12 +13,12 @@ # #-PRE -# linux.2020 hints file provides a single-user build for Linux (such +# linux.370 hints file provides a single-user build for Linux (such # as Ubuntu focal). # note: '#-INCLUDE' is not just a comment -# multiw-1.2020 contains sections 1 to 2 -#-INCLUDE multiw-1.2020 +# multiw-1.370 contains sections 1 to 2 +#-INCLUDE multiw-1.370 # 3. If you set WANT_WIN_QT, you need to # A) set QTDIR either here or in the environment to point to the Qt5 @@ -67,12 +67,12 @@ GAMEGRP = games # you're reading this in Makefile augmented by hints, that may not be true). # -#-INCLUDE multiw-2.2020 +#-INCLUDE multiw-2.370 -# compiler.2020 contains compiler detection and adjustments common +# compiler.370 contains compiler detection and adjustments common # to both linux and macOS -#-INCLUDE compiler.2020 +#-INCLUDE compiler.370 # NetHack sources control NHCFLAGS+=-DDLB @@ -92,10 +92,10 @@ NHCFLAGS+=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\" #NHCFLAGS+=-DTTY_TILES_ESCCODES #NHCFLAGS+=-DTTY_SOUND_ESCCODES -CFLAGS+= $(WINCFLAGS) #WINCFLAGS set from multiw-2.2020 +CFLAGS+= $(WINCFLAGS) #WINCFLAGS set from multiw-2.370 CFLAGS+= $(NHCFLAGS) -CCXXFLAGS+= $(WINCFLAGS) #WINCFLAGS set from multiw-2.2020 +CCXXFLAGS+= $(WINCFLAGS) #WINCFLAGS set from multiw-2.370 CCXXFLAGS+= $(NHCFLAGS) VARDATND = @@ -226,11 +226,11 @@ VARDIRPERM = 0755 VARFILEPERM = 0600 GAMEPERM = 0755 # -#-INCLUDE cross-pre.2020 +#-INCLUDE cross-pre.370 # #-POST # -#-INCLUDE cross-post.2020 +#-INCLUDE cross-post.370 # ifdef WANT_LIBNH $(TARGETPFX)libnh.a: $(HOBJ) $(LIBNHSYSOBJ) ../lib/lua/liblua.a diff --git a/sys/unix/hints/macOS.2020 b/sys/unix/hints/macOS.370 similarity index 97% rename from sys/unix/hints/macOS.2020 rename to sys/unix/hints/macOS.370 index 713677ddd..8a8ac4b00 100755 --- a/sys/unix/hints/macOS.2020 +++ b/sys/unix/hints/macOS.370 @@ -1,4 +1,4 @@ -# NetHack 3.7 macOS.2020 $NHDT-Date: 1633401749 2021/10/05 02:42:29 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.88 $ +# NetHack 3.7 macOS.370 $NHDT-Date: 1633401749 2021/10/05 02:42:29 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.88 $ # Copyright (c) Kenneth Lorber, Kensington, Maryland, 2015. # NetHack may be freely redistributed. See license for details. # @@ -17,7 +17,7 @@ # # note: '#-INCLUDE' is not just a comment; multiw-1 contains sections 1 to 2 -#-INCLUDE multiw-1.2020 +#-INCLUDE multiw-1.370 # 3. If you set WANT_WIN_QT, you need to # A) set QTDIR either here or in the environment to point to the Qt5 @@ -68,12 +68,12 @@ endif # you're reading this in Makefile augmented by hints, that may not be true). # -#-INCLUDE multiw-2.2020 +#-INCLUDE multiw-2.370 -# compiler.2020 contains compiler detection and adjustments common +# compiler.370 contains compiler detection and adjustments common # to both linux and macOS -#-INCLUDE compiler.2020 +#-INCLUDE compiler.370 # NetHack sources control NHCFLAGS+=-DDLB @@ -93,10 +93,10 @@ NHCFLAGS+=-DNOMAIL #NHCFLAGS+=-DTTY_TILES_ESCCODES #NHCFLAGS+=-DTTY_SOUND_ESCCODES -CFLAGS+= $(WINCFLAGS) #WINCFLAGS set from multiw-2.2020 +CFLAGS+= $(WINCFLAGS) #WINCFLAGS set from multiw-2.370 CFLAGS+= $(NHCFLAGS) -CCXXFLAGS+= $(WINCFLAGS) #WINCFLAGS set from multiw-2.2020 +CCXXFLAGS+= $(WINCFLAGS) #WINCFLAGS set from multiw-2.370 CCXXFLAGS+= $(NHCFLAGS) VARDATND = @@ -300,7 +300,7 @@ VARDIR=$(HACKDIR) # Install.Qt mentions a patch for macos - it's not there (it seems to be in the Qt binary # package under the docs directory). # -#-INCLUDE cross-pre.2020 +#-INCLUDE cross-pre.370 # #-POST @@ -495,5 +495,5 @@ endif # end of build_qt_pkg endif # WANT_WIN_QT for packaging endif # MAKEFILE_TOP # -#-INCLUDE cross-post.2020 +#-INCLUDE cross-post.370 #