From 33713ecbe742ae49a632b30ec268b12757bf9fdc Mon Sep 17 00:00:00 2001 From: 4am Date: Tue, 12 Nov 2019 11:38:08 -0500 Subject: [PATCH] minor Makefile and _FileInformation fixes --- Makefile | 7 ++--- bin/buildfileinfo.sh | 3 +- res/demo/_FileInformation.txt | 2 +- res/fx/_FileInformation.txt | 54 ----------------------------------- 4 files changed, 6 insertions(+), 60 deletions(-) diff --git a/Makefile b/Makefile index 8edf0eeb3..835d8a1ca 100644 --- a/Makefile +++ b/Makefile @@ -39,15 +39,14 @@ dsk: md asm bin/buildfileinfo.sh build/ARTWORK.SHR "C1" "2000" >>build/log bin/buildfileinfo.sh build/ATTRACT "04" "8000" >>build/log bin/buildfileinfo.sh build/SS "04" "4000" >>build/log + rsync -aP res/fx/* build/FX >>build/log + bin/buildfileinfo.sh build/FX "06" "6000" >>build/log for f in build/TITLE.* build/ACTION.* build/ARTWORK.* build/ATTRACT build/SS build/DEMO build/TITLE.ANIMATED; do $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/$$(basename $$f)" "$$f" >>build/log; done for i in 1 2 3 4 5 6; do $(CADIUS) RENAMEFILE build/"$(DISK)" "/$(VOLUME)/DEMO/SPCARTOON.$${i}$${i}" "SPCARTOON.$${i}." >>build/log; done - rsync -aP res/fx/* build/FX >>build/log $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/FX" "build/FX" >>build/log $(CADIUS) CREATEFOLDER build/"$(DISK)" "/$(VOLUME)/X/" >>build/log for f in res/dsk/*.po; do $(CADIUS) EXTRACTVOLUME "$${f}" build/X/ >> build/log; done - rm -f build/X/**/.DS_Store - rm -f build/X/**/PRODOS* - rm -f build/X/**/LOADER.SYSTEM* + rm -f build/X/**/.DS_Store build/X/**/PRODOS* build/X/**/LOADER.SYSTEM* $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/X" "build/X" >>build/log bin/buildfileinfo.sh build/PRELAUNCH "06" "0106" >>build/log $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/PRELAUNCH" "build/PRELAUNCH" >>build/log diff --git a/bin/buildfileinfo.sh b/bin/buildfileinfo.sh index 7b64cac56..9a49bead8 100755 --- a/bin/buildfileinfo.sh +++ b/bin/buildfileinfo.sh @@ -4,6 +4,7 @@ indir=$1 intype=$2 inaddress=$3 cd "$indir" +touch _FileInformation.txt (for f in *; do echo "$f=Type($intype),AuxType($inaddress),Access(C3)" -done) > _FileInformation.txt + done) >> _FileInformation.txt diff --git a/res/demo/_FileInformation.txt b/res/demo/_FileInformation.txt index 745b9c5c5..04a39efb6 100644 --- a/res/demo/_FileInformation.txt +++ b/res/demo/_FileInformation.txt @@ -34,7 +34,7 @@ CHAMP.LODERUN=Type(06),AuxType(0800),Access(C3) CHAMP.LODERUN.1=Type(F1),AuxType(0000),Access(C3) CHAMP.LODERUN.Z=Type(F1),AuxType(0000),Access(C3) CHOPLIFTER=Type(06),AuxType(0300),Access(C3) -CHOPLIFTER=Type(F1),AuxType(0000),Access(C3) +CHOPLIFTER.1=Type(F1),AuxType(0000),Access(C3) CIDER.SPIDER=Type(06),AuxType(0300),Access(C3) CIDER.SPIDER.0=Type(F1),AuxType(0000),Access(C3) CIDER.SPIDER.1=Type(F1),AuxType(0000),Access(C3) diff --git a/res/fx/_FileInformation.txt b/res/fx/_FileInformation.txt index 916f28357..2353b2d9c 100644 --- a/res/fx/_FileInformation.txt +++ b/res/fx/_FileInformation.txt @@ -1,56 +1,2 @@ -COVERFADE=Type(06),AuxType(6000),Access(C3) -DIAGONAL=Type(06),AuxType(6000),Access(C3) -FIZZLE=Type(06),AuxType(6000),Access(C3) -INTERLOCK.UD=Type(06),AuxType(6000),Access(C3) -INTERLOCK.LR=Type(06),AuxType(6000),Access(C3) -SPIRAL=Type(06),AuxType(6000),Access(C3) -FOURSPIRAL=Type(06),AuxType(6000),Access(C3) -BAR.DISSOLVE=Type(06),AuxType(6000),Access(C3) -BLOCK.FIZZLE=Type(06),AuxType(6000),Access(C3) -BLOCK.MOSAIC=Type(06),AuxType(6000),Access(C3) -TWOPASS.LR=Type(06),AuxType(6000),Access(C3) -CRYSTAL=Type(06),AuxType(6000),Access(C3) -FOURSQUARE=Type(06),AuxType(6000),Access(C3) -ONESQUARE=Type(06),AuxType(6000),Access(C3) -DIAMOND=Type(06),AuxType(6000),Access(C3) -CHECKERBOARD=Type(06),AuxType(6000),Access(C3) -HALF.FIZZLE=Type(06),AuxType(6000),Access(C3) -HALF.MOSAIC=Type(06),AuxType(6000),Access(C3) -STAGGER.UD=Type(06),AuxType(6000),Access(C3) -STAGGERWHITE.UD=Type(06),AuxType(6000),Access(C3) -STAGGER.LR=Type(06),AuxType(6000),Access(C3) -STAGGERWHITE.LR=Type(06),AuxType(6000),Access(C3) -CORNER.CIRCLE=Type(06),AuxType(6000),Access(C3) -SUNRISE=Type(06),AuxType(6000),Access(C3) -SUNSET=Type(06),AuxType(6000),Access(C3) -RADIAL=Type(06),AuxType(6000),Access(C3) -RADIAL2=Type(06),AuxType(6000),Access(C3) -RADIAL3=Type(06),AuxType(6000),Access(C3) -RADIAL4=Type(06),AuxType(6000),Access(C3) -RADIAL5=Type(06),AuxType(6000),Access(C3) -SPLIT.UD.INTRO=Type(06),AuxType(6000),Access(C3) -IRIS=Type(06),AuxType(6000),Access(C3) -STAR=Type(06),AuxType(6000),Access(C3) -STARWHITE=Type(06),AuxType(6000),Access(C3) -RIPPLE=Type(06),AuxType(6000),Access(C3) -RIPPLE2=Type(06),AuxType(6000),Access(C3) -DHGR.FIZZLE=Type(06),AuxType(6000),Access(C3) -DHGR.FIZZLEWH=Type(06),AuxType(6000),Access(C3) -DHGR.IRIS=Type(06),AuxType(6000),Access(C3) -DHGR.IRISWH=Type(06),AuxType(6000),Access(C3) -DHGR.RIPPLE=Type(06),AuxType(6000),Access(C3) -DHGR.RIPPLEWH=Type(06),AuxType(6000),Access(C3) -DHGR.RADIAL=Type(06),AuxType(6000),Access(C3) -DHGR.RADIALWH=Type(06),AuxType(6000),Access(C3) -DHGR.RADIAL2=Type(06),AuxType(6000),Access(C3) -DHGR.RADIAL2WH=Type(06),AuxType(6000),Access(C3) -DHGR.RADIAL3=Type(06),AuxType(6000),Access(C3) -DHGR.RADIAL3WH=Type(06),AuxType(6000),Access(C3) -DHGR.RADIAL4=Type(06),AuxType(6000),Access(C3) -DHGR.RADIAL4WH=Type(06),AuxType(6000),Access(C3) -DHGR.RADIAL5=Type(06),AuxType(6000),Access(C3) -DHGR.RADIAL5WH=Type(06),AuxType(6000),Access(C3) -DHGR.STAR=Type(06),AuxType(6000),Access(C3) -DHGR.STARWH=Type(06),AuxType(6000),Access(C3) SHR.FIZZLE=Type(06),AuxType(A000),Access(C3) GR.FIZZLE=Type(06),AuxType(6400),Access(C3)