diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2002-08-02 14:11:24 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2002-08-02 14:11:24 (GMT) |
| commit | 21ed16acbe0a8870f6833b7976f8b7e79452d21c (patch) | |
| tree | 3c2459f9d7dcbd73d633cbac0af301099da288d4 /Mac/OSX/Makefile | |
| parent | 94416e55d35e121a908fec30115a091f707c99e9 (diff) | |
| download | cpython-21ed16acbe0a8870f6833b7976f8b7e79452d21c.zip cpython-21ed16acbe0a8870f6833b7976f8b7e79452d21c.tar.gz cpython-21ed16acbe0a8870f6833b7976f8b7e79452d21c.tar.bz2 | |
Added one call to Py_Main(), for OSX framework builds only, that will get the
actual script to run in case we are running from an applet. If we are indeed
running an applet we skip the normal option processing leaving it all to the
applet code.
This allows us to get use the normal python binary in the Python.app bundle,
giving us all the normal command line options through PythonLauncher while
still allowing Python.app to be used as the template for building applets.
Consequently, pythonforbundle is gone, and Mac/Python/macmain.c isn't used
on OSX anymore.
Diffstat (limited to 'Mac/OSX/Makefile')
| -rw-r--r-- | Mac/OSX/Makefile | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile index daf9dfe..f505bc5 100644 --- a/Mac/OSX/Makefile +++ b/Mac/OSX/Makefile @@ -37,9 +37,6 @@ LD=cc REZ=/Developer/Tools/Rez DEREZ=/Developer/Tools/DeRez -OBJECTS=$(builddir)/Mac/Python/macmain.o \ - $(builddir)/Mac/Python/macgetargv.o - PYTHON=$(builddir)/python.exe APPTEMPLATE=$(srcdir)/Mac/OSXResources/app APPSUBDIRS=MacOS Resources Resources/English.lproj @@ -53,7 +50,7 @@ install_PythonLauncher: cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \ pbxbuild -target PythonLauncher -buildstyle Deployment DSTROOT=/ install -install_Python: pythonforbundle +install_Python: $(PYTHON) @for i in $(PYTHONAPPSDIR) $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \ if test ! -d $$i; then \ echo "Creating directory $$i"; \ @@ -91,7 +88,7 @@ install_Python: pythonforbundle esac; \ done; \ done - $(INSTALL_PROGRAM) $(STRIPFLAG) pythonforbundle $(APPINSTALLDIR)/Contents/MacOS/python + $(INSTALL_PROGRAM) $(STRIPFLAG) $(PYTHON) $(APPINSTALLDIR)/Contents/MacOS/python # Create a temporary version of the resources here $(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/dialogs.rsrc dialogs.rsrc $(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/errors.rsrc errors.rsrc @@ -231,14 +228,3 @@ dontinstallmacsubtree: l=`cd $(srcdir)/Mac/Lib; pwd`; \ echo $$l > $(prefix)/lib/python$(VERSION)/site-packages/Mac.pth ; \ echo $$l/lib-scriptpackages >> $(prefix)/lib/python$(VERSION)/site-packages/Mac.pth - -pythonforbundle: $(OBJECTS) - $(LD) $(LDFLAGS) $(OBJECTS) -o pythonforbundle - -# Rules to build each file in OBJECTS - is there a better way? -$(builddir)/Mac/Python/macmain.o: $(srcdir)/Mac/Python/macmain.c - $(CC) $(CFLAGS) -c $(srcdir)/Mac/Python/macmain.c -o $@ - -$(builddir)/Mac/Python/macgetargv.o: $(srcdir)/Mac/Python/macgetargv.c - $(CC) $(CFLAGS) -c $(srcdir)/Mac/Python/macgetargv.c -o $@ - |