[Python-checkins] python/dist/src/Mac/OSX Makefile,1.40,1.41
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Sun, 25 May 2003 15:01:34 -0700
Update of /cvsroot/python/python/dist/src/Mac/OSX
In directory sc8-pr-cvs1:/tmp/cvs-serv3700/Mac/OSX
Modified Files:
Makefile
Log Message:
Fixed the DESTDIR modifications to also allow MacOSX framework builds
to be installed to a different location. This should make the OSX binary
installer building a lot simpler.
Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Makefile 9 May 2003 15:08:39 -0000 1.40
--- Makefile 25 May 2003 22:01:32 -0000 1.41
***************
*** 6,18 ****
builddir = ../..
srcdir = ../..
! dstroot=/.
! prefix=$(dstroot)/Library/Frameworks/Python.framework/Versions/$(VERSION)
LIBDEST=$(prefix)/lib/python$(VERSION)
BUILDPYTHON=$(builddir)/python.exe
# These are normally glimpsed from the previous set
! bindir=$(dstroot)/usr/local/bin
PYTHONAPPSPATH=/Applications/MacPython-$(VERSION)
! PYTHONAPPSDIR=$(dstroot)$(PYTHONAPPSPATH)
APPINSTALLDIR=$(prefix)/Resources/Python.app
--- 6,18 ----
builddir = ../..
srcdir = ../..
! prefix=/Library/Frameworks/Python.framework/Versions/$(VERSION)
LIBDEST=$(prefix)/lib/python$(VERSION)
BUILDPYTHON=$(builddir)/python.exe
+ DESTDIR=
# These are normally glimpsed from the previous set
! bindir=/usr/local/bin
PYTHONAPPSPATH=/Applications/MacPython-$(VERSION)
! PYTHONAPPSDIR=$(PYTHONAPPSPATH)
APPINSTALLDIR=$(prefix)/Resources/Python.app
***************
*** 60,64 ****
cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
pbxbuild -target PythonLauncher -buildstyle Deployment \
! DSTROOT=$(dstroot) INSTALL_PATH=$(PYTHONAPPSPATH) install
install_Python:
--- 60,64 ----
cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
pbxbuild -target PythonLauncher -buildstyle Deployment \
! DSTROOT=$(DESTDIR) INSTALL_PATH=$(PYTHONAPPSPATH) install
install_Python:
***************
*** 67,79 ****
fi
@for i in $(PYTHONAPPSDIR) $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
! if test ! -d $$i; then \
! echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $$i; \
fi;\
done
@for i in $(APPSUBDIRS); do \
! if test ! -d $(APPINSTALLDIR)/Contents/$$i; then \
! echo "Creating directory $(APPINSTALLDIR)/Contents/$$i"; \
! $(INSTALL) -d -m $(DIRMODE) $(APPINSTALLDIR)/Contents/$$i; \
else true; \
fi; \
--- 67,79 ----
fi
@for i in $(PYTHONAPPSDIR) $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
! if test ! -d $(DESTDIR)$$i; then \
! echo "Creating directory $(DESTDIR)$$i"; \
! $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
fi;\
done
@for i in $(APPSUBDIRS); do \
! if test ! -d $(DESTDIR)$(APPINSTALLDIR)/Contents/$$i; then \
! echo "Creating directory $(DESTDIR)$(APPINSTALLDIR)/Contents/$$i"; \
! $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(APPINSTALLDIR)/Contents/$$i; \
else true; \
fi; \
***************
*** 83,87 ****
a=$(APPTEMPLATE)/$$d; \
if test ! -d $$a; then continue; else true; fi; \
! b=$(APPINSTALLDIR)/Contents/$$d; \
for i in $$a/*; \
do \
--- 83,87 ----
a=$(APPTEMPLATE)/$$d; \
if test ! -d $$a; then continue; else true; fi; \
! b=$(DESTDIR)$(APPINSTALLDIR)/Contents/$$d; \
for i in $$a/*; \
do \
***************
*** 107,138 ****
done; \
done
! $(INSTALL_PROGRAM) $(STRIPFLAG) $(BUILDPYTHON) $(APPINSTALLDIR)/Contents/MacOS/python
! install_IDE: $(INSTALLED_PYTHONW)
! @if ! $(INSTALLED_PYTHONW) -c "import waste"; then \
echo PythonIDE needs the \"waste\" extension module; \
echo See Mac/OSX/README for details; \
else \
! echo $(INSTALLED_PYTHONW) $(srcdir)/Mac/scripts/BuildApplet.py \
! --output $(PYTHONAPPSDIR)/PythonIDE.app --noargv \
$(srcdir)/Mac/Tools/IDE/PythonIDE.py ; \
! $(INSTALLED_PYTHONW) $(srcdir)/Mac/scripts/BuildApplet.py \
! --output $(PYTHONAPPSDIR)/PythonIDE.app --noargv \
$(srcdir)/Mac/Tools/IDE/PythonIDE.py; \
fi
! install_PackageManager: $(INSTALLED_PYTHONW)
! @if ! $(INSTALLED_PYTHONW) -c "import waste"; then \
echo PackageManager needs the \"waste\" extension module; \
echo See Mac/OSX/README for details; \
else \
! echo $(INSTALLED_PYTHONW) $(bundlebuilder) \
! --builddir $(PYTHONAPPSDIR)/ \
--resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
--mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
--iconfile $(srcdir)/Mac/Tools/IDE/PackageManager.icns \
--creator Pimp build; \
! $(INSTALLED_PYTHONW) $(bundlebuilder) \
! --builddir $(PYTHONAPPSDIR)/ \
--resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
--mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
--- 107,142 ----
done; \
done
! $(INSTALL_PROGRAM) $(STRIPFLAG) $(BUILDPYTHON) $(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/python
! install_IDE:
! @if ! $(BUILDPYTHON) -c "import waste"; then \
echo PythonIDE needs the \"waste\" extension module; \
echo See Mac/OSX/README for details; \
else \
! echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
! --python $(INSTALLED_PYTHONW) \
! --output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \
$(srcdir)/Mac/Tools/IDE/PythonIDE.py ; \
! $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
! --python $(INSTALLED_PYTHONW) \
! --output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \
$(srcdir)/Mac/Tools/IDE/PythonIDE.py; \
fi
! install_PackageManager:
! @if ! $(BUILDPYTHON) -c "import waste"; then \
echo PackageManager needs the \"waste\" extension module; \
echo See Mac/OSX/README for details; \
else \
! echo $(BUILDPYTHON) $(bundlebuilder) \
! --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \
! --python $(INSTALLED_PYTHONW) \
--resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
--mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
--iconfile $(srcdir)/Mac/Tools/IDE/PackageManager.icns \
--creator Pimp build; \
! $(BUILDPYTHON) $(bundlebuilder) \
! --builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \
! --python $(INSTALLED_PYTHONW) \
--resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
--mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
***************
*** 141,155 ****
fi
! install_IDLE: $(INSTALLED_PYTHONW)
! @if ! $(INSTALLED_PYTHONW) -c "import _tkinter"; then \
echo IDLE needs the \"Tkinter\" extension module; \
echo See Mac/OSX/README for details; \
else \
! echo $(INSTALLED_PYTHONW) $(srcdir)/Mac/scripts/BuildApplet.py \
! --output $(PYTHONAPPSDIR)/IDLE.app \
--extra $(srcdir)/Tools/idle \
$(srcdir)/Tools/idle/idle ; \
! $(INSTALLED_PYTHONW) $(srcdir)/Mac/scripts/BuildApplet.py \
! --output $(PYTHONAPPSDIR)/IDLE.app \
--extra $(srcdir)/Tools/idle:Contents/Resources/idlelib \
$(srcdir)/Tools/idle/idle ; \
--- 145,161 ----
fi
! install_IDLE:
! @if ! $(BUILDPYTHON) -c "import _tkinter"; then \
echo IDLE needs the \"Tkinter\" extension module; \
echo See Mac/OSX/README for details; \
else \
! echo $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
! --python $(INSTALLED_PYTHONW) \
! --output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \
--extra $(srcdir)/Tools/idle \
$(srcdir)/Tools/idle/idle ; \
! $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
! --python $(INSTALLED_PYTHONW) \
! --output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \
--extra $(srcdir)/Tools/idle:Contents/Resources/idlelib \
$(srcdir)/Tools/idle/idle ; \
***************
*** 157,163 ****
! install_BuildApplet: $(INSTALLED_PYTHONW)
! $(INSTALLED_PYTHONW) $(srcdir)/Mac/scripts/BuildApplet.py \
! --output $(PYTHONAPPSDIR)/BuildApplet.app \
$(srcdir)/Mac/scripts/BuildApplet.py
--- 163,170 ----
! install_BuildApplet:
! $(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
! --python $(INSTALLED_PYTHONW) \
! --output $(DESTDIR)$(PYTHONAPPSDIR)/BuildApplet.app \
$(srcdir)/Mac/scripts/BuildApplet.py
***************
*** 169,175 ****
@for i in $(MACTOOLSDEST); \
do \
! if test ! -d $$i; then \
! echo "Creating directory $$i"; \
! $(INSTALL) -d -m $(DIRMODE) $$i; \
else true; \
fi; \
--- 176,182 ----
@for i in $(MACTOOLSDEST); \
do \
! if test ! -d $(DESTDIR)$$i; then \
! echo "Creating directory $(DESTDIR)$$i"; \
! $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
else true; \
fi; \
***************
*** 179,183 ****
a=$(MACTOOLSSRC)/$$d; \
if test ! -d $$a; then continue; else true; fi; \
! b=$(MACTOOLSDEST)/$$d; \
if test ! -d $$b; then \
echo "Creating directory $$b"; \
--- 186,190 ----
a=$(MACTOOLSSRC)/$$d; \
if test ! -d $$a; then continue; else true; fi; \
! b=$(DESTDIR)$(MACTOOLSDEST)/$$d; \
if test ! -d $$b; then \
echo "Creating directory $$b"; \
***************
*** 190,194 ****
a=$(MACTOOLSSRC)/$$d; \
if test ! -d $$a; then continue; else true; fi; \
! b=$(MACTOOLSDEST)/$$d; \
for i in $$a/*; \
do \
--- 197,201 ----
a=$(MACTOOLSSRC)/$$d; \
if test ! -d $$a; then continue; else true; fi; \
! b=$(DESTDIR)$(MACTOOLSDEST)/$$d; \
for i in $$a/*; \
do \
***************
*** 216,222 ****
! $(BUILDPYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST)
! $(BUILDPYTHON) -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
! $(BUILDPYTHON) -O -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
#
--- 223,229 ----
! $(BUILDPYTHON) $(CACHERSRC) -v $(DESTDIR)$(MACLIBDEST) $(DESTDIR)$(MACTOOLSDEST)
! $(BUILDPYTHON) -Wi -tt $(compileall) -x badsyntax $(DESTDIR)$(MACTOOLSDEST)
! $(BUILDPYTHON) -O -Wi -tt $(compileall) -x badsyntax $(DESTDIR)$(MACTOOLSDEST)
#
***************
*** 229,238 ****
# At least this rule will give an error if it doesn't exist.
! installunixtools: $(INSTALLED_PYTHON) $(INSTALLED_PYTHONW)
! $(INSTALL) -d $(bindir)
! $(INSTALL_SYMLINK) $(INSTALLED_PYTHON) $(bindir)/python$(VERSION)
! $(INSTALL_SYMLINK) python$(VERSION) $(bindir)/python
echo "#!/bin/sh" > pythonw.sh
echo "exec \"$(INSTALLED_PYTHONW)\" \"\$$@\"" >> pythonw.sh
! $(INSTALL) pythonw.sh $(bindir)/pythonw$(VERSION)
! $(INSTALL_SYMLINK) pythonw$(VERSION) $(bindir)/pythonw
--- 236,245 ----
# At least this rule will give an error if it doesn't exist.
! installunixtools:
! $(INSTALL) -d $(DESTDIR)$(bindir)
! $(INSTALL_SYMLINK) $(INSTALLED_PYTHON) $(DESTDIR)$(bindir)/python$(VERSION)
! $(INSTALL_SYMLINK) python$(VERSION) $(DESTDIR)$(bindir)/python
echo "#!/bin/sh" > pythonw.sh
echo "exec \"$(INSTALLED_PYTHONW)\" \"\$$@\"" >> pythonw.sh
! $(INSTALL) pythonw.sh $(DESTDIR)$(bindir)/pythonw$(VERSION)
! $(INSTALL_SYMLINK) pythonw$(VERSION) $(DESTDIR)$(bindir)/pythonw