diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2001-11-30 14:16:36 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2001-11-30 14:16:36 (GMT) |
| commit | b3be216b41a4755556a887baa6ab440279fbe1dc (patch) | |
| tree | f7b1e40f24563a9800d31b517cac615c991b0d09 /Mac/Lib | |
| parent | 69b83b113f9e6fed321288ea23bca2aa673a7beb (diff) | |
| download | cpython-b3be216b41a4755556a887baa6ab440279fbe1dc.zip cpython-b3be216b41a4755556a887baa6ab440279fbe1dc.tar.gz cpython-b3be216b41a4755556a887baa6ab440279fbe1dc.tar.bz2 | |
Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).
Diffstat (limited to 'Mac/Lib')
5 files changed, 9 insertions, 41 deletions
diff --git a/Mac/Lib/mkcwproject/__init__.py b/Mac/Lib/mkcwproject/__init__.py index da73adb..9c5e21c 100644 --- a/Mac/Lib/mkcwproject/__init__.py +++ b/Mac/Lib/mkcwproject/__init__.py @@ -18,6 +18,10 @@ def mkproject(outputfile, modulename, settings, force=0, templatename=None): dictcopy['mac_exportname'] = os.path.split(outputfile)[1] + '.exp' if not dictcopy.has_key('mac_outputdir'): dictcopy['mac_outputdir'] = ':lib:' + if not dictcopy.has_key('stdlibraryflags'): + dictcopy['stdlibraryflags'] = 'Debug' + if not dictcopy.has_key('libraryflags'): + dictcopy['libraryflags'] = 'Debug' if not dictcopy.has_key('mac_dllname'): dictcopy['mac_dllname'] = modulename + '.ppc.slb' if not dictcopy.has_key('mac_targetname'): diff --git a/Mac/Lib/mkcwproject/template-carbon/template-alllibraries.xml b/Mac/Lib/mkcwproject/template-carbon/template-alllibraries.xml index 27f3cb1..1b10dbb 100644 --- a/Mac/Lib/mkcwproject/template-carbon/template-alllibraries.xml +++ b/Mac/Lib/mkcwproject/template-carbon/template-alllibraries.xml @@ -3,5 +3,5 @@ <PATH>%(libraries)s</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Library</FILEKIND> - <FILEFLAGS>Debug</FILEFLAGS> + <FILEFLAGS>%(libraryflags)s</FILEFLAGS> </FILE> diff --git a/Mac/Lib/mkcwproject/template-carbon/template.prj.xml b/Mac/Lib/mkcwproject/template-carbon/template.prj.xml index 7bd07e6..5702c2f 100644 --- a/Mac/Lib/mkcwproject/template-carbon/template.prj.xml +++ b/Mac/Lib/mkcwproject/template-carbon/template.prj.xml @@ -101,7 +101,7 @@ <SETTING><NAME>SystemSearchPaths</NAME> <SETTING> <SETTING><NAME>SearchPath</NAME> - <SETTING><NAME>Path</NAME><VALUE>%(sysprefix)s:GUSI2Carbon:include:</VALUE></SETTING> + <SETTING><NAME>Path</NAME><VALUE>%(sysprefix)s:GUSI2:include:</VALUE></SETTING> <SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING> <SETTING><NAME>PathRoot</NAME><VALUE>%(mac_sysprefixtype)s</VALUE></SETTING> </SETTING> @@ -977,17 +977,10 @@ </FILE> <FILE> <PATHTYPE>Name</PATHTYPE> - <PATH>MSL C.Carbon.Lib</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - <FILEKIND>Library</FILEKIND> - <FILEFLAGS></FILEFLAGS> - </FILE> - <FILE> - <PATHTYPE>Name</PATHTYPE> <PATH>CarbonLib</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Library</FILEKIND> - <FILEFLAGS></FILEFLAGS> + <FILEFLAGS>%(stdlibraryflags)s</FILEFLAGS> </FILE> </FILELIST> <LINKORDER> @@ -1013,11 +1006,6 @@ <PATH>PythonCoreCarbon</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> - <FILEREF> - <PATHTYPE>Name</PATHTYPE> - <PATH>MSL C.Carbon.Lib</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> </LINKORDER> </TARGET> </TARGETLIST> @@ -1053,12 +1041,6 @@ <FILEREF> <TARGETNAME>%(mac_targetname)s</TARGETNAME> <PATHTYPE>Name</PATHTYPE> - <PATH>MSL C.Carbon.Lib</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - <FILEREF> - <TARGETNAME>%(mac_targetname)s</TARGETNAME> - <PATHTYPE>Name</PATHTYPE> <PATH>CarbonLib</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> diff --git a/Mac/Lib/mkcwproject/template-ppc/template-alllibraries.xml b/Mac/Lib/mkcwproject/template-ppc/template-alllibraries.xml index 27f3cb1..1b10dbb 100644 --- a/Mac/Lib/mkcwproject/template-ppc/template-alllibraries.xml +++ b/Mac/Lib/mkcwproject/template-ppc/template-alllibraries.xml @@ -3,5 +3,5 @@ <PATH>%(libraries)s</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Library</FILEKIND> - <FILEFLAGS>Debug</FILEFLAGS> + <FILEFLAGS>%(libraryflags)s</FILEFLAGS> </FILE> diff --git a/Mac/Lib/mkcwproject/template-ppc/template.prj.xml b/Mac/Lib/mkcwproject/template-ppc/template.prj.xml index b64d770..3bd6f24 100644 --- a/Mac/Lib/mkcwproject/template-ppc/template.prj.xml +++ b/Mac/Lib/mkcwproject/template-ppc/template.prj.xml @@ -712,13 +712,6 @@ </FILE> <FILE> <PATHTYPE>Name</PATHTYPE> - <PATH>MSL C.PPC.Lib</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - <FILEKIND>Library</FILEKIND> - <FILEFLAGS>Debug</FILEFLAGS> - </FILE> - <FILE> - <PATHTYPE>Name</PATHTYPE> <PATH>MathLib</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Library</FILEKIND> @@ -729,7 +722,7 @@ <PATH>InterfaceLib</PATH> <PATHFORMAT>MacOS</PATHFORMAT> <FILEKIND>Library</FILEKIND> - <FILEFLAGS>Debug</FILEFLAGS> + <FILEFLAGS>%(stdlibraryflags)s</FILEFLAGS> </FILE> </FILELIST> <LINKORDER> @@ -752,11 +745,6 @@ </FILEREF> <FILEREF> <PATHTYPE>Name</PATHTYPE> - <PATH>MSL C.PPC.Lib</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - <FILEREF> - <PATHTYPE>Name</PATHTYPE> <PATH>MathLib</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> @@ -800,12 +788,6 @@ <FILEREF> <TARGETNAME>%(mac_targetname)s</TARGETNAME> <PATHTYPE>Name</PATHTYPE> - <PATH>MSL C.PPC.Lib</PATH> - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - <FILEREF> - <TARGETNAME>%(mac_targetname)s</TARGETNAME> - <PATHTYPE>Name</PATHTYPE> <PATH>MathLib</PATH> <PATHFORMAT>MacOS</PATHFORMAT> </FILEREF> |