[Stackless-checkins] CVS: slpdev/src/2.2/src/Mac/OSX Makefile, 1.1.1.1, 1.2

Christian Tismer tismer at centera.de
Sat May 1 03:21:13 CEST 2004 

Update of /home/cvs/slpdev/src/2.2/src/Mac/OSX
In directory centera.de:/tmp/cvs-serv18709/src/Mac/OSX

Modified Files:
	Makefile 
Log Message:
initial patches from diffs (merge) plus a little Visual Studio

Index: Makefile
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Mac/OSX/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	9 May 2002 18:27:23 -0000	1.1.1.1
--- Makefile	1 May 2004 01:21:09 -0000	1.2
***************
*** 1,5 ****
--- 1,34 ----
+ <<<<<<< ../../2.2/src/./Mac/OSX/Makefile
  PYTHONBUILDDIR=../..
  INSTALLDIR=/Library/Frameworks/Python.framework/Versions/Current
  APPINSTALLDIR=/Applications/Python.app
+ =======
+ # This file can be invoked from the various frameworkinstall... targets in the 
+ # main Makefile. The next couple of variables are overridden on the 
+ # commandline in that case.
+ 
+ VERSION=2.3
+ builddir = ../..
+ srcdir = ../..
+ prefix=/Library/Frameworks/Stackless.framework/Versions/$(VERSION)
+ LIBDEST=$(prefix)/lib/python$(VERSION)
+ BUILDPYTHON=$(builddir)/python.exe
+ DESTDIR=
+ 
+ # For 10.2:
+ #PBXBUILD=pbxbuild
+ # For 10.3:
+ PBXBUILD=xcodebuild
+ 
+ # These are normally glimpsed from the previous set
+ bindir=/usr/local/bin
+ PYTHONAPPSPATH=/Applications/Stackless-$(VERSION)
+ PYTHONAPPSDIR=$(PYTHONAPPSPATH)
+ APPINSTALLDIR=$(prefix)/Resources/Stackless.app
+ 
+ # Variables for installing the "normal" unix binaries
+ INSTALLED_PYTHON=$(prefix)/bin/stackless
+ INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/Stackless
+ >>>>>>> ././Mac/OSX/Makefile
  
  # Items more-or-less copied from the main Makefile
***************
*** 8,11 ****
--- 37,41 ----
  INSTALL_PROGRAM=${INSTALL}
  INSTALL_SCRIPT= ${INSTALL_PROGRAM}
+ <<<<<<< ../../2.2/src/./Mac/OSX/Makefile
  INSTALL_DATA=	${INSTALL} -m 644
  OPT=-g -O3 -Wall -Wstrict-prototypes -no-cpp-precomp -fno-common -dynamic
***************
*** 39,42 ****
--- 69,116 ----
  			echo "Creating directory $$i"; \
  			$(INSTALL) -d -m $(DIRMODE) $$i; \
+ =======
+ INSTALL_DATA=	${INSTALL} -m ${FILEMODE}
+ LN=ln
+ STRIPFLAG=-s
+ ##OPT=-g -O3 -Wall -Wstrict-prototypes -Wno-long-double -no-cpp-precomp \
+ ##	-fno-common -dynamic
+ ##INCLUDES=-I$(builddir) -I$(srcdir)/Include -I$(srcdir)/Mac/Include
+ ##DEFINES=
+ ##
+ ##CFLAGS=$(OPT) $(DEFINES) $(INCLUDES)
+ ##LDFLAGS=-F$(builddir) -framework System -framework Stackless -framework Carbon \
+ ##	-framework Foundation
+ ##CC=cc
+ ##LD=cc
+ CPMAC=/Developer/Tools/CpMac
+ 
+ APPTEMPLATE=$(srcdir)/Mac/OSXResources/app
+ APPSUBDIRS=MacOS Resources Resources/English.lproj \
+ 	Resources/English.lproj/Documentation \
+ 	Resources/English.lproj/Documentation/doc \
+ 	Resources/English.lproj/Documentation/ide
+ DOCDIR=$(srcdir)/Mac/OSXResources/app/Resources/English.lproj/Documentation
+ DOCINDEX=$(DOCDIR)/"Documentation idx"
+ CACHERSRC=$(srcdir)/Mac/scripts/cachersrc.py
+ 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_PythonLauncher:
+ 	cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
+ 	$(PBXBUILD) -target PythonLauncher -buildstyle Deployment install \
+ 		DSTROOT=$(DESTDIR)/ INSTALL_PATH=$(PYTHONAPPSPATH)
+ 
+ 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 \
+ 			echo "Creating directory $(DESTDIR)$$i"; \
+ 			$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
+ >>>>>>> ././Mac/OSX/Makefile
  		fi;\
  	done
***************
*** 72,75 ****
--- 146,150 ----
  		done; \
  	done
+ <<<<<<< ../../2.2/src/./Mac/OSX/Makefile
  	$(INSTALL_PROGRAM) pythonforbundle $(APPINSTALLDIR)/Contents/MacOS/python
  	# Create a temporary version of the resources here
***************
*** 89,92 ****
--- 164,237 ----
  TOOLSSRC=$(PYTHONBUILDDIR)/Mac/Tools
  TOOLSSUBDIRS=IDE
+ =======
+ 	$(INSTALL_PROGRAM) $(STRIPFLAG) $(BUILDPYTHON) $(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/Stackless
+ 
+ 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 \
+ 			--plist $(srcdir)/Mac/Tools/IDE/PackageManager.plist \
+ 			--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 \
+ 			--iconfile $(srcdir)/Mac/Tools/IDE/PackageManager.icns \
+ 			--plist $(srcdir)/Mac/Tools/IDE/PackageManager.plist \
+ 			--creator Pimp build; \
+ 	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)/Lib/idlelib \
+ 			$(srcdir)/Lib/idlelib/idle ; \
+ 		$(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
+ 			--python $(INSTALLED_PYTHONW) \
+ 			--output $(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app \
+ 			--extra $(srcdir)/Lib/idlelib:Contents/Resources/idlelib \
+ 			$(srcdir)/Lib/idlelib/idle ; \
+ 	fi
+ 
+ 
+ install_BuildApplet:
+ 	$(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
+ 		--python $(INSTALLED_PYTHONW) \
+ 		--output $(DESTDIR)$(PYTHONAPPSDIR)/BuildApplet.app \
+ 		$(srcdir)/Mac/scripts/BuildApplet.py
+ 
+ MACLIBDEST=$(LIBDEST)/plat-mac
+ MACTOOLSDEST=$(prefix)/Mac/Tools
+ MACTOOLSSRC=$(srcdir)/Mac/Tools
+ MACTOOLSSUBDIRS=IDE
+ >>>>>>> ././Mac/OSX/Makefile
  installmacsubtree:
  	@for i in $(LIBDEST) $(TOOLSDEST); \
***************
*** 179,183 ****
--- 324,361 ----
  	done
  
+ <<<<<<< ../../2.2/src/./Mac/OSX/Makefile
  	@echo '** Copy the contents of sample_sitecustomize.py (or similar code) into'
  	@echo '**' $(INSTALLDIR)/lib/python2.2/sitecustomize.py
  	
+ =======
+ 
+ 	$(BUILDPYTHON) $(CACHERSRC) -v $(DESTDIR)$(MACLIBDEST) $(DESTDIR)$(MACTOOLSDEST)
+ 	$(BUILDPYTHON) -Wi -tt $(compileall) -d $(MACTOOLSDEST) -x badsyntax $(DESTDIR)$(MACTOOLSDEST)
+ 	$(BUILDPYTHON) -O -Wi -tt $(compileall) -d $(MACTOOLSDEST) -x badsyntax $(DESTDIR)$(MACTOOLSDEST)
+ 
+ #
+ # We use the full name here in stead of $(INSTALLED_PYTHONW), because
+ # the latter may be overridden by Makefile.jaguar when building for a pre-installed
+ # /usr/bin/python
+ $(APPINSTALLDIR)/Contents/MacOS/Stackless: install_Python
+ 
+ # $(INSTALLED_PYTHON) has to be done by the main Makefile, we cannot do that here.
+ # 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
+ 
+ installextras:
+ 	$(INSTALL) -d $(DESTDIR)$(PYTHONAPPSDIR)/Extras
+ 	$(INSTALL) $(srcdir)/Mac/OSX/Extras.ReadMe.txt $(DESTDIR)$(PYTHONAPPSDIR)/Extras/ReadMe
+ 	$(BUILDPYTHON) $(srcdir)/Mac/OSX/Extras.install.py $(srcdir)/Demo \
+ 		$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Demo
+ 	$(BUILDPYTHON) $(srcdir)/Mac/OSX/Extras.install.py $(srcdir)/Tools \
+ 		$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Tools
+ >>>>>>> ././Mac/OSX/Makefile


_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins

More information about the Stackless-checkins mailing list