Changeset 391 for python/trunk/Mac/Makefile.in

Timestamp:

Mar 19, 2014, 11:31:01 PM (12 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Mac/Makefile.in (modified) (9 diffs)

python/trunk/Mac/Makefile.in

@@ -16 +16 @@
 PYTHONFRAMEWORK=@PYTHONFRAMEWORK@
 PYTHONFRAMEWORKIDENTIFIER=@PYTHONFRAMEWORKIDENTIFIER@
-
+LIPO_32BIT_FLAGS=@LIPO_32BIT_FLAGS@
+CC=@CC@
+MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
+export MACOSX_DEPLOYMENT_TARGET
 
 # These are normally glimpsed from the previous set
 bindir=$(prefix)/bin
-PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION)
+PYTHONAPPSDIR=@FRAMEWORKINSTALLAPPSPREFIX@/$(PYTHONFRAMEWORK) $(VERSION)
 APPINSTALLDIR=$(prefix)/Resources/Python.app
 
@@ -36 +39 @@
 LN=@LN@
 STRIPFLAG=-s
-CPMAC=/Developer/Tools/CpMac
+CPMAC=CpMac
 
 APPTEMPLATE=$(srcdir)/Resources/app
-APPSUBDIRS=MacOS Resources Resources/English.lproj \
-        Resources/English.lproj/Documentation \
-        Resources/English.lproj/Documentation/doc \
-        Resources/English.lproj/Documentation/ide
-DOCDIR=$(srcdir)/Resources/app/Resources/English.lproj/Documentation
-DOCINDEX=$(DOCDIR)/"Documentation idx"
+APPSUBDIRS=MacOS Resources
 CACHERSRC=$(srcdir)/scripts/cachersrc.py
 compileall=$(srcdir)/../Lib/compileall.py
 
-installapps: install_Python install_BuildApplet install_PythonLauncher \
-        install_IDLE checkapplepython install_pythonw install_versionedtools
-
-installapps4way: install_Python4way install_BuildApplet install_PythonLauncher install_IDLE install_pythonw4way install_versionedtools
+installapps: install_Python install_pythonw install_BuildApplet install_PythonLauncher \
+        install_IDLE checkapplepython install_versionedtools
 
 
@@ -57 +53 @@
         $(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)"
         $(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/python$(VERSION)"
-        ln -sf python$(VERSION) "$(DESTDIR)$(prefix)/bin/python"
-        ln -sf pythonw$(VERSION) "$(DESTDIR)$(prefix)/bin/pythonw"
-
-
-# Install 3 variants of python/pythonw: 
-#       - 32-bit (i386 and ppc)
-#       - 64-bit (x86_64 and ppc64)
-#       - all    (all four architectures)
-#       - Make 'python' and 'pythonw' aliases for the 32-bit variant
-install_pythonw4way: pythonw-32 pythonw-64 pythonw
-        $(INSTALL_PROGRAM) $(STRIPFLAG) pythonw-64 "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)-64"
-        $(INSTALL_PROGRAM) $(STRIPFLAG) pythonw-64 "$(DESTDIR)$(prefix)/bin/python$(VERSION)-64"
-        ln -sf python$(VERSION)-64 "$(DESTDIR)$(prefix)/bin/python-64"
-        ln -sf pythonw$(VERSION)-64 "$(DESTDIR)$(prefix)/bin/pythonw-64"
-
-        $(INSTALL_PROGRAM) $(STRIPFLAG) pythonw-32 "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)-32"
-        $(INSTALL_PROGRAM) $(STRIPFLAG) pythonw-32 "$(DESTDIR)$(prefix)/bin/python$(VERSION)-32"
-        ln -sf python$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/python-32"
-        ln -sf pythonw$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/pythonw-32"
-
-        $(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)-all"
-        $(INSTALL_PROGRAM) $(STRIPFLAG) pythonw "$(DESTDIR)$(prefix)/bin/python$(VERSION)-all"
-        ln -sf python$(VERSION)-all "$(DESTDIR)$(prefix)/bin/python-all"
-        ln -sf pythonw$(VERSION)-all "$(DESTDIR)$(prefix)/bin/pythonw-all"
-
-        ln -sf pythonw$(VERSION)-32     "$(DESTDIR)$(prefix)/bin/pythonw$(VERSION)"
-        ln -sf python$(VERSION)-32      "$(DESTDIR)$(prefix)/bin/python$(VERSION)"
-        ln -sf pythonw$(VERSION)-32     "$(DESTDIR)$(prefix)/bin/pythonw"
-        ln -sf python$(VERSION)-32      "$(DESTDIR)$(prefix)/bin/python"
+        ln -sf python$(VERSION) "$(DESTDIR)$(prefix)/bin/python2"
+        ln -sf python2 "$(DESTDIR)$(prefix)/bin/python"
+        ln -sf pythonw$(VERSION) "$(DESTDIR)$(prefix)/bin/pythonw2"
+        ln -sf pythonw2 "$(DESTDIR)$(prefix)/bin/pythonw"
+ifneq ($(LIPO_32BIT_FLAGS),)
+        lipo $(LIPO_32BIT_FLAGS) -output $(DESTDIR)$(prefix)/bin/python$(VERSION)-32 pythonw
+        lipo $(LIPO_32BIT_FLAGS) -output $(DESTDIR)$(prefix)/bin/pythonw$(VERSION)-32 pythonw
+        ln -sf python$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/python2-32"
+        ln -sf python2-32 "$(DESTDIR)$(prefix)/bin/python-32"
+        ln -sf pythonw$(VERSION)-32 "$(DESTDIR)$(prefix)/bin/pythonw2-32"
+        ln -sf pythonw2-32 "$(DESTDIR)$(prefix)/bin/pythonw-32"
+endif
+
 
 #
@@ -95 +75 @@
                 $(INSTALL) -d -m $(DIRMODE) "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin" ;\
         fi
-        for fn in python pythonw idle pydoc python-config smtpd.py   \
+        for fn in python pythonw idle pydoc python-config smtpd.py 2to3 \
+                  python2 pythonw2 idle2 \
+                  pydoc2 python2-config smtpd2.py \
+                  2to3-2 \
                   python$(VERSION) pythonw$(VERSION) idle$(VERSION) \
-                  pydoc$(VERSION) python$(VERSION)-config smtpd$(VERSION).py ;\
+                  pydoc$(VERSION) python$(VERSION)-config smtpd$(VERSION).py \
+                  2to3-$(VERSION) ;\
         do \
                 ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
         done
-
-
-# TODO: install symlinks for -32, -64 and -all as well
-installunixtools4way: installunixtools
+ifneq ($(LIPO_32BIT_FLAGS),)
+        for fn in python-32 pythonw-32 \
+                  python2-32 pythonw2-32 \
+                  python$(VERSION)-32 pythonw$(VERSION)-32 ;\
+        do \
+                ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
+        done
+endif
 
 
@@ -119 +107 @@
                 ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
         done
-
-# TODO: -32, -64 and -all variants
-altinstallunixtools4way: altinstallunixtools
+ifneq ($(LIPO_32BIT_FLAGS),)
+        for fn in python$(VERSION)-32 pythonw$(VERSION)-32 ;\
+        do \
+                ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
+        done
+endif
+        ln -fs "$(prefix)/bin/2to3-$(VERSION)" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/2to3-$(VERSION)" ;\
 
 # By default most tools are installed without a version in their basename, to
@@ -134 +126 @@
                 fi ;\
                 mv "$(DESTDIR)$(prefix)/bin/$${fn}" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)"  ;\
-                ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}" ;\
-        done
-        if [ ! -h "$(DESTDIR)$(prefix)/bin/python-config" ]; then \
-                mv "$(DESTDIR)$(prefix)/bin/python-config" "$(DESTDIR)$(prefix)/bin/python$(VERSION)-config" ;\
-                ln -sf "python$(VERSION)-config" "$(DESTDIR)$(prefix)/bin/python-config" ; \
-        fi
+                ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}2" ;\
+                ln -sf "$${fn}2" "$(DESTDIR)$(prefix)/bin/$${fn}" ;\
+        done
         if [ ! -h "$(DESTDIR)$(prefix)/bin/smtpd.py" ]; then \
                 mv "$(DESTDIR)$(prefix)/bin/smtpd.py" "$(DESTDIR)$(prefix)/bin/smtpd$(VERSION).py"  ;\
-                ln -sf "smtpd$(VERSION).py" "$(DESTDIR)$(prefix)/bin/smtpd.py" ;\
+                ln -sf "smtpd$(VERSION).py" "$(DESTDIR)$(prefix)/bin/smtpd2.py" ;\
+                ln -sf "smtpd2.py" "$(DESTDIR)$(prefix)/bin/smtpd.py" ;\
+        fi
+        if [ ! -h "$(DESTDIR)$(prefix)/bin/2to3" ]; then \
+                mv "$(DESTDIR)$(prefix)/bin/2to3" "$(DESTDIR)$(prefix)/bin/2to3-$(VERSION)"  ;\
+                ln -sf "2to3-$(VERSION)" "$(DESTDIR)$(prefix)/bin/2to3-2" ;\
+                ln -sf "2to3-2" "$(DESTDIR)$(prefix)/bin/2to3" ;\
         fi
 
 
 pythonw: $(srcdir)/Tools/pythonw.c Makefile
-        $(CC) $(LDFLAGS) -o $@ $(srcdir)/Tools/pythonw.c \
-                -DPYTHONWEXECUTABLE='"$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)"'
-
-pythonw-32: $(srcdir)/Tools/pythonw.c Makefile
-        $(CC) $(subst -arch x86_64,,$(subst -arch ppc64,,$(LDFLAGS))) -o $@ @UNIVERSAL_ARCH32_FLAGS@ $(srcdir)/Tools/pythonw.c \
-                -DPYTHONWEXECUTABLE='"$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-32"'
-
-pythonw-64: $(srcdir)/Tools/pythonw.c Makefile
-        $(CC) $(subst -arch i386,,$(subst -arch ppc,,$(LDFLAGS))) -o $@ @UNIVERSAL_ARCH64_FLAGS@ $(srcdir)/Tools/pythonw.c \
-                -DPYTHONWEXECUTABLE='"$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-64"'
+        $(CC) $(LDFLAGS) -DPYTHONFRAMEWORK='"$(PYTHONFRAMEWORK)"' -o $@ $(srcdir)/Tools/pythonw.c -I.. -I$(srcdir)/../Include ../$(PYTHONFRAMEWORK).framework/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
 
 install_PythonLauncher:
@@ -162 +148 @@
 
 install_Python:
-        @if test ! -f $(DOCINDEX); then \
-                echo WARNING: you should run Apple Help Indexing Tool on $(DOCDIR); \
-        fi
         @for i in "$(PYTHONAPPSDIR)" "$(APPINSTALLDIR)" "$(APPINSTALLDIR)/Contents"; do \
                 if test ! -d "$(DESTDIR)$$i"; then \
@@ -215 +198 @@
         rm "$(DESTDIR)$(APPINSTALLDIR)/Contents/Info.plist.in"
 
-install_Python4way: install_Python
-        lipo  @LIPO_32BIT_FLAGS@ -output "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-32" "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)"
-        lipo  @LIPO_64BIT_FLAGS@ -output "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-64" "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)"
-
-
 
 install_IDLE:
@@ -225 +203 @@
 
 install_BuildApplet:
-        $(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) $(srcdir)/scripts/BuildApplet.py \
-                --destroot "$(DESTDIR)" \
-                --python=$(prefix)/Resources/Python.app/Contents/MacOS/$(PYTHONFRAMEWORK)`test -f "$(DESTDIR)$(prefix)/Resources/Python.app/Contents/MacOS/$(PYTHONFRAMEWORK)-32" && echo "-32"`  \
-                --output "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app" \
-                $(srcdir)/scripts/BuildApplet.py
+        if ! $(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) \
+                        -c 'import EasyDialogs' 2>/dev/null ; then \
+                echo "EasyDialogs not available in this Python - skipping Build Applet.app" ; \
+        else \
+                $(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) $(srcdir)/scripts/BuildApplet.py \
+                        --destroot "$(DESTDIR)" \
+                        --python=$(prefix)/Resources/Python.app/Contents/MacOS/Python \
+                        --output "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app" \
+                        $(srcdir)/scripts/BuildApplet.py && \
+                if [ -n "$(LIPO_32BIT_FLAGS)" ] ; then \
+                        rm "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app/Contents/MacOS/Python" && \
+                        lipo $(LIPO_32BIT_FLAGS) \
+                                -output "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app/Contents/MacOS/Python" \
+                                $(BUILDPYTHON) ; \
+                fi \
+        fi
 
 MACLIBDEST=$(LIBDEST)/plat-mac