Add support for compiling 'vers' resources into Mac applications. This is

needlessly complex because Rez's preprocessor doesn't do either ANSI or K&R
stringification, and the MPW Shell isn't much good as shells go.

Also make _all_ the Mac executables depend on reources, not just the
Classic 68K one.

git-svn-id: svn://svn.tartarus.org/sgt/putty@2389 cda61777-01e9-0310-a592-d414129be87e

diff --git a/mac/mac_res.r b/mac/mac_res.r
index a8c800e..1884427 100644 (file)
--- a/mac/mac_res.r
+++ b/mac/mac_res.r
@@ -1,4 +1,4 @@
-/* $Id: mac_res.r,v 1.6 2002/12/30 18:21:17 ben Exp $ */
+/* $Id: mac_res.r,v 1.7 2002/12/30 23:14:11 ben Exp $ */
 /*
  * Copyright (c) 1999 Ben Harris
  * All rights reserved.
@@ -342,6 +342,53 @@ resource 'icl8' (130, purgeable) {
        $"000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 
+resource 'vers' (1, purgeable) {
+    /* XXX This needs to be updated for each new version */
+    0x00, 0x53,
+#ifdef RELEASE
+    beta,
+#else
+    development,
+#endif
+    0, /* No prerelease version */
+    2, /* Region code 2 = UK */
+#ifdef RELEASESTR
+    RELEASESTR,
+    "Release " RELEASESTR,
+#else
+#ifdef SNAPSHOTSTR
+    SNAPSHOTSTR,
+    "Development snapshot " SNAPSHOTSTR,
+#else
+    "unknown",
+    "Unidentified build, " $$Date " " $$Time,
+#endif
+#endif
+};
+
+resource 'vers' (2, purgeable) {
+    /* XXX This needs to be updated for each new version */
+    0x00, 0x53,
+#ifdef RELEASE
+    beta,
+#else
+    development,
+#endif
+    0, /* No prerelease version */
+    2, /* Region code 2 = UK */
+#ifdef RELEASESTR
+    RELEASESTR,
+    "PuTTY " RELEASESTR,
+#else
+#ifdef SNAPSHOTSTR
+    SNAPSHOTSTR,
+    "PuTTY snapshot " SNAPSHOTSTR,
+#else
+    "unknown",
+    "PuTTY",
+#endif
+#endif
+};
 
 /*
  * Internal resources

diff --git a/mkfiles.pl b/mkfiles.pl
index fabdc87..8685752 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -593,6 +593,8 @@ END
 print $_;
 print <<END;
 
+ROptions     = `Echo "{VER}" | StreamEdit -e "1,\$ replace /=(\xc5)\xa81\xb0/ 'STR=\xb6\xb6\xb6\xb6\xb6"' \xa81 '\xb6\xb6\xb6\xb6\xb6"'"`
+
 # -w 35 disables "unused parameter" warnings
 COptions     = -i : -i :: -w 35 -w err -proto strict
 COptions_68K = {COptions} -model far -opt space
@@ -649,14 +651,14 @@ foreach $p (&prognames("M")) {
   print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n";
 
   $objstr = &objects($p, "X.cfm68k.o", "", undef);
-  print &splitline("$prog.cfm68k \xc4 $objstr", undef, "\xb6"), "\n";
+  print &splitline("$prog.cfm68k \xc4 $objstr $rsrc", undef, "\xb6"), "\n";
   print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
   print &splitline("\tILink -o {Targ} {LinkOptions_CFM68K} " .
                    $objstr . " {Libs_CFM68K}", 69, "\xb6"), "\n";
   print &splitline("\tSetFile -a BM {Targ}", 69, "\xb6"), "\n\n";
 
   $objstr = &objects($p, "X.ppc.o", "", undef);
-  print &splitline("$prog.ppc \xc4 $objstr", undef, "\xb6"), "\n";
+  print &splitline("$prog.ppc \xc4 $objstr $rsrc", undef, "\xb6"), "\n";
   print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
   print &splitline("\tPPCLink -o {Targ} {LinkOptions_PPC} " .
                    $objstr . " {Libs_PPC}", 69, "\xb6"), "\n";