mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

In Mac OS X framework builds don't assume that the executable will be

Browse source 
called python.exe but actually pass it from the main Makefile to
Mac/OSX/Makefile. This makes framework builds work again on case
sensitive filesystems. Fixes bug #677753.
This commit is contained in:
Jack Jansen 2003-02-25 12:41:10 +00:00
parent dd8766a65b
commit 04087b56ec
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mac/OSX/Makefile
View file

@ -8,6 +8,7 @@ srcdir = ../..
dstroot=/. dstroot=/.
prefix=$(dstroot)/Library/Frameworks/Python.framework/Versions/$(VERSION) prefix=$(dstroot)/Library/Frameworks/Python.framework/Versions/$(VERSION)
LIBDEST=$(prefix)/lib/python$(VERSION) LIBDEST=$(prefix)/lib/python$(VERSION)
BUILDPYTHON=$(builddir)/python.exe
# These are normally glimpsed from the previous set # These are normally glimpsed from the previous set
bindir=$(dstroot)/usr/local/bin bindir=$(dstroot)/usr/local/bin
@ -41,7 +42,6 @@ STRIPFLAG=-s
##LD=cc ##LD=cc
CPMAC=/Developer/Tools/CpMac CPMAC=/Developer/Tools/CpMac
PYTHON=$(builddir)/python.exe
APPTEMPLATE=$(srcdir)/Mac/OSXResources/app APPTEMPLATE=$(srcdir)/Mac/OSXResources/app
APPSUBDIRS=MacOS Resources Resources/English.lproj APPSUBDIRS=MacOS Resources Resources/English.lproj
CACHERSRC=$(srcdir)/Mac/scripts/cachersrc.py CACHERSRC=$(srcdir)/Mac/scripts/cachersrc.py
@ -56,7 +56,7 @@ install_PythonLauncher:
pbxbuild -target PythonLauncher -buildstyle Deployment \ pbxbuild -target PythonLauncher -buildstyle Deployment \
DSTROOT=$(dstroot) INSTALL_PATH=$(PYTHONAPPSPATH) install DSTROOT=$(dstroot) INSTALL_PATH=$(PYTHONAPPSPATH) install
install_Python: $(PYTHON) install_Python:
@for i in $(PYTHONAPPSDIR) $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \ @for i in $(PYTHONAPPSDIR) $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
if test ! -d $$i; then \ if test ! -d $$i; then \
echo "Creating directory $$i"; \ echo "Creating directory $$i"; \
@ -94,7 +94,7 @@ install_Python: $(PYTHON)
esac; \ esac; \
done; \ done; \
done done
$(INSTALL_PROGRAM) $(STRIPFLAG) $(PYTHON) $(APPINSTALLDIR)/Contents/MacOS/python $(INSTALL_PROGRAM) $(STRIPFLAG) $(BUILDPYTHON) $(APPINSTALLDIR)/Contents/MacOS/python
# Finally create the documentation symlink # Finally create the documentation symlink
$(LN) -fsn ../../../../English.lproj/Documentation $(APPINSTALLDIR)/Contents/Resources/English.lproj/Documentation $(LN) -fsn ../../../../English.lproj/Documentation $(APPINSTALLDIR)/Contents/Resources/English.lproj/Documentation
@ -207,9 +207,9 @@ installmacsubtree:
$(INSTALL_DATA) $(PTHFILE) $(LIBDEST)/site-packages/ $(INSTALL_DATA) $(PTHFILE) $(LIBDEST)/site-packages/
$(PYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST) $(BUILDPYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST)
$(PYTHON) -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST) $(BUILDPYTHON) -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
$(PYTHON) -O -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST) $(BUILDPYTHON) -O -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
# #
# We use the full name here in stead of $(INSTALLED_PYTHONW), because # We use the full name here in stead of $(INSTALLED_PYTHONW), because

2
Makefile.pre.in
View file

@ -833,11 +833,13 @@ frameworkinstallstructure: $(LDLIBRARY)
# This installs Mac/Lib into the framework # This installs Mac/Lib into the framework
frameworkinstallmaclib: frameworkinstallmaclib:
$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \ $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \
BUILDPYTHON=./$(BUILDPYTHON) \
srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST) srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST)
# This installs the IDE, the Launcher and other apps into /Applications # This installs the IDE, the Launcher and other apps into /Applications
frameworkinstallapps: frameworkinstallapps:
$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \ $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
BUILDPYTHON=./$(BUILDPYTHON) \
srcdir=$(srcdir) builddir=. dstroot=$(PYTHONFRAMEWORKPREFIX)/../.. srcdir=$(srcdir) builddir=. dstroot=$(PYTHONFRAMEWORKPREFIX)/../..
# This install the unix python and pythonw tools in /usr/local/bin # This install the unix python and pythonw tools in /usr/local/bin