From: Pasi Kallinen <paxed@alt.org>
Date: Sat, 23 Nov 2019 21:40:25 +0000 (+0200)
Subject: Minor msdos cross compile improvements
X-Git-Tag: NetHack-3.7.0_WIP~246
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3afbcb76f552cf68ddc0eb3f467f2f29d3887729;p=nethack

Minor msdos cross compile improvements
---

diff --git a/sys/msdos/msdos-cross-compile.sh b/sys/msdos/msdos-cross-compile.sh
index df298b2de..ec4bcae01 100644
--- a/sys/msdos/msdos-cross-compile.sh
+++ b/sys/msdos/msdos-cross-compile.sh
@@ -1,39 +1,54 @@
 #!/bin/sh
-if [ -z "$TRAVIS_BUIILD_DIR" ]; then
+
+if [ -z "$TRAVIS_BUILD_DIR" ]; then
 	export DJGPP_TOP=$(pwd)/djgpp
 else
 	export DJGPP_TOP="$TRAVIS_BUILD_DIR/djgpp"
 fi
-export
+
+DJGPP_URL="https://github.com/andrewwutw/build-djgpp/releases/download/v2.9/"
+if [ "$(uname)" = "Darwin" ]; then
+    #Mac
+    DJGPP_FILE="djgpp-osx-gcc550.tar.bz2"
+elif [ "$(expr substr $(uname -s) 1 5)" = "Linux" ]; then
+    #Linux
+    DJGPP_FILE="djgpp-linux64-gcc550.tar.bz2"
+elif [ "$(expr substr $(uname -s) 1 10)" = "MINGW32_NT" ]; then
+    #mingw
+    DJGPP_FILE="djgpp-mingw-gcc550-standalone.zip"
+else
+    echo "No DJGPP release for you, sorry."
+    exit 1
+fi
+
+DJGPP_URL="$DJGPP_URL$DJGPP_FILE"
+
+# export
+
 cd util
-if [ ! -d ../djgpp/i586-pc-msdosdjgpp ]; then
-    if [ "$(uname)" = "Darwin" ]; then
-	#Mac
-	wget --no-hsts https://github.com/andrewwutw/build-djgpp/releases/download/v2.9/djgpp-osx-gcc550.tar.bz2
-	cd ../
-	tar xjf util/djgpp-osx-gcc550.tar.bz2
-    elif [ "$(expr substr $(uname -s) 1 5)" = "Linux" ]; then
- 	#Linux
-	wget --no-hsts https://github.com/andrewwutw/build-djgpp/releases/download/v2.9/djgpp-linux64-gcc550.tar.bz2
-        cd ../
-	tar xjf util/djgpp-linux64-gcc550.tar.bz2
-    elif [ "$(expr substr $(uname -s) 1 10)" = "MINGW32_NT" ]; then	    
-	#mingw
-	wget --no-hsts https://github.com/andrewwutw/build-djgpp/releases/download/v2.9/djgpp-mingw-gcc550-standalone.zip
-	cd ../
-	tar xjf util/djgpp-mingw-gcc550-standalone.zip
-    fi
+if [ ! -f "$DJGPP_FILE" ]; then
+    wget --no-hsts "$DJGPP_URL"
 fi
-echo after tar
 cd ../
-pwd
+
+
+if [ ! -d ../djgpp/i586-pc-msdosdjgpp ]; then
+    tar xjf "util/$DJGPP_FILE"
+fi
+
+#echo after tar
+# cd ../
+
+#pwd
+
 #  PDCurses
 if [ ! -d "../pdcurses" ]; then
 	echo "Getting ../pdcurses from https://github.com/wmcbrine/PDCurses.git"
 	git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses
 fi
-cd djgpp
+
 # DOS-extender for use with djgpp
+cd djgpp
 if [ ! -d cwsdpmi ]; then
 	wget --no-hsts http://sandmann.dotster.com/cwsdpmi/csdpmi7b.zip
 	mkdir -p cwsdpmi
@@ -43,10 +58,13 @@ if [ ! -d cwsdpmi ]; then
 	rm csdpmi7b.zip
 fi
 cd ../
-echo after dos extender
-pwd
+
+
+#echo after dos extender
+
+
 cd src
-pwd
+
 mkdir -p ../msdos-binary
 cp ../dat/data.base ../dat/data.bas
 cp ../include/patchlevel.h ../include/patchlev.h
@@ -55,21 +73,26 @@ cp ../sys/share/posixregex.c ../sys/share/posixreg.c
 #cp ../sys/msdos/Makefile1.cross ../src/Makefile1
 #cp ../sys/msdos/Makefile2.cross ../src/Makefile2
 make -f ../sys/msdos/Makefile1.cross
-cat ../include/date.h
+#cat ../include/date.h
 export GCC_EXEC_PREFIX=$DJGPP_TOP/lib/gcc/
-export
-pwd
+# export
+
+#pwd
+
 make -f ../sys/msdos/Makefile2.cross
 unset GCC_EXEC_PREFIX
-pwd
-ls ../djgpp/cwsdpmi/bin 
-ls .
+#pwd
+
+#ls ../djgpp/cwsdpmi/bin 
+#ls .
+
 if [ -f ../djgpp/cwsdpmi/bin/CWSDPMI.EXE ]; then
     cp  ../djgpp/cwsdpmi/bin/CWSDPMI.EXE ../msdos-binary/CWSDPMI.EXE;
 fi
-ls -l ../msdos-binary
+
+# ls -l ../msdos-binary
 cd ../msdos-binary
 zip -9 ../NH370DOS.ZIP *
 cd ../
-ls -l NH370DOS.ZIP
+# ls -l NH370DOS.ZIP