[Python-checkins] python/dist/src/Lib/distutils mwerkscompiler.py,1.8,1.9 sysconfig.py,1.47,1.48
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
2002年6月26日 08:42:51 -0700
Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory usw-pr-cvs1:/tmp/cvs-serv15339
Modified Files:
mwerkscompiler.py sysconfig.py
Log Message:
Fixed various MacPython-specific issues found by attempting to use the standard core setup.py for MacPython.
Index: mwerkscompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/mwerkscompiler.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** mwerkscompiler.py 13 Jun 2002 17:27:13 -0000 1.8
--- mwerkscompiler.py 26 Jun 2002 15:42:49 -0000 1.9
***************
*** 162,166 ****
# Build the export file
exportfilename = os.path.join(build_temp, exportname)
! log.debug("\tCreate export file", exportfilename)
fp = open(exportfilename, 'w')
fp.write('%s\n'%export_symbols[0])
--- 162,166 ----
# Build the export file
exportfilename = os.path.join(build_temp, exportname)
! log.debug("\tCreate export file %s", exportfilename)
fp = open(exportfilename, 'w')
fp.write('%s\n'%export_symbols[0])
***************
*** 183,187 ****
# doesn't have a clue about our working directory.
xmlfilename = os.path.join(os.getcwd(), os.path.join(build_temp, xmlname))
! log.debug("\tCreate XML file", xmlfilename)
xmlbuilder = mkcwproject.cwxmlgen.ProjectBuilder(settings)
xmlbuilder.generate()
--- 183,187 ----
# doesn't have a clue about our working directory.
xmlfilename = os.path.join(os.getcwd(), os.path.join(build_temp, xmlname))
! log.debug("\tCreate XML file %s", xmlfilename)
xmlbuilder = mkcwproject.cwxmlgen.ProjectBuilder(settings)
xmlbuilder.generate()
***************
*** 192,196 ****
# Generate the project. Again a full pathname.
projectfilename = os.path.join(os.getcwd(), os.path.join(build_temp, projectname))
! log.debug('\tCreate project file', projectfilename)
mkcwproject.makeproject(xmlfilename, projectfilename)
# And build it
--- 192,196 ----
# Generate the project. Again a full pathname.
projectfilename = os.path.join(os.getcwd(), os.path.join(build_temp, projectname))
! log.debug('\tCreate project file %s', projectfilename)
mkcwproject.makeproject(xmlfilename, projectfilename)
# And build it
***************
*** 214,215 ****
--- 214,243 ----
components[i] = ''
return string.join(components, ':')
+
+ def library_dir_option (self, dir):
+ """Return the compiler option to add 'dir' to the list of
+ directories searched for libraries.
+ """
+ return # XXXX Not correct...
+
+ def runtime_library_dir_option (self, dir):
+ """Return the compiler option to add 'dir' to the list of
+ directories searched for runtime libraries.
+ """
+ # Nothing needed or Mwerks/Mac.
+ return
+
+ def library_option (self, lib):
+ """Return the compiler option to add 'dir' to the list of libraries
+ linked into the shared library or executable.
+ """
+ return
+
+ def find_library_file (self, dirs, lib, debug=0):
+ """Search the specified list of directories for a static or shared
+ library file 'lib' and return the full path to that file. If
+ 'debug' true, look for a debugging version (if that makes sense on
+ the current platform). Return None if 'lib' wasn't found in any of
+ the specified directories.
+ """
+ return 0
Index: sysconfig.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** sysconfig.py 4 Jun 2002 20:26:44 -0000 1.47
--- sysconfig.py 26 Jun 2002 15:42:49 -0000 1.48
***************
*** 67,71 ****
return os.path.join(prefix, "include")
elif os.name == "mac":
! return os.path.join(prefix, "Include")
elif os.name == "os2":
return os.path.join(prefix, "Include")
--- 67,74 ----
return os.path.join(prefix, "include")
elif os.name == "mac":
! if plat_specific:
! return os.path.join(prefix, "Mac", "Include")
! else:
! return os.path.join(prefix, "Include")
elif os.name == "os2":
return os.path.join(prefix, "Include")
***************
*** 404,407 ****
--- 407,412 ----
g['install_platlib'] = os.path.join(EXEC_PREFIX, "Mac", "Lib")
+ # These are used by the extension module build
+ g['srcdir'] = ':'
global _config_vars
_config_vars = g