Version 1.1b1, changed CFM fragment version numbers and tweaked makefile.initial

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11110 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 15 insertions, 6 deletions

diff --git a/src/mac/Makefile.initial b/src/mac/Makefile.initial
index 2b079f513..4ba7baac7 100644
--- a/src/mac/Makefile.initial
+++ b/src/mac/Makefile.initial
@@ -17,7 +17,7 @@ CodeWarrior_Projects = :mac:Libraries:Metrowerks:{CodeWarrior_Version}:
 CodeWarrior_Project = "`Directory`mac:libraries:CodeWarrior Dependencies:{CodeWarrior_Version}.prj"
 
 
-all Ä create-directories build-cw-projects build-makefile
+prebuild Ä create-directories build-cw-projects build-makefile
 
 ################################################################################
 ##
@@ -54,6 +54,7 @@ create-directories Ä
 build-cw-projects Ä
 		(Echo "with timeout of 1200 seconds"; ¶
 		Echo "Tell application ¶"{CodeWarrior_IDE}¶""; ¶
+		Echo "Activate"; ¶
 		Echo "Open ¶"{CodeWarrior_Project}¶" as alias"; ¶
 		Echo "Make Project"; ¶
 		Echo "end"; ¶
diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl
index 4afe94b8a..c24a406e7 100644
--- a/src/mac/Makefile.tmpl
+++ b/src/mac/Makefile.tmpl
@@ -373,6 +373,7 @@ Kerberos5Lib.68K Kerberos5Lib.68K.MAP :: {autogenerated-files} /mac/K5Library.ex
 		-map Kerberos5Lib.68K.MAP -o Kerberos5Lib.68K \
 		-init "__initializeK5" -term "__terminateK5" \
 		-weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \
+		-cv 1 -uv 1 \
 		{libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k}
 Kerberos5Lib.68K :: /mac/version.r
 	Rez "/mac/version.r" -a -o Kerberos5Lib.68K
@@ -383,6 +384,7 @@ Kerberos5Lib.68K.debug Kerberos5Lib.68K.debug.MAP :: {autogenerated-files} /mac/
 		-map Kerberos5Lib.68K.MAP -o Kerberos5Lib.68K.debug \
 		-init "__initializeK5" -term "__terminateK5" \
 		-weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \
+		-cv 1 -uv 1 \
 		{libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k-debug}
 Kerberos5Lib.68K.debug :: /mac/version.r
 	Rez "/mac/version.r" -a -o Kerberos5Lib.68K.debug
@@ -396,6 +398,7 @@ GSSLib.68K GSSLib.68K.MAP :: {autogenerated-files}  Kerberos5Lib.68K /mac/GSSLib
 		-model cfmflat -@export "/mac/GSSLibrary.exp" -sym off \
 		-map GSSLib.68K.MAP -o GSSLib.68K \
 		-init "__initializeGSS" -term "__terminateGSS" \
+		-cv 1 -uv 1 \
 		{libraries-gss-cfm68k} {gss-obj-cfm68k} {cfm-gss-obj-cfm68k} Kerberos5Lib.68K
 GSSLib.68K :: /mac/version.r
 	Rez "/mac/version.r" -a -o GSSLib.68K
@@ -405,6 +408,7 @@ GSSLib.68K.debug GSSLib.68K.debug.MAP :: {autogenerated-files}  Kerberos5Lib.68K
 		-model cfmflat -@export "/mac/GSSLibrary.exp" -sym off \
 		-map GSSLib.68K.MAP -o GSSLib.68K.debug \
 		-init "__initializeGSS" -term "__terminateGSS" \
+		-cv 1 -uv 1 \
 		{libraries-gss-cfm68k} {gss-obj-cfm68k} {cfm-gss-obj-cfm68k} Kerberos5Lib.68K
 GSSLib.68K :: /mac/version.r
 	Rez "/mac/version.r" -a -o GSSLib.68K.debug
@@ -429,6 +433,7 @@ Kerberos5Lib.PPC Kerberos5Lib.PPC.MAP :: {autogenerated-files}  /mac/K5Library.e
 		-term "__terminateK5" \
 		-weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \
 		-map K5LibraryPPC.MAP -o Kerberos5Lib.PPC \
+		-cv 1 -uv 1 \
 		{libraries-krb5-ppc} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {testtrack-obj-ppc} {ccache-ppc}
 Kerberos5Lib.PPC :: /mac/version.r
 	Rez "/mac/version.r" -a -o Kerberos5Lib.PPC
@@ -439,6 +444,7 @@ Kerberos5Lib.PPC.debug Kerberos5Lib.PPC.debug.MAP :: {autogenerated-files}  /mac
 		-term "__terminateK5" \
 		-weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \
 		-map K5LibraryPPC.debug.MAP -o Kerberos5Lib.PPC.debug \
+		-cv 1 -uv 1 \
 		{libraries-krb5-ppc} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {testtrack-obj-ppc} {ccache-ppc-debug}
 Kerberos5Lib.PPC.debug :: /mac/version.r
 	Rez "/mac/version.r" -a -o Kerberos5Lib.PPC.debug
@@ -451,6 +457,7 @@ GSSLib.PPC GSSLib.PPC.MAP :: {autogenerated-files} Kerberos5Lib.PPC /mac/GSSLibr
 	MWLinkPPC -sharedlibrary -name GSSLibrary -m "" \
 		-@export "/mac/GSSLibrary.exp" -sym on -init "__initializeGSS" \
 		-term "__terminateGSS" -map GSSLib.PPC.MAP -o GSSLib.PPC \
+		-cv 1 -uv 1 \
 		{libraries-gss-ppc} {gss-obj-ppc} {cfm-gss-obj-ppc} Kerberos5Lib.PPC
 GSSLib.PPC :: /mac/version.r
 	Rez "/mac/version.r" -a -o GSSLib.PPC
@@ -459,6 +466,7 @@ GSSLib.PPC.debug GSSLib.PPC.debug.MAP :: {autogenerated-files} Kerberos5Lib.PPC.
 	MWLinkPPC -sharedlibrary -name "MIT_*GSSLib.debug" -m "" \
 		-@export "/mac/GSSLibrary.exp" -sym on -init "__initializeGSS" \
 		-term "__terminateGSS" -map GSSLib.PPC.debug.MAP -o GSSLib.PPC.debug \
+		-cv 1 -uv 1 \
 		{libraries-gss-ppc} {gss-obj-ppc} {cfm-gss-obj-ppc} Kerberos5Lib.PPC.debug
 GSSLib.PPC.debug :: /mac/version.r
 	Rez "/mac/version.r" -a -o GSSLib.PPC.debug
diff --git a/src/mac/ReadMe b/src/mac/ReadMe
index 4723dd003..10b0e5a44 100644
--- a/src/mac/ReadMe
+++ b/src/mac/ReadMe
@@ -30,9 +30,9 @@ To build the Macintosh version of Kerberos 5 and GSS:
 	4) Launch MPW.
 
 	5) Set directory in MPW to the top level of Kerberos 5 distribution
-	   (e.g. "GSS-Kerberos5-1.0.5").
+	   (e.g. "GSS-Kerberos5").
 
-	6) Build target "all" in MPW.
+	6) Build target "prebuild" in MPW.
 		This will create a new Makefile, and launch your CodeWarrior IDE to build
 		some CodeWarrior projects. You may be asked to locate CodeWarrior IDE.
 	    
diff --git a/src/mac/version.r b/src/mac/version.r
index 2f83c787b..8e88d8da6 100644
--- a/src/mac/version.r
+++ b/src/mac/version.r
@@ -7,10 +7,10 @@
 #endif
 
 resource 'vers' (1) {
-	0x01, 0x10, alpha, 0x04,
+	0x01, 0x10, beta, 0x02,
 	verUS,
-	"1.1a4",
-	"1.1a4, Copyright 1996-1998 Massachusetts Institute of Technology"
+	"1.1b2",
+	"1.1b2, Copyright 1996-1998 Massachusetts Institute of Technology"
 };
 
 resource 'vers' (2) {