Commit 199a3d8f authored by Jack Jansen's avatar Jack Jansen

Pass DIRMODE and FILEMODE to Mac/OSX/Makefile on framework builds (and

honor them). Use this when building the MacOSX binary installer to
get group-writeable files.

Ths fix works for directories and executables, not for files just yet,
because of bug #735274.
parent 1a599bfa
...@@ -70,7 +70,7 @@ fi ...@@ -70,7 +70,7 @@ fi
$PYTHONSRC/configure --enable-framework=$INSTALLROOT/Library/Frameworks LDFLAGS=-Wl,-x $PYTHONSRC/configure --enable-framework=$INSTALLROOT/Library/Frameworks LDFLAGS=-Wl,-x
make make
make frameworkinstall make DIRMODE=775 EXEMODE=775 FILEMODE=664 frameworkinstall
if [ "$builddocs" = "y" -o "$builddocs" = "Y" ]; then if [ "$builddocs" = "y" -o "$builddocs" = "Y" ]; then
./python.exe $PYTHONSRC/Mac/OSX/setupDocs.py build ./python.exe $PYTHONSRC/Mac/OSX/setupDocs.py build
......
...@@ -22,11 +22,12 @@ INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/python ...@@ -22,11 +22,12 @@ INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/python
# Items more-or-less copied from the main Makefile # Items more-or-less copied from the main Makefile
DIRMODE=755 DIRMODE=755
FILEMODE=644
INSTALL=/usr/bin/install -c INSTALL=/usr/bin/install -c
INSTALL_SYMLINK=ln -fs INSTALL_SYMLINK=ln -fs
INSTALL_PROGRAM=${INSTALL} INSTALL_PROGRAM=${INSTALL}
INSTALL_SCRIPT= ${INSTALL_PROGRAM} INSTALL_SCRIPT= ${INSTALL_PROGRAM}
INSTALL_DATA= ${INSTALL} -m 644 INSTALL_DATA= ${INSTALL} -m ${FILEMODE}
LN=ln LN=ln
STRIPFLAG=-s STRIPFLAG=-s
##OPT=-g -O3 -Wall -Wstrict-prototypes -Wno-long-double -no-cpp-precomp \ ##OPT=-g -O3 -Wall -Wstrict-prototypes -Wno-long-double -no-cpp-precomp \
......
...@@ -853,18 +853,19 @@ frameworkinstallstructure: $(LDLIBRARY) ...@@ -853,18 +853,19 @@ 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) \ BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
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) \ BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
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
frameworkinstallunixtools: frameworkinstallunixtools:
$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installunixtools \ $(MAKE) -f $(srcdir)/Mac/OSX/Makefile installunixtools \
DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
srcdir=$(srcdir) builddir=. dstroot=$(PYTHONFRAMEWORKPREFIX)/../.. srcdir=$(srcdir) builddir=. dstroot=$(PYTHONFRAMEWORKPREFIX)/../..
# This installs IDLE # This installs IDLE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment