Build process tweaks -- now only runs Rez over mac_res.r once.

[originally from svn r152]

diff --git a/Makefile.mpw b/Makefile.mpw
index d587612067a306937f6025a0d1c4a6d89ded90c9..2c11d468724c447c240cba2ff2be9874921ac05e 100644 (file)
--- a/Makefile.mpw
+++ b/Makefile.mpw
@@ -1,4 +1,4 @@
-# $Id: Makefile.mpw,v 1.1.2.8 1999/04/01 21:25:06 ben Exp $
+# $Id: Makefile.mpw,v 1.1.2.9 1999/04/02 10:21:48 ben Exp $
 # This is the Makefile for building PuTTY for the Mac OS.
 # Users of non-Mac systems will see some pretty strange characters around.
 
@@ -12,11 +12,6 @@ COptions     = {Includes} {Sym
 # disable "unused parameter" warnings
 PPCCOptions  = {Includes} {Sym¥PPC} -w 35
 
-# short names for targets
-68k Ä PuTTY
-ppc Ä PuTTY.ppc
-fat Ä PuTTY.fat
-
 Objects¥68K  = ¶
                mac.c.o ¶
                maccfg.c.o ¶
@@ -67,48 +62,52 @@ all 
 clean Ä
        delete -i {Objects¥68K} {Objects¥PPC} ¶
                PuTTY PuTTY.fat PuTTY.ppc PuTTY.NJ
+# short names for targets
+68k Ä PuTTY.68k
+ppc Ä PuTTY.ppc
+fat Ä PuTTY
+
 
-PuTTY.ppc ÄÄ {¥MondoBuild¥} {Objects¥PPC}
+PuTTY.rsrc Ä mac_res.r macresid.h
+       Rez mac_res.r -o {Targ} {Includes}
+
+PuTTY.ppc Ä {Objects¥PPC} PuTTY.rsrc
+       Delete -i {Targ}
        PPCLink ¶
                -o {Targ} {Sym¥PPC} ¶
-               -t 'APPL' ¶
-               -c 'pTTY' ¶
+               -t 'APPL' -c 'pTTY' ¶
+               -fragname PuTTY ¶
                {Objects¥PPC} ¶
                {Libs¥PPC}
+       Echo 'Include "PuTTY.rsrc";' > merge.r
+       Rez merge.r -o {Targ} -append
+       Delete -i merge.r
+       Rez version.r -d BUILD_ARCH='"PowerPC"' -o {Targ} {Includes} -append
 
-
-PuTTY ÄÄ {Objects¥68K} {Libs¥68K}
+PuTTY.68k ÄÄ {Objects¥68K} {Libs¥68K}
        IF (`exists {Targ}.NJ`)
                ILink ¶
                        -o {Targ} {Sym¥68K} ¶
-                       -t 'APPL' ¶
-                       -c 'pTTY' ¶
+                       -t 'APPL' -c 'pTTY' ¶
                        -newerdeps {NewerDeps}
        ELSE
                ILink ¶
                        -o {Targ} {Sym¥68K} ¶
-                       -t 'APPL' ¶
-                       -c 'pTTY' ¶
+                       -t 'APPL' -c 'pTTY' ¶
                        {Objects¥68K} ¶
                        {Libs¥68K}
        END
 
-PuTTY ÄÄ mac_res.r macresid.h
-       Rez mac_res.r -o {Targ} {Includes} -append
-
-PuTTY ÄÄ version.r version.h
-       Rez mac_res.r -d BUILD_ARCH='"68k"' -o {Targ} {Includes} -append
-
-PuTTY.ppc ÄÄ {¥MondoBuild¥} mac_res.r macresid.h
-       Rez mac_res.r -o {Targ} {Includes} -append
-
-PuTTY.ppc ÄÄ version.r version.h
-       Rez mac_res.r -d BUILD_ARCH='"PowerPC"' -o {Targ} {Includes} -append
+PuTTY.68k ÄÄ PuTTY.rsrc
+       Echo 'Include "PuTTY.rsrc";' > merge.r
+       Rez merge.r -o {Targ} -append
+       Delete -i merge.r
+       Rez version.r -d BUILD_ARCH='"68k"' -o {Targ} {Includes} -append
 
-PuTTY.fat Ä PuTTY PuTTY.ppc version.r version.h
-       Duplicate -y PuTTY PuTTY.fat
-       MergeFragment PuTTY.ppc PuTTY.fat
-       Rez mac_res.r -d BUILD_ARCH='"fat"' -o {Targ} {Includes} -append
+PuTTY Ä PuTTY.68k PuTTY.ppc version.r version.h
+       Duplicate -y PuTTY.68k {Targ}
+       MergeFragment PuTTY.ppc {Targ}
+       Rez version.r -d BUILD_ARCH='"fat"' -o {Targ} {Includes} -append
 
 .c.o Ä .c
        {C} {default}.c -o {Targ} {COptions}

diff --git a/mkputty.mpw b/mkputty.mpw
index f7dbb27bea1f912e67ba0a2f4f119f026fb1b363..228b071850ee099bc67f4f5deccfea98aafdec7f 100644 (file)
--- a/mkputty.mpw
+++ b/mkputty.mpw
@@ -1,15 +1,15 @@
-# $Id: mkputty.mpw,v 1.1.2.6 1999/03/28 15:23:37 ben Exp $
+# $Id: mkputty.mpw,v 1.1.2.7 1999/04/02 10:21:49 ben Exp $
 
 set program "{1}"
 shift
 if "{program}" == "" || "{program}" == "68k"
-       set program PuTTY
+       set program PuTTY.68k
 end
 if "{program}" == "ppc"
        set program PuTTY.ppc
 end
 if "{program}" == "fat"
-       set program PuTTY.fat
+       set program PuTTY
 end
 
 Set makefile Makefile.mpw