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

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

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

Log Message:
-----------
Merged revisions 7533 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint

........
  r7533 | jdh2358 | 2009-08-22 21:27:44 -0500 (Sat, 22 Aug 2009) | 1 line
  
  tweaks to os x
........

Modified Paths:
--------------
    trunk/matplotlib/Makefile
    trunk/matplotlib/make.osx

Added Paths:
-----------
    trunk/matplotlib/README.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-7531
   + /branches/mathtex:1-7263 /branches/v0_98_5_maint:1-7253 /branches/v0_99_maint:1-7533

Modified: trunk/matplotlib/Makefile
===================================================================
--- trunk/matplotlib/Makefile	2009-08-23 02:27:44 UTC (rev 7533)
+++ trunk/matplotlib/Makefile	2009-08-23 02:28:52 UTC (rev 7534)
@@ -28,10 +28,13 @@
 	tar cvfz pyback.tar.gz *.py lib src examples/*.py  unit/*.py
 
 
-build_osx105:
+_build_osx105:
 	CFLAGS="-Os -arch i386 -arch ppc" LDFLAGS="-Os -arch i386 -arch ppc" python setup.py build
 
+build_osx105:
+	echo "Use 'make -f fetch deps mpl_install instead'"
 
+
 jdh_doc_snapshot:
 	svn up;\
 	python setup.py install --prefix=~/dev;\

Copied: trunk/matplotlib/README.osx (from rev 7533, branches/v0_99_maint/README.osx)
===================================================================
--- trunk/matplotlib/README.osx	                        (rev 0)
+++ trunk/matplotlib/README.osx	2009-08-23 02:28:52 UTC (rev 7534)
@@ -0,0 +1,13 @@
+Build mpl on OSX has proven to be a nightmare because of all the
+different types of zlib, png and freetype that may be on your system.
+The recommended and supported way to build is to use the make.osx file
+in this directory.  This script requires you to set a PREFIX
+environment variable where you want to the install to go.  It will
+fetch the dependencies from a remove server and install them into your
+PREFIX dir, and then build mpl against them.  It should ignore any
+lib, png or freetype on your system
+
+Example usage::
+
+  PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
+

Modified: trunk/matplotlib/make.osx
===================================================================
--- trunk/matplotlib/make.osx	2009-08-23 02:27:44 UTC (rev 7533)
+++ trunk/matplotlib/make.osx	2009-08-23 02:28:52 UTC (rev 7534)
@@ -1,13 +1,11 @@
-PREFIX=/Users/jdh2358/dev
+# build mpl into a local install dir with 
+# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
+
 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
@@ -26,9 +24,9 @@
 	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")'
+	${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")'
 
 
 


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