From: nethack.allison Date: Tue, 22 Jan 2002 22:54:54 +0000 (+0000) Subject: Remove all uses of pushd/popd X-Git-Tag: MOVE2GIT~3388 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b91f47b4cdc615c210d0c0eae7c513f69a63aaf;p=nethack Remove all uses of pushd/popd in case someone wants to build on Windows98 where they don't exist. They are available in NT or Windows 2000 only (and possibly XP). --- diff --git a/win/win32/dgncomp.dsp b/win/win32/dgncomp.dsp index d9e796ad9..618265586 100644 --- a/win/win32/dgncomp.dsp +++ b/win/win32/dgncomp.dsp @@ -55,7 +55,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=dgncomp -PostBuild_Cmds=echo Building dungeon echo pushd ..\dat pushd ..\dat echo ..\util\dgn_comp.exe dungeon.pdf ..\util\dgn_comp.exe dungeon.pdf echo popd popd +PostBuild_Cmds=echo Building dungeon echo chdir ..\dat chdir ..\dat echo ..\util\dgn_comp.exe dungeon.pdf ..\util\dgn_comp.exe dungeon.pdf echo chdir ..\build chdir ..\build # End Special Build Tool !ELSEIF "$(CFG)" == "dgncomp - Win32 Debug" @@ -84,7 +84,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=dgncomp -PostBuild_Cmds=echo Building dungeon echo pushd ..\dat pushd ..\dat echo ..\util\dgn_comp.exe dungeon.pdf ..\util\dgn_comp.exe dungeon.pdf echo popd popd +PostBuild_Cmds=echo Building dungeon echo chdir ..\dat chdir ..\dat echo ..\util\dgn_comp.exe dungeon.pdf ..\util\dgn_comp.exe dungeon.pdf echo chdir ..\build chdir ..\build # End Special Build Tool !ENDIF diff --git a/win/win32/dgnstuff.mak b/win/win32/dgnstuff.mak index 0fd359a3e..8e5aa81fa 100644 --- a/win/win32/dgnstuff.mak +++ b/win/win32/dgnstuff.mak @@ -43,7 +43,7 @@ clean: copy $(YTABH) ..\include\dgn_comp.h @del $(YTABC) @del $(YTABH) - chdir ..\src + chdir ..\build !ENDIF ..\util\dgn_lex.c: ..\util\dgn_comp.l @@ -55,5 +55,5 @@ clean: $(LEX) dgn_comp.l copy $(LEXYYC) $@ @del $(LEXYYC) - chdir ..\src + chdir ..\build !ENDIF diff --git a/win/win32/dlb_main.dsp b/win/win32/dlb_main.dsp index 1b3266353..b3aa37218 100644 --- a/win/win32/dlb_main.dsp +++ b/win/win32/dlb_main.dsp @@ -55,7 +55,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Packaging via DLB -PostBuild_Cmds=echo pushd ..\dat pushd ..\dat chdir echo data >dlb.lst echo oracles >>dlb.lst echo options >>dlb.lst echo quest.dat >>dlb.lst echo rumors >>dlb.lst echo help >>dlb.lst echo hh >>dlb.lst echo cmdhelp >>dlb.lst echo history >>dlb.lst echo opthelp >>dlb.lst echo wizhelp >>dlb.lst echo dungeon >>dlb.lst echo license >>dlb.lst for %%N in (*.lev) do echo %%N >>dlb.lst ..\util\dlb_main.exe cIf dlb.lst nhdat echo popd popd echo if NOT exist ..\binary\*.* mkdir ..\binary if NOT exist ..\binary\*.* mkdir ..\binary +PostBuild_Cmds=echo chdir ..\dat chdir ..\dat chdir echo data >dlb.lst echo oracles >>dlb.lst echo options >>dlb.lst echo quest.dat >>dlb.lst echo rumors >>dlb.lst echo help >>dlb.lst echo hh >>dlb.lst echo cmdhelp >>dlb.lst echo history >>dlb.lst echo opthelp >>dlb.lst echo wizhelp >>dlb.lst echo dungeon >>dlb.lst echo license >>dlb.lst for %%N in (*.lev) do echo %%N >>dlb.lst ..\util\dlb_main.exe cIf dlb.lst nhdat echo chdir ..\build chdir ..\build echo if NOT exist ..\binary\*.* mkdir ..\binary if NOT exist ..\binary\*.* mkdir ..\binary # End Special Build Tool !ELSEIF "$(CFG)" == "dlb_main - Win32 Debug" @@ -84,7 +84,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Packaging via dlb -PostBuild_Cmds=echo pushd ..\dat pushd ..\dat chdir echo data >dlb.lst echo oracles >>dlb.lst echo options >>dlb.lst echo quest.dat >>dlb.lst echo rumors >>dlb.lst echo help >>dlb.lst echo hh >>dlb.lst echo cmdhelp >>dlb.lst echo history >>dlb.lst echo opthelp >>dlb.lst echo wizhelp >>dlb.lst echo dungeon >>dlb.lst echo license >>dlb.lst for %%N in (*.lev) do echo %%N >>dlb.lst ..\util\dlb_main.exe cIf dlb.lst nhdat echo popd popd echo if NOT exist ..\binary\*.* mkdir ..\binary if NOT exist ..\binary\*.* mkdir ..\binary +PostBuild_Cmds=echo chdir ..\dat chdir ..\dat chdir echo data >dlb.lst echo oracles >>dlb.lst echo options >>dlb.lst echo quest.dat >>dlb.lst echo rumors >>dlb.lst echo help >>dlb.lst echo hh >>dlb.lst echo cmdhelp >>dlb.lst echo history >>dlb.lst echo opthelp >>dlb.lst echo wizhelp >>dlb.lst echo dungeon >>dlb.lst echo license >>dlb.lst for %%N in (*.lev) do echo %%N >>dlb.lst ..\util\dlb_main.exe cIf dlb.lst nhdat echo chdir ..\build chdir ..\build echo if NOT exist ..\binary\*.* mkdir ..\binary if NOT exist ..\binary\*.* mkdir ..\binary # End Special Build Tool !ENDIF diff --git a/win/win32/levcomp.dsp b/win/win32/levcomp.dsp index 7b7d234bd..e70e592c9 100644 --- a/win/win32/levcomp.dsp +++ b/win/win32/levcomp.dsp @@ -54,8 +54,8 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=levcomp -PostBuild_Cmds=echo Building special levels echo pushd ..\dat pushd ..\dat echo arch.des ..\util\levcomp.exe arch.des echo barb.des ..\util\levcomp.exe barb.des echo bigroom.des ..\util\levcomp.exe bigroom.des echo castle.des ..\util\levcomp.exe castle.des echo caveman.des ..\util\levcomp.exe caveman.des echo endgame.des ..\util\levcomp.exe endgame.des echo gehennom.des ..\util\levcomp.exe gehennom.des echo healer.des ..\util\levcomp.exe healer.des echo knight.des ..\util\levcomp.exe knight.des echo knox.des ..\util\levcomp.exe knox.des echo medusa.des ..\util\levcomp.exe medusa.des echo mines.des ..\util\levcomp.exe mines.des echo monk.des ..\util\levcomp.exe monk.des echo oracle.des ..\util\levcomp.exe oracle.des echo priest.des ..\util\levcomp.exe priest.des echo ranger.des ..\util\levcomp.exe ranger.des echo rogue.des ..\util\levcomp.exe rogue.des echo samurai.des ..\util\levcomp.exe samurai.des echo sokoban.des ..\util\levcomp.exe sokoban.des echo tourist.des ..\util\levcomp.exe tourist.des echo tower.des ..\util\levcomp.exe tower.des echo valkyrie.des ..\util\levcomp.exe valkyrie.des echo wizard .des ..\util\levcomp.exe wizard.des echo yendor.des\ - ..\util\levcomp.exe yendor.des echo popd popd +PostBuild_Cmds=echo Building special levels echo chdir ..\dat chdir ..\dat echo arch.des ..\util\levcomp.exe arch.des echo barb.des ..\util\levcomp.exe barb.des echo bigroom.des ..\util\levcomp.exe bigroom.des echo castle.des ..\util\levcomp.exe castle.des echo caveman.des ..\util\levcomp.exe caveman.des echo endgame.des ..\util\levcomp.exe endgame.des echo gehennom.des ..\util\levcomp.exe gehennom.des echo healer.des ..\util\levcomp.exe healer.des echo knight.des ..\util\levcomp.exe knight.des echo knox.des ..\util\levcomp.exe knox.des echo medusa.des ..\util\levcomp.exe medusa.des echo mines.des ..\util\levcomp.exe mines.des echo monk.des ..\util\levcomp.exe monk.des echo oracle.des ..\util\levcomp.exe oracle.des echo priest.des ..\util\levcomp.exe priest.des echo ranger.des ..\util\levcomp.exe ranger.des echo rogue.des ..\util\levcomp.exe rogue.des echo samurai.des ..\util\levcomp.exe samurai.des echo sokoban.des ..\util\levcomp.exe sokoban.des echo tourist.des ..\util\levcomp.exe tourist.des echo tower.des ..\util\levcomp.exe tower.des echo valkyrie.des ..\util\levcomp.exe valkyrie.des echo wizard .des ..\util\levcomp.exe wizard.des echo yendor.des\ + ..\util\levcomp.exe yendor.des echo chdir ..\build chdir ..\build # End Special Build Tool !ELSEIF "$(CFG)" == "levcomp - Win32 Debug" @@ -84,8 +84,8 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=levcomp -PostBuild_Cmds=echo Building special levels echo pushd ..\dat pushd ..\dat echo arch.des ..\util\levcomp.exe arch.des echo barb.des ..\util\levcomp.exe barb.des echo bigroom.des ..\util\levcomp.exe bigroom.des echo castle.des ..\util\levcomp.exe castle.des echo caveman.des ..\util\levcomp.exe caveman.des echo endgame.des ..\util\levcomp.exe endgame.des echo gehennom.des ..\util\levcomp.exe gehennom.des echo healer.des ..\util\levcomp.exe healer.des echo knight.des ..\util\levcomp.exe knight.des echo knox.des ..\util\levcomp.exe knox.des echo medusa.des ..\util\levcomp.exe medusa.des echo mines.des ..\util\levcomp.exe mines.des echo monk.des ..\util\levcomp.exe monk.des echo oracle.des ..\util\levcomp.exe oracle.des echo priest.des ..\util\levcomp.exe priest.des echo ranger.des ..\util\levcomp.exe ranger.des echo rogue.des ..\util\levcomp.exe rogue.des echo samurai.des ..\util\levcomp.exe samurai.des echo sokoban.des ..\util\levcomp.exe sokoban.des echo tourist.des ..\util\levcomp.exe tourist.des echo tower.des ..\util\levcomp.exe tower.des echo valkyrie.des ..\util\levcomp.exe valkyrie.des echo wizard .des ..\util\levcomp.exe wizard.des echo yendor.des\ - ..\util\levcomp.exe yendor.des echo popd popd +PostBuild_Cmds=echo Building special levels echo chdir ..\dat chdir ..\dat echo arch.des ..\util\levcomp.exe arch.des echo barb.des ..\util\levcomp.exe barb.des echo bigroom.des ..\util\levcomp.exe bigroom.des echo castle.des ..\util\levcomp.exe castle.des echo caveman.des ..\util\levcomp.exe caveman.des echo endgame.des ..\util\levcomp.exe endgame.des echo gehennom.des ..\util\levcomp.exe gehennom.des echo healer.des ..\util\levcomp.exe healer.des echo knight.des ..\util\levcomp.exe knight.des echo knox.des ..\util\levcomp.exe knox.des echo medusa.des ..\util\levcomp.exe medusa.des echo mines.des ..\util\levcomp.exe mines.des echo monk.des ..\util\levcomp.exe monk.des echo oracle.des ..\util\levcomp.exe oracle.des echo priest.des ..\util\levcomp.exe priest.des echo ranger.des ..\util\levcomp.exe ranger.des echo rogue.des ..\util\levcomp.exe rogue.des echo samurai.des ..\util\levcomp.exe samurai.des echo sokoban.des ..\util\levcomp.exe sokoban.des echo tourist.des ..\util\levcomp.exe tourist.des echo tower.des ..\util\levcomp.exe tower.des echo valkyrie.des ..\util\levcomp.exe valkyrie.des echo wizard .des ..\util\levcomp.exe wizard.des echo yendor.des\ + ..\util\levcomp.exe yendor.des echo chdir ..\build chdir ..\build # End Special Build Tool !ENDIF diff --git a/win/win32/levstuff.mak b/win/win32/levstuff.mak index 39808e660..c7540c4bd 100644 --- a/win/win32/levstuff.mak +++ b/win/win32/levstuff.mak @@ -36,13 +36,13 @@ clean: @copy ..\sys\share\lev_yacc.c ..\util\lev_yacc.c @copy ..\sys\share\lev_comp.h ..\include\lev_comp.h !ELSE - pushd ..\util + chdir ..\util $(YACC) -d lev_comp.y copy $(YTABC) $@ copy $(YTABH) ..\include\lev_comp.h @del $(YTABC) @del $(YTABH) - popd + chdir ..\build !ENDIF ..\util\lev_lex.c: ..\util\lev_comp.l @@ -50,10 +50,10 @@ clean: @echo Using pre-built lev_lex.c @copy ..\sys\share\lev_lex.c $@ !ELSE - pushd ..\util + chdir ..\util $(LEX) lev_comp.l copy $(LEXYYC) $@ @del $(LEXYYC) - popd + chdir ..\build !ENDIF diff --git a/win/win32/tilemap.dsp b/win/win32/tilemap.dsp index cc06cdf36..75bd7c24d 100644 --- a/win/win32/tilemap.dsp +++ b/win/win32/tilemap.dsp @@ -55,7 +55,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Generating src\tile.c -PostBuild_Cmds=chdir ..\src ..\util\tilemap.exe chdir ..\build +PostBuild_Cmds=echo chdir ..\src chdir ..\src ..\util\tilemap.exe echo chdir ..\build chdir ..\build # End Special Build Tool !ELSEIF "$(CFG)" == "tilemap - Win32 Debug" @@ -84,7 +84,7 @@ LINK32=link.exe # Begin Special Build Tool SOURCE="$(InputPath)" PostBuild_Desc=Generating src\tile.c -PostBuild_Cmds=echo pushd ..\src pushd ..\src ..\util\tilemap.exe popd echo popd +PostBuild_Cmds=echo chdir ..\src chdir ..\src ..\util\tilemap.exe echo chdir ..\build chdir ..\build # End Special Build Tool !ENDIF