SF.net SVN: matplotlib:[7532] trunk/matplotlib

[<jd...@us...>]

Revision: 7532
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7532&view=rev
Author:   jdh2358
Date:     2009-08-23 02:16:27 +0000 (Sun, 23 Aug 2009)

Log Message:
-----------
Merged revisions 7519,7521-7523,7528-7530 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint

........
  r7519 | jouni | 2009-08-22 01:25:07 -0500 (Sat, 22 Aug 2009) | 2 lines
  
  Fix typos found by Marc Desmarais and Nicolas Pinto
........
  r7521 | jdh2358 | 2009-08-22 17:50:55 -0500 (Sat, 22 Aug 2009) | 1 line
  
  added Ariel's max install patch
........
  r7522 | jdh2358 | 2009-08-22 18:19:44 -0500 (Sat, 22 Aug 2009) | 1 line
  
  applied Ariel's mlab.cohere_pairs fixes
........
  r7523 | jdh2358 | 2009-08-22 18:20:30 -0500 (Sat, 22 Aug 2009) | 1 line
  
  fix osx epd formatting bug in rest
........
  r7528 | jdh2358 | 2009-08-22 20:50:21 -0500 (Sat, 22 Aug 2009) | 1 line
  
  added new makefile for osx builds
........
  r7529 | jdh2358 | 2009-08-22 21:10:46 -0500 (Sat, 22 Aug 2009) | 1 line
  
  removed darwin lookup in setupext -- use make.osx install
........
  r7530 | jdh2358 | 2009-08-22 21:10:59 -0500 (Sat, 22 Aug 2009) | 1 line
  
  removed darwin lookup in setupext -- use make.osx install
........

Modified Paths:
--------------
    trunk/matplotlib/setupext.py

Added Paths:
-----------
    trunk/matplotlib/make.osx

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7517
   + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7531

Copied: trunk/matplotlib/make.osx (from rev 7530, branches/v0_99_maint/make.osx)
===================================================================
--- trunk/matplotlib/make.osx	                        (rev 0)
+++ trunk/matplotlib/make.osx	2009-08-23 02:16:27 UTC (rev 7532)
@@ -0,0 +1,89 @@
+PREFIX=/Users/jdh2358/dev
+PYVERSION=2.6
+PYTHON=python${PYVERSION}
+SRCDIR=${PWD}
+ZLIBVERSION=1.2.3
+PNGVERSION=1.2.33
+FREETYPEVERSION=2.3.7
+MPLVERSION=0.99.0
+BDISTMPKGVERSION=0.4.4
+MPLSRC=matplotlib-${MPLVERSION}
+MACOSX_DEPLOYMENT_TARGET=10.4
+
+## You shouldn't need to configure past this point
+
+CFLAGS="-Os -arch ppc -arch i386 -I{$PREFIX}/include"
+
+LDFLAGS="-arch ppc -arch i386 -L${PREFIX}/lib"
+
+CFLAGS_DEPS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+LDFLAGS_DEPS="-arch i386 -arch ppc -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+
+clean:
+	rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
+	freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \
+	bdist_mpkg-${BDISTMPKGVERSION} \
+	zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} 
+
+fetch:
+	python -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")'  &&\
+	python -c 'import urllib; urllib.urlretrieve("http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2", "libpng-${PNGVERSION}.tar.bz2")' &&\
+	python -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'
+
+
+
+
+zlib:
+	unset PKG_CONFIG_PATH &&\
+	rm -rf zlib-${ZLIBVERSION} &&\
+	tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
+	cd zlib-${ZLIBVERSION} &&\
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	./configure --prefix=${PREFIX}&&\
+	MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS_DEPS} LDFLAGS=${LDFLAGS_DEPS} make -j3 install&& \
+	unset MACOSX_DEPLOYMENT_TARGET
+
+png: zlib
+	unset PKG_CONFIG_PATH &&\
+	rm -rf libpng-${PNGVERSION} &&\
+	tar xvfj libpng-${PNGVERSION}.tar.bz2
+	cd libpng-${PNGVERSION} &&\
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	./configure  --disable-dependency-tracking  --prefix=${PREFIX} &&\
+	make -j3 install&&\
+	cp .libs/libpng.a . &&\
+	unset MACOSX_DEPLOYMENT_TARGET
+
+
+freetype: zlib
+	unset PKG_CONFIG_PATH &&\
+	rm -rf ${FREETYPEVERSION} &&\
+	tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
+	cd freetype-${FREETYPEVERSION} &&\
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	./configure  --prefix=${PREFIX} &&\
+	make -j3 install &&\
+	cp objs/.libs/libfreetype.a .  &&\
+	unset MACOSX_DEPLOYMENT_TARGET
+
+
+deps: zlib png freetype
+	echo 'all done'
+
+mpl_build:
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	python setup.py build 
+
+mpl_install:
+	export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
+	export CFLAGS=${CFLAGS_DEPS} &&\
+	export LDFLAGS=${LDFLAGS_DEPS} &&\
+	python setup.py install --prefix=${PREFIX}

Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py	2009-08-23 02:13:35 UTC (rev 7531)
+++ trunk/matplotlib/setupext.py	2009-08-23 02:16:27 UTC (rev 7532)
@@ -50,8 +50,15 @@
     'linux2' : ['/usr/local', '/usr'],
     'linux'  : ['/usr/local', '/usr',],
     'cygwin' : ['/usr/local', '/usr',],
-    'darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
+    '_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
                 '/usr', '/sw'],
+    # it appears builds with darwin are broken because of all the
+    # different flags the deps can be compile with, so I am pushing
+    # people to :
+    #   make -f make.osx fetch deps mpl_build mpl_install
+
+    'darwin' : [],
+
     'freebsd4' : ['/usr/local', '/usr'],
     'freebsd5' : ['/usr/local', '/usr'],
     'freebsd6' : ['/usr/local', '/usr'],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.