mirror of
https://github.com/AdaCore/cpython.git
synced 2026-02-12 12:57:15 -08:00
Backported from the trunk:
- When doing a frameworkinstall test whether Apple's Python 2.3 may need fixing - Added quotes around destroot arguments.
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
# main Makefile. The next couple of variables are overridden on the
|
||||
# commandline in that case.
|
||||
|
||||
VERSION=2.5
|
||||
VERSION=2.4
|
||||
builddir = ../..
|
||||
srcdir = ../..
|
||||
prefix=/Library/Frameworks/Python.framework/Versions/$(VERSION)
|
||||
@@ -60,7 +60,7 @@ compileall=$(srcdir)/Lib/compileall.py
|
||||
bundlebuilder=$(srcdir)/Lib/plat-mac/bundlebuilder.py
|
||||
|
||||
installapps: install_PythonLauncher install_Python install_BuildApplet install_IDE \
|
||||
install_IDLE install_PackageManager
|
||||
install_IDLE install_PackageManager checkapplepython
|
||||
|
||||
install_PythonLauncher:
|
||||
cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
|
||||
@@ -120,12 +120,12 @@ install_IDE:
|
||||
echo See Mac/OSX/README for details; \
|
||||
else \
|
||||
echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
|
||||
--destroot $(DESTDIR) \
|
||||
--destroot "$(DESTDIR)" \
|
||||
--python $(INSTALLED_PYTHONW) \
|
||||
--output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \
|
||||
$(srcdir)/Mac/Tools/IDE/PythonIDE.py ; \
|
||||
$(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
|
||||
--destroot $(DESTDIR) \
|
||||
--destroot "$(DESTDIR)" \
|
||||
--python $(INSTALLED_PYTHONW) \
|
||||
--output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \
|
||||
$(srcdir)/Mac/Tools/IDE/PythonIDE.py; \
|
||||
@@ -138,7 +138,7 @@ install_PackageManager:
|
||||
else \
|
||||
echo $(BUILDPYTHON) $(bundlebuilder) \
|
||||
--builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \
|
||||
--destroot $(DESTDIR) \
|
||||
--destroot "$(DESTDIR)" \
|
||||
--python $(INSTALLED_PYTHONW) \
|
||||
--resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
|
||||
--mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
|
||||
@@ -146,7 +146,7 @@ install_PackageManager:
|
||||
--creator Pimp build; \
|
||||
$(BUILDPYTHON) $(bundlebuilder) \
|
||||
--builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \
|
||||
--destroot $(DESTDIR) \
|
||||
--destroot "$(DESTDIR)" \
|
||||
--python $(INSTALLED_PYTHONW) \
|
||||
--resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
|
||||
--mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
|
||||
@@ -161,13 +161,13 @@ install_IDLE:
|
||||
else \
|
||||
echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
|
||||
--python $(INSTALLED_PYTHONW) \
|
||||
--destroot $(DESTDIR) \
|
||||
--destroot "$(DESTDIR)" \
|
||||
--output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \
|
||||
--extra $(srcdir)/Lib/idlelib \
|
||||
$(srcdir)/Tools/scripts/idle ; \
|
||||
$(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
|
||||
--python $(INSTALLED_PYTHONW) \
|
||||
--destroot $(DESTDIR) \
|
||||
--destroot "$(DESTDIR)" \
|
||||
--output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \
|
||||
--extra $(srcdir)/Lib/idlelib:Contents/Resources/idlelib \
|
||||
$(srcdir)/Tools/scripts/idle ; \
|
||||
@@ -176,7 +176,7 @@ install_IDLE:
|
||||
|
||||
install_BuildApplet:
|
||||
$(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
|
||||
--destroot $(DESTDIR) \
|
||||
--destroot "$(DESTDIR)" \
|
||||
--python $(INSTALLED_PYTHONW) \
|
||||
--output $(DESTDIR)$(PYTHONAPPSDIR)/BuildApplet.app \
|
||||
$(srcdir)/Mac/scripts/BuildApplet.py
|
||||
@@ -264,3 +264,10 @@ installextras:
|
||||
$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Demo
|
||||
$(BUILDPYTHON) $(srcdir)/Mac/OSX/Extras.install.py $(srcdir)/Tools \
|
||||
$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Tools
|
||||
|
||||
checkapplepython:
|
||||
@if ! $(BUILDPYTHON) $(srcdir)/Mac/OSX/fixapplepython23.py -n; then \
|
||||
echo "* WARNING: Apple-installed Python 2.3 will have trouble building extensions from now on."; \
|
||||
echo "* WARNING: Run $(srcdir)/Mac/OSX/fixapplepython23.py with \"sudo\" to fix this."; \
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user