[patch] New version of the filename-friendliness patch

filename-friendliness-20081225.patch (text/plain), 7.00 KB, created by Ryan Hendrickson on 2008-12-30 06:49:46 UTC

diff -rU2 gargoyle-orig/garglk/launcher.sh gargoyle/garglk/launcher.sh
--- gargoyle-orig/garglk/launcher.sh	2007-01-09 12:55:49.000000000 -0800
+++ gargoyle/garglk/launcher.sh	2007-01-09 12:57:07.000000000 -0800
@@ -50,29 +50,29 @@
 
 case "$lowpath" in
-    *.taf ) $dirpath/scare "$1" ;;
-    *.dat ) $dirpath/advsys "$1" ;;
-    *.agx ) $dirpath/agility "$1" ;;
-    *.d\$\$ ) $dirpath/agility "$1" ;;
-    *.acd ) $dirpath/alan2 "$1" ;;
-    *.a3c ) $dirpath/alan3 "$1" ;;
-    *.asl ) $dirpath/geas "$1" ;;
-    *.cas ) $dirpath/geas "$1" ;;
-    *.ulx ) $dirpath/git "$1" ;;
-    *.hex ) $dirpath/hugo "$1" ;;
-    *.jacl ) $dirpath/jacl "$1" ;;
-    *.j2  ) $dirpath/jacl "$1" ;;
-    *.l9  ) $dirpath/level9 "$1" ;;
-    *.sna ) $dirpath/level9 "$1" ;;
-    *.mag ) $dirpath/magnetic "$1" ;;
-    *.gam ) $dirpath/tadsr "$1" ;;
-    *.t3  ) $dirpath/tadsr "$1" ;;
-    *.z?  ) $dirpath/frotz "$1" ;;
+    *.taf ) $dirpath/gargoyle-scare "$1" ;;
+    *.dat ) $dirpath/gargoyle-advsys "$1" ;;
+    *.agx ) $dirpath/gargoyle-agility "$1" ;;
+    *.d\$\$ ) $dirpath/gargoyle-agility "$1" ;;
+    *.acd ) $dirpath/gargoyle-alan2 "$1" ;;
+    *.a3c ) $dirpath/gargoyle-alan3 "$1" ;;
+    *.asl ) $dirpath/gargoyle-geas "$1" ;;
+    *.cas ) $dirpath/gargoyle-geas "$1" ;;
+    *.ulx ) $dirpath/gargoyle-git "$1" ;;
+    *.hex ) $dirpath/gargoyle-hugo "$1" ;;
+    *.jacl ) $dirpath/gargoyle-jacl "$1" ;;
+    *.j2  ) $dirpath/gargoyle-jacl "$1" ;;
+    *.l9  ) $dirpath/gargoyle-level9 "$1" ;;
+    *.sna ) $dirpath/gargoyle-level9 "$1" ;;
+    *.mag ) $dirpath/gargoyle-magnetic "$1" ;;
+    *.gam ) $dirpath/gargoyle-tadsr "$1" ;;
+    *.t3  ) $dirpath/gargoyle-tadsr "$1" ;;
+    *.z?  ) $dirpath/gargoyle-frotz "$1" ;;
 
-    *.blb    ) $dirpath/git "$1" ;;
-    *.blorb  ) $dirpath/git "$1" ;;
-    *.glb    ) $dirpath/git "$1" ;;
-    *.gblorb ) $dirpath/git "$1" ;;
-    *.zlb    ) $dirpath/frotz "$1" ;;
-    *.zblorb ) $dirpath/frotz "$1" ;;
+    *.blb    ) $dirpath/gargoyle-git "$1" ;;
+    *.blorb  ) $dirpath/gargoyle-git "$1" ;;
+    *.glb    ) $dirpath/gargoyle-git "$1" ;;
+    *.gblorb ) $dirpath/gargoyle-git "$1" ;;
+    *.zlb    ) $dirpath/gargoyle-frotz "$1" ;;
+    *.zblorb ) $dirpath/gargoyle-frotz "$1" ;;
 
     * ) echo "gargoyle: Unknown file type: $1" ;;
diff -rU2 gargoyle-orig/tads/Jamfile gargoyle/tads/Jamfile
--- gargoyle-orig/tads/Jamfile	2007-01-09 12:55:51.000000000 -0800
+++ gargoyle/tads/Jamfile	2007-01-09 12:57:57.000000000 -0800
@@ -60,5 +60,5 @@
 SEARCH_SOURCE = $(SUBDIR) ;
 
-Main tadsr :
+Main gargoyle-tadsr :
 	t23run.cpp
 	osansi1.c osansi2.c osansi3.c
@@ -73,8 +73,8 @@
 	;
 
-LinkLibraries tadsr : libtads2 libtads3 ;
+LinkLibraries gargoyle-tadsr : libtads2 libtads3 ;
 
-LINK on tadsr$(SUFEXE) = $(C++) ;
+LINK on gargoyle-tadsr$(SUFEXE) = $(C++) ;
 
-APPS += tadsr ;
+APPS += gargoyle-tadsr ;
 
diff -rU2 gargoyle-orig/terps/Jamfile gargoyle/terps/Jamfile
--- gargoyle-orig/terps/Jamfile	2007-01-09 12:55:56.000000000 -0800
+++ gargoyle/terps/Jamfile	2007-01-09 13:00:02.000000000 -0800
@@ -34,9 +34,9 @@
     SubDirCcFlags -w ;
 
-    Main advsys :
+    Main gargoyle-advsys :
         advmsg.c advtrm.c advprs.c advdbs.c advint.c advjunk.c advexe.c
         glkstart.c ;
 
-    APPS += advsys ;
+    APPS += gargoyle-advsys ;
 }
 
@@ -60,5 +60,5 @@
     SubDirCcFlags -DGLK_ANSI_ONLY ;
 
-    Main agility :
+    Main gargoyle-agility :
         agtread.c gamedata.c util.c agxfile.c auxfile.c filename.c
         parser.c exec.c runverb.c metacommand.c savegame.c debugcmd.c
@@ -67,5 +67,5 @@
         ;
 
-    APPS += agility ;
+    APPS += gargoyle-agility ;
 }
 
@@ -85,5 +85,5 @@
     SubDirCcFlags -funsigned-char -Wno-parentheses -DGLK -DREVERSED ;
 
-    Main alan2 :
+    Main gargoyle-alan2 :
         arun.c main.c debug.c args.c exe.c inter.c parse.c rules.c stack.c
         decode.c term.c reverse.c readline.c params.c sysdep.c
@@ -91,5 +91,5 @@
         ;
 
-    APPS += alan2 ;
+    APPS += gargoyle-alan2 ;
 }
 
@@ -108,5 +108,5 @@
     SubDirCcFlags -funsigned-char -DGLK ;
 
-    Main alan3 :
+    Main gargoyle-alan3 :
         arun.c main.c debug.c args.c exe.c inter.c parse.c rules.c stack.c
         decode.c term.c reverse.c readline.c params.c sysdep.c
@@ -115,5 +115,5 @@
         ;
 
-    APPS += alan3 ;
+    APPS += gargoyle-alan3 ;
 }
 
@@ -128,5 +128,5 @@
     ObjDir frotz ;
 
-    Main frotz :
+    Main gargoyle-frotz :
         buffer.c err.c fastmem.c files.c
         input.c main.c math.c object.c process.c quetzal.c random.c
@@ -135,5 +135,5 @@
         ;
 
-    APPS += frotz ;
+    APPS += gargoyle-frotz ;
 }
 
@@ -151,5 +151,5 @@
     SubDirC++Flags = $(SUBDIRCCFLAGS) ;
 
-    Main geas :
+    Main gargoyle-geas :
         geasfile.cc geas-runner.cc geas-state.cc
         geas-util.cc geasglk.cc geasglkterm.c
@@ -159,5 +159,5 @@
     LINK on geas$(SUFEXE) = $(C++) ;
 
-    APPS += geas ;
+    APPS += gargoyle-geas ;
 }
 
@@ -176,5 +176,5 @@
     SubDirCcFlags -DUSE_INLINE ;
 
-    Main git :
+    Main gargoyle-git :
         git.c memory.c compiler.c opcodes.c operands.c
         peephole.c terp.c glkop.c search.c git_unix.c
@@ -182,5 +182,5 @@
         ;
 
-    APPS += git ;
+    APPS += gargoyle-git ;
 }
 
@@ -197,10 +197,10 @@
     if $(OS) != MINGW { SubDirCcFlags -DOS_UNIX ; }
 
-    Main glulxe :
+    Main gargoyle-glulxe :
         main.c files.c vm.c exec.c funcs.c operand.c string.c glkop.c
         heap.c serial.c search.c gestalt.c osdepend.c unixstrt.c
         ;
 
-    APPS += glulxe ;
+    APPS += gargoyle-glulxe ;
 }
 
@@ -232,10 +232,10 @@
         [ FDirName $(SUBDIR) heglk ] ;
 
-    Main hugo :
+    Main gargoyle-hugo :
         he.c heexpr.c hemisc.c heobject.c heparse.c heres.c herun.c heset.c 
         stringfn.c heglk.c heglkunix.c
         ;
 
-    APPS += hugo ;
+    APPS += gargoyle-hugo ;
 }
 
@@ -252,5 +252,5 @@
     SubDirCcFlags -DGARGLK ;
 
-    Main jacl :
+    Main gargoyle-jacl :
         jacl.c glk_startup.c findroute.c interpreter.c loader.c 
         glk_saver.c logging.c parser.c display.c utils.c jpp.c 
@@ -258,5 +258,5 @@
         ;
 
-    APPS += jacl ;
+    APPS += gargoyle-jacl ;
 }
 
@@ -284,7 +284,7 @@
         [ FDirName $(SUBDIR) Glk ] ;
 
-    Main level9 : level9.c glk.c ;
+    Main gargoyle-level9 : level9.c glk.c ;
 
-    APPS += level9 ;
+    APPS += gargoyle-level9 ;
 }
 
@@ -315,7 +315,7 @@
     # SubDirCcFlags -DNOBORDER ;
 
-    Main magnetic : emu.c glk.c ;
+    Main gargoyle-magnetic : emu.c glk.c ;
 
-    APPS += magnetic ;
+    APPS += gargoyle-magnetic ;
 }
 
@@ -362,8 +362,8 @@
         sound.c graphics.c blorb.c 
         ;
-    Main nitfol : main.c startunix.c ;
-    LinkLibraries nitfol : libnitfol ;
+    Main gargoyle-nitfol : main.c startunix.c ;
+    LinkLibraries gargoyle-nitfol : libnitfol ;
 
-    APPS += nitfol ;
+    APPS += gargoyle-nitfol ;
 }
 
@@ -383,5 +383,5 @@
     }
 
-    Main scare :
+    Main gargoyle-scare :
         sctafpar.c sctaffil.c scprops.c scvars.c scexpr.c scprintf.c
         scinterf.c scparser.c sclibrar.c scrunner.c scevents.c scnpcs.c
@@ -390,5 +390,5 @@
         ;
 
-    APPS += scare ;
+    APPS += gargoyle-scare ;
 }