[Python-checkins] cpython: Issue #15188: Modify the OS X build_installer script to remove temporary
ned.deily
python-checkins at python.org
Sat Jul 21 19:52:02 CEST 2012
http://hg.python.org/cpython/rev/cd883160ad97
changeset: 78222:cd883160ad97
user: Ned Deily <nad at acm.org>
date: Sat Jul 21 10:48:09 2012 -0700
summary:
Issue #15188: Modify the OS X build_installer script to remove temporary
build paths from configuration variables cached in _sysconfigdata.py, as
is already done for the installed Makefile. This avoids a distuils test
case failure in test_ldshared_value.
files:
Mac/BuildScript/build-installer.py | 31 +++++++++++------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -900,19 +900,26 @@
# We added some directories to the search path during the configure
# phase. Remove those because those directories won't be there on
- # the end-users system.
- path =os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework',
- 'Versions', version, 'lib', 'python%s'%(version,),
- 'config' + config_suffix, 'Makefile')
- fp = open(path, 'r')
- data = fp.read()
- fp.close()
+ # the end-users system. Also remove the directories from _sysconfigdata.py
+ # (added in 3.3) if it exists.
- data = data.replace('-L%s/libraries/usr/local/lib'%(WORKDIR,), '')
- data = data.replace('-I%s/libraries/usr/local/include'%(WORKDIR,), '')
- fp = open(path, 'w')
- fp.write(data)
- fp.close()
+ path_to_lib = os.path.join(rootDir, 'Library', 'Frameworks',
+ 'Python.framework', 'Versions',
+ version, 'lib', 'python%s'%(version,))
+ paths = [os.path.join(path_to_lib, 'config' + config_suffix, 'Makefile'),
+ os.path.join(path_to_lib, '_sysconfigdata.py')]
+ for path in paths:
+ if not os.path.exists(path):
+ continue
+ fp = open(path, 'r')
+ data = fp.read()
+ fp.close()
+
+ data = data.replace('-L%s/libraries/usr/local/lib'%(WORKDIR,), '')
+ data = data.replace('-I%s/libraries/usr/local/include'%(WORKDIR,), '')
+ fp = open(path, 'w')
+ fp.write(data)
+ fp.close()
# Add symlinks in /usr/local/bin, using relative links
usr_local_bin = os.path.join(rootDir, 'usr', 'local', 'bin')
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list