Updated fragment names to "MIT Kerberos..." and udpated versio number to 2.0fc1

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

4 files changed, 68 insertions, 72 deletions

diff --git a/src/mac/FragmentAlias.mpw b/src/mac/FragmentAlias.mpw
index d09a2132f..c3307cd6f 100644
--- a/src/mac/FragmentAlias.mpw
+++ b/src/mac/FragmentAlias.mpw
@@ -12,11 +12,11 @@
 	Set FragEntry ""
 	
 /GSSLibrary/
-	Print "¶t¶t¶"MIT_¥GSSLib¶",¶t¶t"
+	Print "¶t¶t¶"MIT Kerberos¥GSSLib¶",¶t¶t"
 	Print FragEntry
 
 /K5Library/
-	Print "¶t¶t¶"MIT_¥Kerberos5Lib¶",¶t¶t"
+	Print "¶t¶t¶"MIT Kerberos¥Kerberos5Lib¶",¶t¶t"
 	Print FragEntry
 
 /Å/
diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl
index cdbad28e2..cbd749d32 100644
--- a/src/mac/Makefile.tmpl
+++ b/src/mac/Makefile.tmpl
@@ -397,7 +397,7 @@ krb5-globals-files = \
 #
 	
 Kerberos5GlobalsLib.PPC Krb5GlobalsLib.PPC.MAP :: "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" {krb5-globals-obj-ppc} {krb5-globals-data-ppc}
-	MWLinkPPC -sharedlibrary -name "MIT_*Krb5GlobalsLib" -m "" \
+	MWLinkPPC -sharedlibrary -name "MIT Kerberos*Kerberos5GlobalsLib" -m "" \
 		-@export "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" -sym on \
 		-init "__initialize_Kerberos5GlobalsLib" \
 		-term "__terminate_Kerberos5GlobalsLib" \
@@ -405,7 +405,7 @@ Kerberos5GlobalsLib.PPC Krb5GlobalsLib.PPC.MAP :: "/mac/libraries/Kerberos v5 Gl
 		{krb5-globals-obj-ppc} {standard-libraries-ppc} {ccache-ppc} {krb5-globals-data-ppc}
 
 Kerberos5GlobalsLib.PPC.debug Krb5GlobalsLib.PPC.debug.MAP :: "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" {krb5-globals-obj-ppc} {krb5-globals-data-ppc}
-	MWLinkPPC -sharedlibrary -name "MIT_*Krb5GlobalsLib.debug" -m "" \
+	MWLinkPPC -sharedlibrary -name "MIT Kerberos*Kerberos5GlobalsLib.debug" -m "" \
 		-@export "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" -sym on \
 		-init "__initialize_Kerberos5GlobalsLib" \
 		-term "__terminate_Kerberos5GlobalsLib" \
@@ -417,7 +417,7 @@ Kerberos5GlobalsLib.PPC.debug Krb5GlobalsLib.PPC.debug.MAP :: "/mac/libraries/Ke
 #
 	
 Kerberos5GlobalsDataLib.PPC Krb5GlobalDataLib.PPC.MAP :: "/mac/libraries/Kerberos v5 Globals/Krb5GlobalsData.exp" {krb5-globals-data-obj-ppc}
-	MWLinkPPC -sharedlibrary -name "MIT_*Krb5GlobalsDataLib" -m "" \
+	MWLinkPPC -sharedlibrary -name "MIT Kerberos*Kerberos5GlobalsDataLib" -m "" \
 		-@export "/mac/libraries/Kerberos v5 Globals/Krb5GlobalsData.exp" -sym on \
 		-init "__initialize" \
 		-term "__terminate" \
@@ -431,7 +431,7 @@ Kerberos5GlobalsDataLib.PPC Krb5GlobalDataLib.PPC.MAP :: "/mac/libraries/Kerbero
 #
 	
 Kerberos5GlobalsLib.68K Krb5GlobalsLib.68K.MAP :: "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" {krb5-globals-obj-68k} {krb5-globals-data-68k}
-	MWLink68K -sharedlibrary -name "MIT_*Krb5GlobalsLib" -m "" \
+	MWLink68K -sharedlibrary -name "MIT Kerberos*Kerberos5GlobalsLib" -m "" \
 		-@export "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" -sym on \
 		-init "__initialize_Kerberos5GlobalsLib" \
 		-term "__terminate_Kerberos5GlobalsLib" \
@@ -439,7 +439,7 @@ Kerberos5GlobalsLib.68K Krb5GlobalsLib.68K.MAP :: "/mac/libraries/Kerberos v5 Gl
 		{krb5-globals-obj-68k} {standard-libraries-cfm68k} {ccache-cfm68k} {krb5-globals-data-68k}
 
 Kerberos5GlobalsLib.68K.debug Krb5GlobalsLib.68K.debug.MAP :: "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" {krb5-globals-obj-68k} {krb5-globals-data-68k}
-	MWLink68K -sharedlibrary -name "MIT_*Krb5GlobalsLib.debug" -m "" \
+	MWLink68K -sharedlibrary -name "MIT Kerberos*Kerberos5GlobalsLib.debug" -m "" \
 		-@export "/mac/libraries/Kerberos v5 Globals/Krb5Globals.exp" -sym on \
 		-init "__initialize_Kerberos5GlobalsLib" \
 		-term "__terminate_Kerberos5GlobalsLib" \
@@ -451,7 +451,7 @@ Kerberos5GlobalsLib.68K.debug Krb5GlobalsLib.68K.debug.MAP :: "/mac/libraries/Ke
 #
 	
 Kerberos5GlobalsDataLib.68K Krb5GlobalDataLib.68K.MAP :: "/mac/libraries/Kerberos v5 Globals/Krb5GlobalsData.exp" {krb5-globals-data-obj-68k}
-	MWLink68K -sharedlibrary -name "MIT_*Krb5GlobalsDataLib" -m "" \
+	MWLink68K -sharedlibrary -name "MIT Kerberos*Kerberos5GlobalsDataLib" -m "" \
 		-@export "/mac/libraries/Kerberos v5 Globals/Krb5GlobalsData.exp" -sym on \
 		-init "__initialize" \
 		-term "__terminate" \
@@ -501,10 +501,8 @@ compile-testtrack : {testtrack-obj-cfm68k} {testtrack-obj-ppc}
 ## Linking
 ##
 ################################################################################
-# link : link-cfm68k link-ppc link-fat
-link : link-ppc link-fat
-# link-debug : link-cfm68k-debug link-ppc-debug link-fat-debug
-link-debug : link-ppc-debug link-fat-debug
+link : link-cfm68k link-ppc link-fat
+link-debug : link-cfm68k-debug link-ppc-debug link-fat-debug
 link-all : link link-debug
 
 ################################################################################
@@ -533,7 +531,7 @@ Kerberos5Lib.68K :: /mac/version.r
 	Rez "/mac/version.r" -a -o Kerberos5Lib.68K
 
 Kerberos5Lib.68K.debug Kerberos5Lib.68K.debug.MAP :: {autogenerated-files} /mac/K5Library.exp {libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k-debug} {krb5-globals-68k-debug}
-	MWLink68K -xm sharedlibrary -name "MIT_*Kerberos5Lib.debug" -m "" \
+	MWLink68K -xm sharedlibrary -name "MIT Kerberos*Kerberos5Lib.debug" -m "" \
 		-model cfmflat -@export "/mac/K5Library.exp" -sym off \
 		-map Kerberos5Lib.68K.MAP -o Kerberos5Lib.68K.debug \
 		-init "__initializeK5" -term "__terminateK5" \
@@ -558,7 +556,7 @@ GSSLib.68K :: /mac/version.r
 	Rez "/mac/version.r" -a -o GSSLib.68K
 
 GSSLib.68K.debug GSSLib.68K.debug.MAP :: {autogenerated-files}  Kerberos5Lib.68K /mac/GSSLibrary.exp {libraries-gss-cfm68k} {gss-obj-cfm68k} {cfm-gss-obj-cfm68k}
-	MWLink68K -xm sharedlibrary -name "MIT_*GSSLib.debug" -m "" \
+	MWLink68K -xm sharedlibrary -name "MIT Kerberos*GSSLib.debug" -m "" \
 		-model cfmflat -@export "/mac/GSSLibrary.exp" -sym off \
 		-map GSSLib.68K.MAP -o GSSLib.68K.debug \
 		-init "__initializeGSS" -term "__terminateGSS" \
@@ -592,7 +590,7 @@ Kerberos5Lib.PPC :: /mac/version.r
 	Rez "/mac/version.r" -a -o Kerberos5Lib.PPC
 
 Kerberos5Lib.PPC.debug Kerberos5Lib.PPC.debug.MAP :: {autogenerated-files}  /mac/K5Library.exp {libraries-krb5-ppc} {krb5-obj-ppc} {cfm-krb5-obj-ppc} {testtrack-obj-ppc} {ccache-ppc-debug} {krb5-globals-ppc-debug}
-	MWLinkPPC -sharedlibrary -name "MIT_*Kerberos5Lib.debug" -m "" \
+	MWLinkPPC -sharedlibrary -name "MIT Kerberos*Kerberos5Lib.debug" -m "" \
 		-@export "/mac/K5Library.exp" -sym on -init "__initializeK5" \
 		-term "__terminateK5" \
 		-map K5LibraryPPC.debug.MAP -o Kerberos5Lib.PPC.debug \
@@ -615,7 +613,7 @@ GSSLib.PPC :: /mac/version.r
 	Rez "/mac/version.r" -a -o GSSLib.PPC
 
 GSSLib.PPC.debug GSSLib.PPC.debug.MAP :: {autogenerated-files} Kerberos5Lib.PPC.debug /mac/GSSLibrary.exp {libraries-gss-ppc} {gss-obj-ppc} {cfm-gss-obj-ppc}
-	MWLinkPPC -sharedlibrary -name "MIT_*GSSLib.debug" -m "" \
+	MWLinkPPC -sharedlibrary -name "MIT Kerberos*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 \
@@ -629,54 +627,48 @@ GSSLib.PPC.debug :: /mac/version.r
 ##
 ################################################################################
 
-link-fat : GSSLib
-link-fat-debug : GSSLib.debug
+link-fat : "MIT Kerberos Library"
+link-fat-debug : "MIT Kerberos Library.debug"
 link-fat-all :Êlink-fat link-fat-debug
 
-GSSLib : GSSLib.PPC Kerberos5Lib.PPC {ccache-ppc} # GSSLib.68K Kerberos5Lib.68K {ccache-cfm68k}
-	Delete -i GSSLib
-	Duplicate -y GSSLib.PPC GSSLib
-#	MergeFragment GSSLib.68K GSSLib
-	MergeFragment "/bin/MIT CLib.PPC" GSSLib
-	MergeFragment "/bin/MIT RuntimeLib.PPC" GSSLib
-	MergeFragment Kerberos5Lib.PPC GSSLib
-#	MergeFragment Kerberos5Lib.68K GSSLib
-#	MergeFragment "/bin/MIT CLib.68K" GSSLib
-#	MergeFragment "/bin/MIT RuntimeLib.68K" GSSLib
-#	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.68K" GSSLib
-#	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" GSSLib
-	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.PPC" GSSLib
-	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" GSSLib
-#	MergeFragment "/mac/libraries/DES/bin/deslib.68K" GSSLib
-	MergeFragment "/mac/libraries/DES/bin/deslib.PPC" GSSLib
-#	MergeFragment "Kerberos5GlobalsLib.68K" GSSLib
-#	MergeFragment "Kerberos5GlobalsDataLib.68K" GSSLib
-	MergeFragment "Kerberos5GlobalsLib.PPC" GSSLib
-	MergeFragment "Kerberos5GlobalsDataLib.PPC" GSSLib
-	DeRez -only "'cfrg'(0)" GSSLib "{RIncludes}"CodeFragments.r | StreamEdit -s /mac/FragmentAlias.mpw | Rez -a -o GSSLib -i "{RIncludes}"
+"MIT Kerberos Library" : GSSLib.PPC Kerberos5Lib.PPC {ccache-ppc} # GSSLib.68K Kerberos5Lib.68K {ccache-cfm68k}
+	Delete -i "MIT Kerberos Library"
+	Duplicate -y GSSLib.PPC "MIT Kerberos Library"
+#	MergeFragment GSSLib.68K "MIT Kerberos Library"
+	MergeFragment Kerberos5Lib.PPC "MIT Kerberos Library"
+#	MergeFragment Kerberos5Lib.68K "MIT Kerberos Library"
+#	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.68K" "MIT Kerberos Library"
+#	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" "MIT Kerberos Library"
+	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.PPC" "MIT Kerberos Library"
+	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" "MIT Kerberos Library"
+#	MergeFragment "/mac/libraries/DES/bin/deslib.68K" "MIT Kerberos Library"
+	MergeFragment "/mac/libraries/DES/bin/deslib.PPC" "MIT Kerberos Library"
+#	MergeFragment "Kerberos5GlobalsLib.68K" "MIT Kerberos Library"
+#	MergeFragment "Kerberos5GlobalsDataLib.68K" "MIT Kerberos Library"
+	MergeFragment "Kerberos5GlobalsLib.PPC" "MIT Kerberos Library"
+	MergeFragment "Kerberos5GlobalsDataLib.PPC" "MIT Kerberos Library"
+	DeRez -only "'cfrg'(0)" "MIT Kerberos Library" "{RIncludes}"CodeFragments.r | StreamEdit -s /mac/FragmentAlias.mpw | Rez -a -o "MIT Kerberos Library" -i "{RIncludes}"
+	SetFile -c 'Krb ' "MIT Kerberos Library"
 	
 
-GSSLib.debug : GSSLib.PPC.debug Kerberos5Lib.PPC.debug {ccache-ppc-debug} # GSSLib.68K.debug Kerberos5Lib.68K.debug {ccache-cfm68k-debug}
-	Delete -i GSSLib.debug
-	Duplicate -y GSSLib.PPC.debug GSSLib.debug
-#	MergeFragment GSSLib.68K.debug GSSLib.debug
-	MergeFragment "/bin/MIT CLib.PPC.debug" GSSLib.debug
-	MergeFragment "/bin/MIT RuntimeLib.PPC.debug" GSSLib.debug
-	MergeFragment Kerberos5Lib.PPC.debug GSSLib.debug
-#	MergeFragment Kerberos5Lib.68K.debug GSSLib.debug
-#	MergeFragment "/bin/MIT CLib.68K" GSSLib.debug
-#	MergeFragment "/bin/MIT RuntimeLib.68K" GSSLib.debug
-#	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.68K.debug" GSSLib.debug
-#	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" GSSLib.debug
-	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.PPC.debug" GSSLib.debug
-	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" GSSLib.debug
-#	MergeFragment "/mac/libraries/DES/bin/deslib.68K.debug" GSSLib.debug
-	MergeFragment "/mac/libraries/DES/bin/deslib.PPC.debug" GSSLib.debug
-	MergeFragment "Kerberos5GlobalsLib.PPC.debug" GSSLib.debug
-	MergeFragment "Kerberos5GlobalsDataLib.PPC" GSSLib.debug
-#	MergeFragment "Kerberos5GlobalsLib.68K.debug" GSSLib.debug
-#	MergeFragment "Kerberos5GlobalsDataLib.68K" GSSLib.debug
-	DeRez -only "'cfrg'(0)" GSSLib.debug "{RIncludes}"CodeFragments.r | StreamEdit -s /mac/FragmentAlias.mpw | Rez -a -o GSSLib.debug -i "{RIncludes}"
+"MIT Kerberos Library.debug" : GSSLib.PPC.debug Kerberos5Lib.PPC.debug {ccache-ppc-debug} # GSSLib.68K.debug Kerberos5Lib.68K.debug {ccache-cfm68k-debug}
+	Delete -i "MIT Kerberos Library.debug"
+	Duplicate -y GSSLib.PPC.debug "MIT Kerberos Library.debug"
+#	MergeFragment GSSLib.68K.debug "MIT Kerberos Library.debug"
+	MergeFragment Kerberos5Lib.PPC.debug "MIT Kerberos Library.debug"
+#	MergeFragment Kerberos5Lib.68K.debug "MIT Kerberos Library.debug"
+#	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.68K.debug" "MIT Kerberos Library.debug"
+#	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" "MIT Kerberos Library.debug"
+	MergeFragment "/mac/libraries/CCache API/bin/CCacheLib.PPC.debug" "MIT Kerberos Library.debug"
+	MergeFragment "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" "MIT Kerberos Library.debug"
+#	MergeFragment "/mac/libraries/DES/bin/deslib.68K.debug" "MIT Kerberos Library.debug"
+	MergeFragment "/mac/libraries/DES/bin/deslib.PPC.debug" "MIT Kerberos Library.debug"
+	MergeFragment "Kerberos5GlobalsLib.PPC.debug" "MIT Kerberos Library.debug"
+	MergeFragment "Kerberos5GlobalsDataLib.PPC" "MIT Kerberos Library.debug"
+#	MergeFragment "Kerberos5GlobalsLib.68K.debug" "MIT Kerberos Library.debug"
+#	MergeFragment "Kerberos5GlobalsDataLib.68K" "MIT Kerberos Library.debug"
+	DeRez -only "'cfrg'(0)" "MIT Kerberos Library.debug" "{RIncludes}"CodeFragments.r | StreamEdit -s /mac/FragmentAlias.mpw | Rez -a -o "MIT Kerberos Library.debug" -i "{RIncludes}"
+	SetFile -c 'Krb ' "MIT Kerberos Library.debug"
 	
 ################################################################################
 ##
@@ -838,4 +830,3 @@ Makefile : /mac/Makefile.tmpl
 
 template :
 	setfile -a l /mac/Makefile.tmpl
-	perl /mac/templatify.pl < /Makefile > /mac/Makefile.tmpl
\ No newline at end of file
diff --git a/src/mac/Release notes b/src/mac/Release notes
index 3a51f511d..ec24aa94b 100644
--- a/src/mac/Release notes
+++ b/src/mac/Release notes
@@ -61,4 +61,14 @@ Changes in 1.1a3:
 1.1b14-1.1b19 skipped
  
 1.1b20
- fixed glue to include gss_krb5_ccache_name
\ No newline at end of file
+ fixed glue to include gss_krb5_ccache_name
+ 
+----- Version upped to 2.0fc1 -----
+
+2.0fc1
+ changed fragment names to "MIT Kerberos¥É"
+ updated to DES lib 1.0.3
+ updated to CCache 2.0fc1
+ removed CLib and RuntimeLib from output binary
+ renamed output to MIT Kerberos Library
+ changed vers 2 resource to new name (MIT Kerberos for the Macintosh)
\ No newline at end of file
diff --git a/src/mac/version.r b/src/mac/version.r
index b8708281f..9fde6f9a5 100644
--- a/src/mac/version.r
+++ b/src/mac/version.r
@@ -6,16 +6,11 @@
 #include "Types.r"
 #endif
 
-resource 'vers' (1) {
-	0x01, 0x10, beta, 20,
-	verUS,
-	"1.1b20",
-	"1.1b20, Copyright 1996-1999 Massachusetts Institute of Technology"
-};
+#include "MIT Kerberos.r"
 
-resource 'vers' (2) {
-	0x01, 0x50, beta, 0x1,
+resource 'vers' (1) {
+	2, 0, final, 1,
 	verUS,
-	"1.5b1",
-	"MacOS Kerberos v5 1.5b1"
+	"2.0fc1",
+	"2.0fc1, Copyright 1996-1999 Massachusetts Institute of Technology"
 };