[Python-checkins] python/dist/src/Mac/OSX Makefile,1.31,1.32 Mac.pth,1.1,1.2
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Mon, 30 Dec 2002 14:23:43 -0800
- Previous message: [Python-checkins] python/dist/src Makefile.pre.in,1.105,1.106 configure.in,1.380,1.381 configure,1.369,1.370
- Next message: [Python-checkins] python/dist/src/Include intobject.h,2.26,2.27 pythonrun.h,2.57,2.58
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Mac/OSX
In directory sc8-pr-cvs1:/tmp/cvs-serv9867/Mac/OSX
Modified Files:
Makefile Mac.pth
Log Message:
Adapted for the move of Mac/Lib to Lib/plat-mac. Makefile.pre.in now
knows about plat-mac subdirectories, and configure adds a variable
EXTRAPLATDIR. These together take care of copying Lib/plat-mac to
the destination on darwin.
Adding plat-mac is still done with a .pth file which is only created when
you do a framework build. I'm not 100% happy with this, but fixing it
really needs a functional pythonw in non-framework builds, and I don't
think I can do that before 2.3a1 (but I'll try:-).
Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Makefile 25 Dec 2002 22:31:28 -0000 1.31
--- Makefile 30 Dec 2002 22:23:40 -0000 1.32
***************
*** 136,160 ****
$(srcdir)/Mac/scripts/BuildApplet.py
! MACLIBDEST=$(prefix)/Mac/Lib
! MACLIBSRC=$(srcdir)/Mac/Lib
! MACLIBSUBDIRS= \
! Carbon \
! lib-scriptpackages \
! lib-scriptpackages/_builtinSuites \
! lib-scriptpackages/CodeWarrior \
! lib-scriptpackages/Explorer \
! lib-scriptpackages/Finder \
! lib-scriptpackages/Netscape \
! lib-scriptpackages/StdSuites \
! lib-scriptpackages/Terminal \
! mkcwproject \
! mkcwproject/template \
! mkcwproject/template-carbon \
! mkcwproject/template-ppc
MACTOOLSDEST=$(prefix)/Mac/Tools
MACTOOLSSRC=$(srcdir)/Mac/Tools
MACTOOLSSUBDIRS=IDE
installmacsubtree:
! @for i in $(MACLIBDEST) $(MACTOOLSDEST); \
do \
if test ! -d $$i; then \
--- 136,145 ----
$(srcdir)/Mac/scripts/BuildApplet.py
! MACLIBDEST=$(LIBDEST)/plat-mac
MACTOOLSDEST=$(prefix)/Mac/Tools
MACTOOLSSRC=$(srcdir)/Mac/Tools
MACTOOLSSUBDIRS=IDE
installmacsubtree:
! @for i in $(MACTOOLSDEST); \
do \
if test ! -d $$i; then \
***************
*** 164,221 ****
fi; \
done
- @for d in $(MACLIBSUBDIRS); \
- do \
- a=$(MACLIBSRC)/$$d; \
- if test ! -d $$a; then continue; else true; fi; \
- b=$(MACLIBDEST)/$$d; \
- if test ! -d $$b; then \
- echo "Creating directory $$b"; \
- $(INSTALL) -d -m $(DIRMODE) $$b; \
- else true; \
- fi; \
- done
- @for i in $(MACLIBSRC)/*.py; \
- do \
- if test -x $$i; then \
- $(INSTALL_SCRIPT) $$i $(MACLIBDEST); \
- echo $(INSTALL_SCRIPT) $$i $(MACLIBDEST); \
- else \
- $(INSTALL_DATA) $$i $(MACLIBDEST); \
- echo $(INSTALL_DATA) $$i $(MACLIBDEST); \
- fi; \
- done
- @for i in $(MACLIBSRC)/*.rsrc; \
- do \
- echo $(CPMAC) $$i $(MACLIBDEST) ; \
- $(CPMAC) $$i $(MACLIBDEST) ; \
- done
- @for d in $(MACLIBSUBDIRS); \
- do \
- a=$(MACLIBSRC)/$$d; \
- if test ! -d $$a; then continue; else true; fi; \
- b=$(MACLIBDEST)/$$d; \
- for i in $$a/*; \
- do \
- case $$i in \
- *CVS) ;; \
- *.py[co]) ;; \
- *.orig) ;; \
- *~) ;; \
- *.rsrc) \
- echo $(CPMAC) $$i $$b ; \
- $(CPMAC) $$i $$b ; \
- ;; \
- *) \
- if test -d $$i; then continue; fi; \
- if test -x $$i; then \
- echo $(INSTALL_SCRIPT) $$i $$b; \
- $(INSTALL_SCRIPT) $$i $$b; \
- else \
- echo $(INSTALL_DATA) $$i $$b; \
- $(INSTALL_DATA) $$i $$b; \
- fi;; \
- esac; \
- done; \
- done
@for d in $(MACTOOLSSUBDIRS); \
do \
--- 149,152 ----
***************
*** 261,266 ****
$(PYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST)
! $(PYTHON) -Wi -tt $(compileall) -x badsyntax $(MACLIBDEST) $(MACTOOLSDEST)
! $(PYTHON) -O -Wi -tt $(compileall) -x badsyntax $(MACLIBDEST) $(MACTOOLSDEST)
#
--- 192,197 ----
$(PYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST)
! $(PYTHON) -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
! $(PYTHON) -O -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
#
***************
*** 279,287 ****
echo "exec \"$(INSTALLED_PYTHONW)\" \"\$$@\"" >> pythonw.sh
$(INSTALL) pythonw.sh $(bindir)/pythonw
-
- # This is for development purposes: create a Mac.pth that refers to the source
- # directories
- dontinstallmacsubtree:
- l=`cd $(srcdir)/Mac/Lib; pwd`; \
- echo $$l > $(MACLIBDEST)/site-packages/Mac.pth ; \
- echo $$l/lib-scriptpackages >> $(MACLIBDEST)/site-packages/Mac.pth
--- 210,211 ----
Index: Mac.pth
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Mac.pth,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Mac.pth 21 Jun 2002 14:48:38 -0000 1.1
--- Mac.pth 30 Dec 2002 22:23:40 -0000 1.2
***************
*** 1,2 ****
! ../../../Mac/Lib
! ../../../Mac/Lib/lib-scriptpackages
--- 1,2 ----
! ../plat-mac
! ../plat-mac/lib-scriptpackages
- Previous message: [Python-checkins] python/dist/src Makefile.pre.in,1.105,1.106 configure.in,1.380,1.381 configure,1.369,1.370
- Next message: [Python-checkins] python/dist/src/Include intobject.h,2.26,2.27 pythonrun.h,2.57,2.58
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]