Revision: 8184
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8184&view=rev
Author: jdh2358
Date: 2010-03-09 15:41:30 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
tagging for branch release candidate
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/__init__.py
branches/v0_99_maint/lib/matplotlib/cbook.py
branches/v0_99_maint/make.osx
branches/v0_99_maint/release/osx/Makefile
branches/v0_99_maint/release/osx/data/setup.cfg
Modified: branches/v0_99_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/__init__.py 2010-03-09 14:19:49 UTC
(rev 8183)
+++ branches/v0_99_maint/lib/matplotlib/__init__.py 2010-03-09 15:41:30 UTC
(rev 8184)
@@ -89,7 +89,7 @@
"""
from __future__ import generators
-__version__ = '0.99.1.1'
+__version__ = '0.99.1.3rc1'
__revision__ = '$Revision$'
__date__ = '$Date$'
Modified: branches/v0_99_maint/lib/matplotlib/cbook.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/cbook.py 2010-03-09 14:19:49 UTC
(rev 8183)
+++ branches/v0_99_maint/lib/matplotlib/cbook.py 2010-03-09 15:41:30 UTC
(rev 8184)
@@ -20,8 +20,10 @@
try:
preferredencoding = locale.getpreferredencoding()
-except (ValueError, ImportError):
+except ValueError:
preferredencoding = None
+except ImportError:
+ preferredencoding = None
def unicode_safe(s):
if preferredencoding is None: return unicode(s)
Modified: branches/v0_99_maint/make.osx
===================================================================
--- branches/v0_99_maint/make.osx 2010-03-09 14:19:49 UTC (rev 8183)
+++ branches/v0_99_maint/make.osx 2010-03-09 15:41:30 UTC (rev 8184)
@@ -1,38 +1,47 @@
-# build mpl into a local install dir with
+# build mpl into a local install dir with
# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
-MPLVERSION=0.99.1.1
PYVERSION=2.6
PYTHON=python${PYVERSION}
ZLIBVERSION=1.2.3
-PNGVERSION=1.2.33
-FREETYPEVERSION=2.3.7
-MACOSX_DEPLOYMENT_TARGET=10.4
+PNGVERSION=1.2.39
+FREETYPEVERSION=2.3.11
+MACOSX_DEPLOYMENT_TARGET=10.6
+OSX_SDK_VER=10.6
+ARCH_FLAGS="-arch i386-arch x86_64"
+
## You shouldn't need to configure past this point
+#PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
+#CFLAGS="${ARCH_FLAGS} -I${PREFIX}/include -I${PREFIX}/include/freetype2
-isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+#LDFLAGS="${ARCH_FLAGS} -L${PREFIX}/lib
-syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
-CFLAGS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2
-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-LDFLAGS="-arch i386 -arch ppc -L${PREFIX}/lib
-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
+CFLAGS="-arch i386 -arch x86_64 -I${PREFIX}/include
-I${PREFIX}/include/freetype2 -isysroot
/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+LDFLAGS="-arch i386 -arch x86_64 -L${PREFIX}/lib
-syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+FFLAGS="-arch i386 -arch x86_64"
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}
+ zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
+ build
+
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://downloads.sourceforge.net/project/libpng/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz";,
"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")'
zlib:
- unset PKG_CONFIG_PATH &&\
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf zlib-${ZLIBVERSION} &&\
- tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
+ tar xvfj zlib-${ZLIBVERSION}.tar.gz &&\
cd zlib-${ZLIBVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
@@ -42,9 +51,9 @@
unset MACOSX_DEPLOYMENT_TARGET
png: zlib
- unset PKG_CONFIG_PATH &&\
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf libpng-${PNGVERSION} &&\
- tar xvfj libpng-${PNGVERSION}.tar.bz2
+ tar xvfz libpng-${PNGVERSION}.tar.gz && \
cd libpng-${PNGVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
@@ -56,7 +65,7 @@
freetype: zlib
- unset PKG_CONFIG_PATH &&\
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf ${FREETYPEVERSION} &&\
tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
cd freetype-${FREETYPEVERSION} &&\
@@ -73,12 +82,14 @@
echo 'all done'
mpl_build:
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
- ${PYTHON} setup.py build
+ ${PYTHON} setup.py build
mpl_install:
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
Modified: branches/v0_99_maint/release/osx/Makefile
===================================================================
--- branches/v0_99_maint/release/osx/Makefile 2010-03-09 14:19:49 UTC (rev
8183)
+++ branches/v0_99_maint/release/osx/Makefile 2010-03-09 15:41:30 UTC (rev
8184)
@@ -2,12 +2,14 @@
PYTHON=python${PYVERSION}
SRCDIR=${PWD}
ZLIBVERSION=1.2.3
-PNGVERSION=1.2.33
+PNGVERSION=1.2.39
FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0
+MPLVERSION=0.99.1.3rc1
BDISTMPKGVERSION=0.4.4
MPLSRC=matplotlib-${MPLVERSION}
-MACOSX_DEPLOYMENT_TARGET=10.4
+OSX_SDK_VER=10.6
+MACOSX_DEPLOYMENT_TARGET=10.6
+BDIST_MPKG=/Users/jdh2358/dev/bin/bdist_mpkg
## You shouldn't need to configure past this point
@@ -15,11 +17,11 @@
LDFLAGS="-arch ppc -arch i386 -L${SRCDIR}/zlib-${ZLIBVERSION}
-L${SRCDIR}/libpng-${PNGVERSION} -L${SRCDIR}/freetype-${FREETYPEVERSION}"
-CFLAGS_ZLIB="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-LDFLAGS_ZLIB="-arch i386 -arch ppc -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+CFLAGS_ZLIB="-arch i386 -arch ppc -isysroot
/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+LDFLAGS_ZLIB="-arch i386 -arch ppc
-syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
-CFLAGS_DEPS="-arch i386 -arch ppc -I${SRCDIR}/zlib-${ZLIBVERSION} -isysroot
/Developer/SDKs/MacOSX10.4u.sdk"
-LDFLAGS_DEPS="-arch i386 -arch ppc -L${SRCDIR}/zlib-${ZLIBVERSION}
-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+CFLAGS_DEPS="-arch i386 -arch ppc -I${SRCDIR}/zlib-${ZLIBVERSION} -isysroot
/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+LDFLAGS_DEPS="-arch i386 -arch ppc -L${SRCDIR}/zlib-${ZLIBVERSION}
-syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
clean:
rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
@@ -29,15 +31,14 @@
matplotlib-${MPLVERSION} *~
fetch:
- wget http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz &&\
- wget
http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2
&&\
- wget
http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2&&\
- wget
http://pypi.python.org/packages/source/b/bdist_mpkg/bdist_mpkg-${BDISTMPKGVERSION}.tar.gz&&\
- tar xvfz bdist_mpkg-${BDISTMPKGVERSION}.tar.gz &&\
- echo "You need to to install bdist_mpkg-${BDISTMPKGVERSION} now"
+ ${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://downloads.sourceforge.net/project/libpng/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz";,
"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")' &&\
+ ${PYTHON} -c 'import urllib;
urllib.urlretrieve("http://pypi.python.org/packages/source/b/bdist_mpkg/bdist_mpkg-${BDISTMPKGVERSION}.tar.gz";,
"bdist_mpkg-${BDISTMPKGVERSION}.tar.gz")'
+
zlib:
unset PKG_CONFIG_PATH &&\
rm -rf zlib-${ZLIBVERSION} &&\
@@ -53,7 +54,7 @@
png: zlib
unset PKG_CONFIG_PATH &&\
rm -rf libpng-${PNGVERSION} &&\
- tar xvfj libpng-${PNGVERSION}.tar.bz2
+ tar xvfz libpng-${PNGVERSION}.tar.gz &&\
cd libpng-${PNGVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS_DEPS} &&\
@@ -88,8 +89,8 @@
cp ../data/setup.cfg ../data/ReadMe.txt . &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
-
/Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg
--readme=ReadMe.txt &&\
- hdiutil create -srcdir
dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg
dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.dmg &&\
+ ${BDIST_MPKG} --readme=ReadMe.txt &&\
+ hdiutil create -srcdir
dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${MACOSX_DEPLOYMENT_TARGET}.mpkg
dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${MACOSX_DEPLOYMENT_TARGET}.dmg
&&\
${PYTHON} setupegg.py bdist_egg
upload:
@@ -97,7 +98,7 @@
mkdir upload &&\
cp matplotlib-${MPLVERSION}.tar.gz upload/ &&\
cp
matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}_r0-py${PYVERSION}-macosx-10.3-fat.egg
upload/matplotlib-${MPLVERSION}-macosx-py${PYVERSION}.egg &&\
- cp
matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.zip
upload/matplotlib-${MPLVERSION}-py${PYVERSION}-mpkg.zip&&\
+ cp
matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${MACOSX_DEPLOYMENT_TARGET}.zip
upload/matplotlib-${MPLVERSION}-py${PYVERSION}-mpkg.zip&&\
scp upload/* jdh2...@frs.sourceforge.net:uploads/
all:
Modified: branches/v0_99_maint/release/osx/data/setup.cfg
===================================================================
--- branches/v0_99_maint/release/osx/data/setup.cfg 2010-03-09 14:19:49 UTC
(rev 8183)
+++ branches/v0_99_maint/release/osx/data/setup.cfg 2010-03-09 15:41:30 UTC
(rev 8184)
@@ -54,7 +54,7 @@
#gtk = False
#gtkagg = False
tkagg = True
-wxagg = True
+wxagg = False
macosx = True
[rc_options]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
