[Python-checkins] CVS: python/dist/src/Mac/Lib/mkcwproject/template-ppc template-alllibraries.xml,1.1,1.2 template.prj.xml,1.2,1.3

[Jack Jansen]

Update of /cvsroot/python/python/dist/src/Mac/Lib/mkcwproject/template-ppc
In directory usw-pr-cvs1:/tmp/cvs-serv22285/Mac/Lib/mkcwproject/template-ppc

Modified Files:
	template-alllibraries.xml template.prj.xml 
Log Message:
Merged changes made on r22b2-branch between r22b2 and r22b2-mac (the
changes from start of branch upto r22b2 were already merged, of course).


Index: template-alllibraries.xml
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/mkcwproject/template-ppc/template-alllibraries.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** template-alllibraries.xml	2001/01/23 22:33:00	1.1
--- template-alllibraries.xml	2001/11/30 14:16:31	1.2
***************
*** 4,7 ****
                      <PATHFORMAT>MacOS</PATHFORMAT>
                      <FILEKIND>Library</FILEKIND>
!                     <FILEFLAGS>Debug</FILEFLAGS>
                  </FILE>
--- 4,7 ----
                      <PATHFORMAT>MacOS</PATHFORMAT>
                      <FILEKIND>Library</FILEKIND>
!                     <FILEFLAGS>%(libraryflags)s</FILEFLAGS>
                  </FILE>

Index: template.prj.xml
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Lib/mkcwproject/template-ppc/template.prj.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** template.prj.xml	2001/11/10 23:21:47	1.2
--- template.prj.xml	2001/11/30 14:16:31	1.3
***************
*** 713,723 ****
                  <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>
--- 713,716 ----
***************
*** 730,734 ****
                      <PATHFORMAT>MacOS</PATHFORMAT>
                      <FILEKIND>Library</FILEKIND>
!                     <FILEFLAGS>Debug</FILEFLAGS>
                  </FILE>
              </FILELIST>
--- 723,727 ----
                      <PATHFORMAT>MacOS</PATHFORMAT>
                      <FILEKIND>Library</FILEKIND>
!                     <FILEFLAGS>%(stdlibraryflags)s</FILEFLAGS>
                  </FILE>
              </FILELIST>
***************
*** 753,761 ****
                  <FILEREF>
                      <PATHTYPE>Name</PATHTYPE>
-                     <PATH>MSL C.PPC.Lib</PATH>
-                     <PATHFORMAT>MacOS</PATHFORMAT>
-                 </FILEREF>
-                 <FILEREF>
-                     <PATHTYPE>Name</PATHTYPE>
                      <PATH>MathLib</PATH>
                      <PATHFORMAT>MacOS</PATHFORMAT>
--- 746,749 ----
***************
*** 796,805 ****
                  <PATHTYPE>Name</PATHTYPE>
                  <PATH>PythonCore</PATH>
-                 <PATHFORMAT>MacOS</PATHFORMAT>
-             </FILEREF>
-             <FILEREF>
-                 <TARGETNAME>%(mac_targetname)s</TARGETNAME>
-                 <PATHTYPE>Name</PATHTYPE>
-                 <PATH>MSL C.PPC.Lib</PATH>
                  <PATHFORMAT>MacOS</PATHFORMAT>
              </FILEREF>
--- 784,787 ----