move vms lua support bits (untested of course)

This commit is contained in:
nhmall
2019-11-07 18:34:51 -05:00
parent 5264589994
commit 40c8c6894b
2 changed files with 79 additions and 59 deletions
+38 -37
View File
@@ -18,35 +18,36 @@ WINSHR = [-.win.share]
WINX11 = [-.win.X11] WINX11 = [-.win.X11]
# utilities; must match Makefile.utl in spelling and punctuation # utilities; must match Makefile.utl in spelling and punctuation
MAKEDEFS = $(UTL)makedefs.exe; MAKEDEFS = $(UTL)makedefs.exe;
LEVCOMP = $(UTL)lev_comp.exe; #LEVCOMP = $(UTL)lev_comp.exe;
DGNCOMP = $(UTL)dgn_comp.exe; #DGNCOMP = $(UTL)dgn_comp.exe;
DLB = $(UTL)dlb.exe; DLB = $(UTL)dlb.exe;
TILE2X11 = $(UTL)tile2x11.exe; TILE2X11 = $(UTL)tile2x11.exe;
UTILMARKER = $(UTL)util.timestamp; UTILMARKER = $(UTL)util.timestamp;
# note: filespecs have enough punctuation to satisfy DELETE # note: filespecs have enough punctuation to satisfy DELETE
MARKERS = spec_levs.timestamp;,quest_levs.timestamp; #MARKERS = spec_levs.timestamp;,quest_levs.timestamp;
VARDAT = data.;,rumors.;,quest.dat;,oracles.;,options.;,\ VARDAT = data.;,rumors.;,quest.dat;,oracles.;,options.;,\
engrave.;,epitaph.;,bogusmon.; engrave.;,epitaph.;,bogusmon.;
DUNGEON = dungeon.; #DUNGEON = dungeon.;
X11TILES= x11tiles.; X11TILES= x11tiles.;
# note: the level lists need to be space separated for use as-is by $(LEVCOMP) # note: the level lists need to be space separated for use as-is by $(LEVCOMP)
QUESTLEVS = Arch.des Barb.des Caveman.des Healer.des Knight.des \ #QUESTLEVS = Arch.des Barb.des Caveman.des Healer.des Knight.des \
Monk.des Priest.des Ranger.des Rogue.des Samurai.des Tourist.des \ # Monk.des Priest.des Ranger.des Rogue.des Samurai.des Tourist.des \
Valkyrie.des Wizard.des # Valkyrie.des Wizard.des
SPECLEVS = bigroom.des castle.des endgame.des gehennom.des knox.des \ #SPECLEVS = bigroom.des castle.des endgame.des gehennom.des knox.des \
medusa.des mines.des oracle.des sokoban.des tower.des yendor.des # medusa.des mines.des oracle.des sokoban.des tower.des yendor.des
all : $(VARDAT) $(DUNGEON) $(MARKERS) $(DLB) #all : $(VARDAT) $(DUNGEON) $(MARKERS) $(DLB)
all : $(VARDAT) $(DLB)
@ $(ECHO) "data files are up to date." @ $(ECHO) "data files are up to date."
# these are convenience targets for "manual" interactive use # these are convenience targets for "manual" interactive use
spec_levs : spev_levs.timestamp #spec_levs : spev_levs.timestamp
@ $(ECHO) "special levels are up to date." # @ $(ECHO) "special levels are up to date."
quest_levs : quest_levs.timestamp #quest_levs : quest_levs.timestamp
@ $(ECHO) "quest levels are up to date." # @ $(ECHO) "quest levels are up to date."
dungeon : $(DUNGEON) #dungeon : $(DUNGEON)
@ $(ECHO) "dungeon is up to date." # @ $(ECHO) "dungeon is up to date."
data : data.; data : data.;
@ $(NOOP) @ $(NOOP)
rumors : rumors.; rumors : rumors.;
@@ -71,15 +72,15 @@ $(MAKEDEFS) : $(UTILMARKER)
$(MAKE)$(MAKEFLAGS) $(MAKEDEFS) $(MAKE)$(MAKEFLAGS) $(MAKEDEFS)
@ $(CD) $(DAT) @ $(CD) $(DAT)
$(DGNCOMP) : $(UTILMARKER) #$(DGNCOMP) : $(UTILMARKER)
$(CD) $(UTL) # $(CD) $(UTL)
$(MAKE)$(MAKEFLAGS) $(DGNCOMP) # $(MAKE)$(MAKEFLAGS) $(DGNCOMP)
@ $(CD) $(DAT) # @ $(CD) $(DAT)
$(LEVCOMP) : $(UTILMARKER) #$(LEVCOMP) : $(UTILMARKER)
$(CD) $(UTL) # $(CD) $(UTL)
$(MAKE)$(MAKEFLAGS) $(LEVCOMP) # $(MAKE)$(MAKEFLAGS) $(LEVCOMP)
@ $(CD) $(DAT) # @ $(CD) $(DAT)
$(DLB) : $(UTILMARKER) $(DLB) : $(UTILMARKER)
$(CD) $(UTL) $(CD) $(UTL)
@@ -122,27 +123,27 @@ oracles.; : oracles.txt $(MAKEDEFS)
options.; : $(MAKEDEFS) options.; : $(MAKEDEFS)
$(RUN) $(MAKEDEFS) -v $(RUN) $(MAKEDEFS) -v
spec_levs.timestamp; : $(SPECLEVS) $(LEVCOMP) #spec_levs.timestamp; : $(SPECLEVS) $(LEVCOMP)
$(RUN) $(LEVCOMP) $(SPECLEVS) # $(RUN) $(LEVCOMP) $(SPECLEVS)
$(TOUCH) spec_levs.timestamp; # $(TOUCH) spec_levs.timestamp;
quest_levs.timestamp; : $(QUESTLEVS) $(LEVCOMP) #quest_levs.timestamp; : $(QUESTLEVS) $(LEVCOMP)
$(RUN) $(LEVCOMP) $(QUESTLEVS) # $(RUN) $(LEVCOMP) $(QUESTLEVS)
$(TOUCH) quest_levs.timestamp; # $(TOUCH) quest_levs.timestamp;
$(DUNGEON) : dungeon.def $(MAKEDEFS) $(DGNCOMP) #$(DUNGEON) : dungeon.def $(MAKEDEFS) $(DGNCOMP)
$(RUN) $(MAKEDEFS) -e !dungeon.def -> dungeon.pdf # $(RUN) $(MAKEDEFS) -e !dungeon.def -> dungeon.pdf
$(RUN) $(DGNCOMP) dungeon.pdf !dungeon.pdr -> dungeon # $(RUN) $(DGNCOMP) dungeon.pdf !dungeon.pdr -> dungeon
clean : clean :
- if f$search("*.*;-1").nes."" then purge - if f$search("*.*;-1").nes."" then purge
- if f$search("dungeon.pdf").nes."" then delete dungeon.pdf; # - if f$search("dungeon.pdf").nes."" then delete dungeon.pdf;
- if f$search("*.timestamp").nes."" then delete $(MARKERS) # - if f$search("*.timestamp").nes."" then delete $(MARKERS)
spotless : clean spotless : clean
- delete $(VARDAT) - delete $(VARDAT)
- if f$search("$(DUNGEON)").nes."" then delete $(DUNGEON) # - if f$search("$(DUNGEON)").nes."" then delete $(DUNGEON)
- if f$search("*.lev").nes."" then delete *.lev; # - if f$search("*.lev").nes."" then delete *.lev;
- if f$search("$(X11TILES)").nes."" then delete $(X11TILES) - if f$search("$(X11TILES)").nes."" then delete $(X11TILES)
- if f$search("*.x%m").nes."" then delete *.x%m; !*.xbm,*.xpm - if f$search("*.x%m").nes."" then delete *.x%m; !*.xbm,*.xpm
- if f$search("nh*.dlb").nes."" then delete nh*.dlb; - if f$search("nh*.dlb").nes."" then delete nh*.dlb;
+41 -22
View File
@@ -35,21 +35,40 @@ $ sysconf_file = "[.sys.vms]sysconf"
$ guidebook = "[.doc]Guidebook.txt" $ guidebook = "[.doc]Guidebook.txt"
$ invoc_proc = "[.sys.vms]nethack.com" $ invoc_proc = "[.sys.vms]nethack.com"
$ trmcp_file = "[.sys.share]termcap" $ trmcp_file = "[.sys.share]termcap"
$ spec_files = "AIR.LEV,ASMODEUS.LEV,ASTRAL.LEV,BAALZ.LEV,BIGRM-%.LEV," - $ spec_files = "air.lua,asmodeus.lua,astral.lua,baalz.lua," -
+ "CASTLE.LEV,EARTH.LEV,FAKEWIZ%.LEV,FIRE.LEV," - + "bigrm-1.lua,bigrm-2.lua,bigrm-3.lua,bigrm-4.lua," -
+ "JUIBLEX.LEV,KNOX.LEV,MEDUSA-%.LEV,MINEFILL.LEV," - + "bigrm-5.lua,bigrm-6.lua,bigrm-7.lua,bigrm-8.lua," -
+ "MINETN-%.LEV,MINEND-%.LEV,ORACLE.LEV,ORCUS.LEV," - + "bigrm-9.lua,bigrm-10.lua,castle.lua,earth.lua," -
+ "SANCTUM.LEV,SOKO%-%.LEV,TOWER%.LEV,VALLEY.LEV," - + "fakewiz1.lua,fakewiz2.lua,fire.lua,juiblex.lua," -
+ "WATER.LEV,WIZARD%.LEV" + "knox.lua,medusa-1.lua,medusa-2.lua,medusa-3.lua," -
$ spec_input = "bigroom.des castle.des endgame.des " - + "medusa-4.lua,minefill.lua,minend-1.lua," -
+ "gehennom.des knox.des medusa.des mines.des " - + "minend-2.lua,minend-3.lua,minetn-1.lua," -
+ "oracle.des sokoban.des tower.des yendor.des" + "minetn-2.lua,minetn-3.lua,minetn-4.lua," -
$ qstl_files = "%%%-GOAL.LEV,%%%-FIL%.LEV,%%%-LOCA.LEV,%%%-STRT.LEV" + "minetn-5.lua,minetn-6.lua,minetn-7.lua,nhlib.lua," -
$ qstl_input = "Arch.des Barb.des Caveman.des Healer.des " - + "oracle.lua,orcus.lua,sanctum.lua,soko1-1.lua," -
+ "Knight.des Monk.des Priest.des Ranger.des Rogue.des " - + "soko1-2.lua,soko2-1.lua,soko2-2.lua,soko3-1.lua," -
+ "Samurai.des Tourist.des Wizard.des Valkyrie.des" + "soko3-2.lua,soko4-1.lua,soko4-2.lua,tower1.lua," -
$ dngn_files = "DUNGEON." + "tower2.lua,tower3.lua,valley.lua,water.lua," -
$ dngn_input = "dungeon.pdf" + "wizard1.lua,wizard2.lua,wizard3.lua"
$ qstl_files = "%%%-goal.lua,%%%-fil%.lua,%%%-loca.lua,%%%-strt.lua"
$ dngn_files = "dungeon.lua"
$!
$! spec_files = "AIR.LEV,ASMODEUS.LEV,ASTRAL.LEV,BAALZ.LEV,BIGRM-%.LEV," -
$! + "CASTLE.LEV,EARTH.LEV,FAKEWIZ%.LEV,FIRE.LEV," -
$! + "JUIBLEX.LEV,KNOX.LEV,MEDUSA-%.LEV,MINEFILL.LEV," -
$! + "MINETN-%.LEV,MINEND-%.LEV,ORACLE.LEV,ORCUS.LEV," -
$! + "SANCTUM.LEV,SOKO%-%.LEV,TOWER%.LEV,VALLEY.LEV," -
$! + "WATER.LEV,WIZARD%.LEV"
$! spec_input = "bigroom.des castle.des endgame.des " -
$! + "gehennom.des knox.des medusa.des mines.des " -
$! + "oracle.des sokoban.des tower.des yendor.des"
$! qstl_files = "%%%-GOAL.LEV,%%%-FIL%.LEV,%%%-LOCA.LEV,%%%-STRT.LEV"
$! qstl_input = "Arch.des Barb.des Caveman.des Healer.des " -
$! + "Knight.des Monk.des Priest.des Ranger.des Rogue.des " -
$! + "Samurai.des Tourist.des Wizard.des Valkyrie.des"
$! dngn_files = "DUNGEON."
$! dngn_input = "dungeon.pdf"
$!
$ dlb_files = help_files + "," + data_files + "," - $ dlb_files = help_files + "," + data_files + "," -
+ spec_files + "," + qstl_files + "," + dngn_files + spec_files + "," + qstl_files + "," + dngn_files
$ data_libry = "nh-data.dlb" $ data_libry = "nh-data.dlb"
@@ -91,15 +110,15 @@ $ makedefs -h !oracles.txt -> oracles
$ milestone "(dungeon preprocess)" $ milestone "(dungeon preprocess)"
$ makedefs -s $ makedefs -s
$ milestone "(engrave, epitaph, bogusmon)" $ milestone "(engrave, epitaph, bogusmon)"
$ makedefs -e !dungeon.def -> dungeon.pdf $! makedefs -e !dungeon.def -> dungeon.pdf
$ milestone "(quest text)" $! milestone "(quest text)"
$ makedefs -q !quest.txt -> quest.dat $ makedefs -q !quest.txt -> quest.dat
$ milestone "(special levels)" $ milestone "(special levels)"
$ lev_comp 'spec_input' !special levels $! lev_comp 'spec_input' !special levels
$ milestone "(quest levels)" $! milestone "(quest levels)"
$ lev_comp 'qstl_input' !quest levels $! lev_comp 'qstl_input' !quest levels
$ milestone "(dungeon compile)" $! milestone "(dungeon compile)"
$ dgn_comp 'dngn_input' !dungeon database $! dgn_comp 'dngn_input' !dungeon database
$ set default [-] !move up $ set default [-] !move up
$ if p3.nes."" .and. f$edit(p3,"UPCASE").nes."DATA_PLUS_DLB" then exit $ if p3.nes."" .and. f$edit(p3,"UPCASE").nes."DATA_PLUS_DLB" then exit
$ $