[Python-checkins] CVS: python/dist/src/Lib/distutils mwerkscompiler.py,1.1,1.1.6.1 sysconfig.py,1.34,1.34.6.1

[Tim Peters]

Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory usw-pr-cvs1:/tmp/cvs-serv24450/mergedescr/dist/src/Lib/distutils

Modified Files:
      Tag: descr-branch
	mwerkscompiler.py sysconfig.py 
Log Message:
Merge of trunk tag date2001-07-06 into descr-branch.


Index: mwerkscompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/mwerkscompiler.py,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C2 -r1.1 -r1.1.6.1
*** mwerkscompiler.py	2001/01/15 16:09:35	1.1
--- mwerkscompiler.py	2001/07/07 22:55:28	1.1.6.1
***************
*** 63,70 ****
--- 63,73 ----
                   extra_preargs=None,
                   extra_postargs=None):
+          (output_dir, macros, include_dirs) = \
+             self._fix_compile_args (output_dir, macros, include_dirs)
           self.__sources = sources
           self.__macros = macros
           self.__include_dirs = include_dirs
           # Don't need extra_preargs and extra_postargs for CW
+          return []
           
      def link (self,
***************
*** 81,84 ****
--- 84,92 ----
                extra_postargs=None,
                build_temp=None):
+         # First fixup.
+         (objects, output_dir) = self._fix_object_args (objects, output_dir)
+         (libraries, library_dirs, runtime_library_dirs) = \
+             self._fix_lib_args (libraries, library_dirs, runtime_library_dirs)
+ 
          # First examine a couple of options for things that aren't implemented yet
          if not target_desc in (self.SHARED_LIBRARY, self.SHARED_OBJECT):
***************
*** 115,118 ****
--- 123,128 ----
          if output_filename[-8:] == '.ppc.slb':
              basename = output_filename[:-8]
+         elif output_filename[-11:] == '.carbon.slb':
+             basename = output_filename[:-11]
          else:
              basename = os.path.strip(output_filename)[0]
***************
*** 163,167 ****
                      fp.write('#define %s\n'%name)
                  else:
!                     fp.write('#define %s "%s"\n'%(name, value))
              fp.close()
              settings['prefixname'] = prefixname
--- 173,177 ----
                      fp.write('#define %s\n'%name)
                  else:
!                     fp.write('#define %s %s\n'%(name, value))
              fp.close()
              settings['prefixname'] = prefixname
***************
*** 199,203 ****
             curdir = os.getcwd()
             filename = os.path.join(curdir, filename)
!         return filename
          
          
--- 209,218 ----
             curdir = os.getcwd()
             filename = os.path.join(curdir, filename)
!         # Finally remove .. components
!         components = string.split(filename, ':')
!         for i in range(1, len(components)):
!            if components[i] == '..':
!               components[i] = ''
!         return string.join(components, ':')
          
          

Index: sysconfig.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v
retrieving revision 1.34
retrieving revision 1.34.6.1
diff -C2 -r1.34 -r1.34.6.1
*** sysconfig.py	2001/02/28 19:40:27	1.34
--- sysconfig.py	2001/07/07 22:55:28	1.34.6.1
***************
*** 340,344 ****
      g['INCLUDEPY'] = get_python_inc(plat_specific=0)
  
!     g['SO'] = '.ppc.slb'
  
      # XXX are these used anywhere?
--- 340,348 ----
      g['INCLUDEPY'] = get_python_inc(plat_specific=0)
  
!     import MacOS
!     if not hasattr(MacOS, 'runtimemodel'):
!         g['SO'] = '.ppc.slb'
!     else:
!         g['SO'] = '.%s.slb' % MacOS.runtimemodel
  
      # XXX are these used anywhere?