From b06bf685ea735d2eab01661c255f1ffaca2f0071 Mon Sep 17 00:00:00 2001 From: fgb Date: Tue, 22 Feb 2011 23:29:00 -0800 Subject: [PATCH 1/5] Updated libpng's download link since old one was broken. --- make.osx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.osx b/make.osx index 564b72a9d58f..de70ba5056a0 100644 --- a/make.osx +++ b/make.osx @@ -32,7 +32,7 @@ clean: fetch: ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://superb-sea2.dl.sourceforge.net/project/libpng/zlib/${ZLIBVERSION}/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\ - ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://sourceforge.net/projects/libpng/files/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz/download", "libpng-${PNGVERSION}.tar.gz")' &&\ + ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://sourceforge.net/projects/libpng/files/libpng12/older-releases/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz/download", "libpng-${PNGVERSION}.tar.gz")' &&\ ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")' From fa54ea93f63606f1d99b483e82580102d2382dd1 Mon Sep 17 00:00:00 2001 From: fgb Date: Tue, 22 Feb 2011 23:37:30 -0800 Subject: [PATCH 2/5] Updated zlibs's download link even though url was still valid. --- make.osx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.osx b/make.osx index de70ba5056a0..b4eb2d74fc62 100644 --- a/make.osx +++ b/make.osx @@ -31,7 +31,7 @@ clean: fetch: - ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://superb-sea2.dl.sourceforge.net/project/libpng/zlib/${ZLIBVERSION}/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\ + ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://sourceforge.net/projects/libpng/files/zlib/${ZLIBVERSION}/zlib-${ZLIBVERSION}.tar.gz/download", "zlib-${ZLIBVERSION}.tar.gz")' &&\ ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://sourceforge.net/projects/libpng/files/libpng12/older-releases/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz/download", "libpng-${PNGVERSION}.tar.gz")' &&\ ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")' From a82c7dd6c00ada8377e7f8b44ba1a11916a4f7aa Mon Sep 17 00:00:00 2001 From: fgb Date: Tue, 22 Feb 2011 23:45:44 -0800 Subject: [PATCH 3/5] Fixed clean: changed libpng's extension to gz and added some stray files from build process. --- make.osx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make.osx b/make.osx index b4eb2d74fc62..68cb397ff39b 100644 --- a/make.osx +++ b/make.osx @@ -22,9 +22,10 @@ LDFLAGS="-arch i386 -arch x86_64 -L${PREFIX}/lib -syslibroot,/Developer/SDKs/Mac FFLAGS="-arch i386 -arch x86_64" clean: - rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \ + rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.gz \ freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \ - bdist_mpkg-${BDISTMPKGVERSION} \ + bdist_mpkg-${BDISTMPKGVERSION} setupext.pyc \ + lib/matplotlib/mpl-data/matplotlib.conf lib/matplotlib/mpl-data/matplotlibrc \ zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \ build From ce1b43e45be092771eeee2345073178b19dbbf42 Mon Sep 17 00:00:00 2001 From: fgb Date: Tue, 22 Feb 2011 23:48:31 -0800 Subject: [PATCH 4/5] Suggesting PYVERSION be input in the command line Although a hard-coded PYVERSION=2.6 is safe for snow leopard, it might make more sense to leave it blank, defaulting to the 'python' command that takes precedence in the PATH. Also, suggesting in the documentation that it can be included in the command line might prompt users to choose the right version without having to edit the makefile. --- README.osx | 2 +- make.osx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.osx b/README.osx index b0f4ad45838b..226718b51744 100644 --- a/README.osx +++ b/README.osx @@ -9,5 +9,5 @@ lib, png or freetype on your system Example usage:: - PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install + PREFIX=/Users/jdhunter/dev [PYVERSION=2.6] make -f make.osx fetch deps mpl_install diff --git a/make.osx b/make.osx index 68cb397ff39b..b1a4df39ee4c 100644 --- a/make.osx +++ b/make.osx @@ -1,7 +1,6 @@ # build mpl into a local install dir with -# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install +# PREFIX=/Users/jdhunter/dev [PYVERSION=2.6] make -f make.osx fetch deps mpl_install -PYVERSION=2.6 PYTHON=python${PYVERSION} ZLIBVERSION=1.2.3 PNGVERSION=1.2.39 From 1d7797c1da5f38278aa50ffb0a2295f404a383c1 Mon Sep 17 00:00:00 2001 From: fgb Date: Tue, 22 Feb 2011 23:52:58 -0800 Subject: [PATCH 5/5] Removed the PREFIX from mpl_install in order to install into relevant site-packages. --- make.osx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make.osx b/make.osx index b1a4df39ee4c..b78abece692c 100644 --- a/make.osx +++ b/make.osx @@ -93,7 +93,7 @@ mpl_install: export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ export CFLAGS=${CFLAGS} &&\ export LDFLAGS=${LDFLAGS} &&\ - ${PYTHON} setup.py install --prefix=${PREFIX} + ${PYTHON} setup.py install binaries: