diff options
| author | Miro Jurisic <meeroh@mit.edu> | 1998-10-21 21:51:20 +0000 |
|---|---|---|
| committer | Miro Jurisic <meeroh@mit.edu> | 1998-10-21 21:51:20 +0000 |
| commit | d4121fe6200a23cac8f3ba0037896a740634343c (patch) | |
| tree | 771b071bd4542925f443b0b2b5643c6491f618de /src | |
| parent | 8c3395b6a09b6ec2e49d3926ee15471c2146b993 (diff) | |
Added CodeWarrior Pro4 projects and docs, updated the Mac makefile to automagically build CW projects, updated CCache lib files
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10976 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
25 files changed, 213 insertions, 18 deletions
diff --git a/src/mac/ChangeLog b/src/mac/ChangeLog index 55a5781db..872c408fb 100644 --- a/src/mac/ChangeLog +++ b/src/mac/ChangeLog @@ -1,3 +1,7 @@ +Fri Oct 21 17:30:00 1998 Miro Jurisic <meeroh@mit.edu> + * Makefile.initial: added auto-detection of CodeWarrior version + * Makefile.tmpl: added CodeWarrior Pro4 files and fixed -map on krb5 68k lib + Fri Sep 8 15:50:00 1998 Miro Jurisic <meeroh@mit.edu> * CFMGlue.c: Added check for Code Fragment Manager diff --git a/src/mac/Makefile.initial b/src/mac/Makefile.initial index c5b0b7094..2b079f513 100644 --- a/src/mac/Makefile.initial +++ b/src/mac/Makefile.initial @@ -1,5 +1,23 @@ -all Ä build-makefile create-directories build-cw-projects - echo # Open {TargDir}:mac:libraries:BeforeBuild.prj in CodeWarrior IDE 2.1 and build it +################################################################################ +## +## Figure out CodeWarrior version +## +################################################################################ + +CodeWarrior_Linker_Version = ¶`mwlink68k -version | search /Runtime/ | streamedit -d -e "/([0-9.]*)¨1/ print ¨1"¶` +CodeWarrior_Linker_Pro2 = "2.0" +CodeWarrior_Linker_Pro4 = "2.2" +CodeWarrior_Version = `if ({CodeWarrior_Linker_Version} == {CodeWarrior_Linker_Pro2}); ¶ + echo Pro2; ¶ + else if ({CodeWarrior_Linker_Version} == {CodeWarrior_Linker_Pro4}); ¶ + echo Pro4; ¶ + end;` +CodeWarrior_IDE = "CodeWarrior "{CodeWarrior_Version}" IDE" +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 ################################################################################ ## @@ -34,9 +52,9 @@ create-directories Ä ################################################################################ build-cw-projects Ä - (Echo "with timeout of 1200 seconds"; ¶ - Echo "Tell application ¶"CodeWarrior IDE 2.1¶""; ¶ - Echo "Open ¶"{TargDir}:mac:libraries:BeforeBuild.prj¶" as alias"; ¶ - Echo "Make Project"; ¶ - Echo "end"; ¶ - Echo "end") | Catenate | perl :mac:RunAppleScript.pl
\ No newline at end of file + (Echo "with timeout of 1200 seconds"; ¶ + Echo "Tell application ¶"{CodeWarrior_IDE}¶""; ¶ + Echo "Open ¶"{CodeWarrior_Project}¶" as alias"; ¶ + Echo "Make Project"; ¶ + Echo "end"; ¶ + Echo "end") | Catenate | perl :mac:RunAppleScript.pl
\ No newline at end of file diff --git a/src/mac/Makefile.tmpl b/src/mac/Makefile.tmpl index e62990d6f..23fe70e52 100644 --- a/src/mac/Makefile.tmpl +++ b/src/mac/Makefile.tmpl @@ -243,7 +243,7 @@ libraries-krb5-ppc = \ ################################################################################ ## -## Common compiler options +## Common compiler and linker options ## ################################################################################ @@ -252,6 +252,10 @@ compiler-options = \ -mpw_pointers -warnings off -fatext -nosyspath -maxerrors 1000 \ -align mac68k -opt off -toc_data on -fp_contract on -sym on \ -model farData + +linker-options-gss = \ + +linker-options-krb5 = \ ################################################################################ ## @@ -367,7 +371,7 @@ link-cmf68k-all : link-cfm68k link-cfm68k-debug Kerberos5Lib.68K Kerberos5Lib.68K.MAP :: {autogenerated-files} /mac/K5Library.exp {libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k} MWLink68K -xm sharedlibrary -name K5Library -m "" \ -model cfmflat -@export "/mac/K5Library.exp" -sym off \ - -map Kerberos5Lib.68K -o Kerberos5Lib.68K \ + -map Kerberos5Lib.68K.MAP -o Kerberos5Lib.68K \ -init "__initializeK5" -term "__terminateK5" \ -weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \ {libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k} @@ -377,7 +381,7 @@ Kerberos5Lib.68K :: /mac/version.r 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} MWLink68K -xm sharedlibrary -name "MIT_*Kerberos5Lib.debug" -m "" \ -model cfmflat -@export "/mac/K5Library.exp" -sym off \ - -map Kerberos5Lib.68K -o Kerberos5Lib.68K.debug \ + -map Kerberos5Lib.68K.MAP -o Kerberos5Lib.68K.debug \ -init "__initializeK5" -term "__terminateK5" \ -weakimport /mac/TestTrack/MITAthenaLib -initbefore "MIT_*TestTrackLib" \ {libraries-krb5-cfm68k} {krb5-obj-cfm68k} {cfm-krb5-obj-cfm68k} {testtrack-obj-cfm68k} {ccache-cfm68k-debug} @@ -563,7 +567,8 @@ all-mac-files = {mac-files} {classic-glue-input} {autogeneration-sources} /Makef /mac/libraries/KerberosHeaders.h \ /mac/libraries/KerberosHeaders.pch \ /mac/libraries/KerberosHeadersCFM.pch \ - "/mac/libraries/BeforeBuild.prj" \ + "/mac/libraries/CodeWarrior Dependencies/Pro2.prj" \ + "/mac/libraries/CodeWarrior Dependencies/Pro4.prj" \ "/mac/libraries/Metrowerks/CW Pro 2/MIT C.CFM68K DLL.prj" \ "/mac/libraries/Metrowerks/CW Pro 2/MIT C.PPC DLL.prj" \ "/mac/libraries/Metrowerks/CW Pro 2/MIT RuntimeCFM68K DLL.prj" \ @@ -572,6 +577,14 @@ all-mac-files = {mac-files} {classic-glue-input} {autogeneration-sources} /Makef "/mac/libraries/Metrowerks/CW Pro 2/MIT C.PPC DLL.doc" \ "/mac/libraries/Metrowerks/CW Pro 2/MIT RuntimeCFM68K DLL.doc" \ "/mac/libraries/Metrowerks/CW Pro 2/MIT RuntimePPC DLL.doc" \ + "/mac/libraries/Metrowerks/CW Pro 4/MIT C.CFM68K DLL.prj" \ + "/mac/libraries/Metrowerks/CW Pro 4/MIT C.PPC DLL.prj" \ + "/mac/libraries/Metrowerks/CW Pro 4/MIT RuntimeCFM68K DLL.prj" \ + "/mac/libraries/Metrowerks/CW Pro 4/MIT RuntimePPC DLL.prj" \ + "/mac/libraries/Metrowerks/CW Pro 4/MIT C.CFM68K DLL.doc" \ + "/mac/libraries/Metrowerks/CW Pro 4/MIT C.PPC DLL.doc" \ + "/mac/libraries/Metrowerks/CW Pro 4/MIT RuntimeCFM68K DLL.doc" \ + "/mac/libraries/Metrowerks/CW Pro 4/MIT RuntimePPC DLL.doc" \ "/mac/libraries/CCache API/include/CCache.h" \ "/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K" \ "/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC" \ @@ -592,8 +605,10 @@ all-mac-folders = /config/ /include/ /include/krb5/ /include/krb5/stock/ \ /mac/ \ /mac/kconfig/ \ /mac/libraries/ \ + "/mac/libraries/CodeWarrior Dependencies/" \ /mac/libraries/Metrowerks/ \ "/mac/libraries/Metrowerks/CW Pro 2/" \ + "/mac/libraries/Metrowerks/CW Pro 4/" \ "/mac/libraries/CCache API/" \ "/mac/libraries/CCache API/bin" \ "/mac/libraries/CCache API/include" \ diff --git a/src/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K b/src/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K index c712adda2..c87625249 100644 --- a/src/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K +++ b/src/mac/libraries/CCache API/bin/CCacheGlobalsLib.68K @@ -1 +1 @@ -(This file must be converted with BinHex 4.0)
:&%0$B@0SC8GXEf*KE(0-D@)Z0MK,!(0SE')rN!3"!!!!!3S!!!'@9&&+EhNKF'9
QCQdf1'X!!!!"XJ-Yc`#3$3-!!J#3'j3!!3)!N!3&!*!(5!!!!%J!!!!2!!!!P!)
"!J#3"!i!N!pQ!!!!T!3"!J"0B@PZ!#9"09G[FQaN!%a[B@4PFJ#3"5SL2c`")`D
Tm!)Lrrd8F[q3"!#3"2q3"!#3"2q3"!#3$`%!!!"%!!!!4!!!!&!!!!!"!!!!!3!
"!*!+Cd0ZG(*X3Qa[BfX!!!3!N!8"!!YC8!%!N!B%!!&+E`!!!3!!!!&N!!!!C!!
!!$)!N20J!*!,!3#3%`&Y0MKV!*!6!3#3%8!968P8Ak9$3f&MD'9(E'pLB@ac6'P
L!!!"!!!!!@3!!!"N!!!!-JIQFT!!0)3!!!!F!$)!!'0QFQF!!!!+!!$rr`#3#2M
H:
\ No newline at end of file +(This file must be converted with BinHex 4.0)
:&%0$B@0SC8GXEf*KE(0-D@)Z0MK,!(0SE')rN!3!N!3"#J!!!CBl&%T[H5&`C@C
QE6BiD`!!!!'b#cB`!*!0!`!#!*!EP!!"!J#3"!8!N!G)!!!!5!!!!!m!!!#8!J%
#!*!%$J#3$fB!!!#N"!%#!%eKD@i!*8%e9fpbE'3!6'pKC'9b!*!&+L)r2!%M"UR
`!L,rr443rj!%!*!%rj!%!*!%rj!%!*!2!3!!!%3!!!"%!!!!8!!!!!%!!!!"!!%
!N!TR3fjdFQa#E'pMD`!!"!#3"3%!#eP3!3#3"J3!!Ble!!!"!!!!!@3!!!"N!!!
!-J#31'!!!!""F("X!*"!B!!!!%e06%)!N#"-D@)J5@e`Eh*d)&"33`#3&Ne36%B
!N#0J!*!,!3#3%`&Y0MKV!*!6!3#3%8!968P8Ak9$3f&MD'9(E'pLB@ac6'PL!!!
"!!!!!@3!!!"N!!!!-J9@1G!cb!!!!"`!-J!!BfCbC`!!!!S!!2rr!*!)q0d:
\ No newline at end of file diff --git a/src/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC b/src/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC index 0cbf6215a..67940ed6e 100644 --- a/src/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC +++ b/src/mac/libraries/CCache API/bin/CCacheGlobalsLib.PPC @@ -1 +1 @@ -(This file must be converted with BinHex 4.0)
:&%0$B@0SC8GXEf*KE(0-D@)Z8&"$!(0SE')rN!3"!*!%m!!!!CE2$8T[H5&`C@C
QF(G`B`!!!!'b!eJ&!*!0!`!#!*!%rj!%!*!6m!!%"!$rN!3!N!F)!*!,m!)%"!$
rN!3!N!pQ!!!!J!3%"!#3"Iq3"!#3"2q3"!#3"2q3"!#3$`%!!!"%!!!!4!!!!&!
!!!!"!!!!!3!"!*!+Cd0ZG(*X3Qa[BfX!!!3!N!8"!!YC8!%!N!J"!*!+'cF!!!%
!!!!"C!!!!'3!!!!bD!6-re!"%!!mrAhrbJ#J!E`%e`-Yrp8$aIeN!'m$#[Zk!`S
#'`%q"!8#NJ0S!em&F3'D!2IqRrfKrDImPJ!TrHX#(`04"!!"C`2[!'hpY!Bjr+-
#F!)Er`%"ZJ1&