Skip to content

Commit 08d6b40

Browse files
jdh2358jdh2358
committed
tagging for branch release candidate
svn path=/branches/v0_99_maint/; revision=8184
1 parent 28c1572 commit 08d6b40

File tree

5 files changed

+49
-35
lines changed

5 files changed

+49
-35
lines changed

‎lib/matplotlib/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"""
9090
from __future__ import generators
9191

92-
__version__ = '0.99.1.1'
92+
__version__ = '0.99.1.3rc1'
9393
__revision__ = '$Revision$'
9494
__date__ = '$Date$'
9595

‎lib/matplotlib/cbook.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020

2121
try:
2222
preferredencoding = locale.getpreferredencoding()
23-
except (ValueError, ImportError):
23+
except ValueError:
24+
preferredencoding = None
25+
except ImportError:
2426
preferredencoding = None
2527

2628
def unicode_safe(s):

‎make.osx‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,47 @@
1-
# build mpl into a local install dir with
1+
# build mpl into a local install dir with
22
# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
33

4-
MPLVERSION=0.99.1.1
54
PYVERSION=2.6
65
PYTHON=python${PYVERSION}
76
ZLIBVERSION=1.2.3
8-
PNGVERSION=1.2.33
9-
FREETYPEVERSION=2.3.7
10-
MACOSX_DEPLOYMENT_TARGET=10.4
7+
PNGVERSION=1.2.39
8+
FREETYPEVERSION=2.3.11
9+
MACOSX_DEPLOYMENT_TARGET=10.6
10+
OSX_SDK_VER=10.6
11+
ARCH_FLAGS="-arch i386-arch x86_64"
12+
1113

1214
## You shouldn't need to configure past this point
1315

16+
#PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
17+
#CFLAGS="${ARCH_FLAGS} -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
18+
#LDFLAGS="${ARCH_FLAGS} -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
1419

15-
CFLAGS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
16-
LDFLAGS="-arch i386 -arch ppc -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
20+
PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
21+
CFLAGS="-arch i386 -arch x86_64 -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
22+
LDFLAGS="-arch i386 -arch x86_64 -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
23+
FFLAGS="-arch i386 -arch x86_64"
1724

1825
clean:
1926
rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
2027
freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \
2128
bdist_mpkg-${BDISTMPKGVERSION} \
22-
zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION}
29+
zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
30+
build
31+
2332

2433
fetch:
2534
${PYTHON} -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\
26-
${PYTHON} -c 'import urllib; urllib.urlretrieve("http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2", "libpng-${PNGVERSION}.tar.bz2")' &&\
35+
${PYTHON} -c 'import urllib; urllib.urlretrieve("http://downloads.sourceforge.net/project/libpng/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz", "libpng-${PNGVERSION}.tar.gz")' &&\
2736
${PYTHON} -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'
2837

2938

3039

3140

3241
zlib:
33-
unset PKG_CONFIG_PATH &&\
42+
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
3443
rm -rf zlib-${ZLIBVERSION} &&\
35-
tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
44+
tar xvfj zlib-${ZLIBVERSION}.tar.gz &&\
3645
cd zlib-${ZLIBVERSION} &&\
3746
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
3847
export CFLAGS=${CFLAGS} &&\
@@ -42,9 +51,9 @@ zlib:
4251
unset MACOSX_DEPLOYMENT_TARGET
4352

4453
png: zlib
45-
unset PKG_CONFIG_PATH &&\
54+
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
4655
rm -rf libpng-${PNGVERSION} &&\
47-
tar xvfj libpng-${PNGVERSION}.tar.bz2
56+
tar xvfz libpng-${PNGVERSION}.tar.gz && \
4857
cd libpng-${PNGVERSION} &&\
4958
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
5059
export CFLAGS=${CFLAGS} &&\
@@ -56,7 +65,7 @@ png: zlib
5665

5766

5867
freetype: zlib
59-
unset PKG_CONFIG_PATH &&\
68+
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
6069
rm -rf ${FREETYPEVERSION} &&\
6170
tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
6271
cd freetype-${FREETYPEVERSION} &&\
@@ -73,12 +82,14 @@ deps: zlib png freetype
7382
echo 'all done'
7483

7584
mpl_build:
85+
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
7686
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
7787
export CFLAGS=${CFLAGS} &&\
7888
export LDFLAGS=${LDFLAGS} &&\
79-
${PYTHON} setup.py build
89+
${PYTHON} setup.py build
8090

8191
mpl_install:
92+
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
8293
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
8394
export CFLAGS=${CFLAGS} &&\
8495
export LDFLAGS=${LDFLAGS} &&\

‎release/osx/Makefile‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,26 @@ PYVERSION=2.6
22
PYTHON=python${PYVERSION}
33
SRCDIR=${PWD}
44
ZLIBVERSION=1.2.3
5-
PNGVERSION=1.2.33
5+
PNGVERSION=1.2.39
66
FREETYPEVERSION=2.3.7
7-
MPLVERSION=0.99.0
7+
MPLVERSION=0.99.1.3rc1
88
BDISTMPKGVERSION=0.4.4
99
MPLSRC=matplotlib-${MPLVERSION}
10-
MACOSX_DEPLOYMENT_TARGET=10.4
10+
OSX_SDK_VER=10.6
11+
MACOSX_DEPLOYMENT_TARGET=10.6
12+
BDIST_MPKG=/Users/jdh2358/dev/bin/bdist_mpkg
1113

1214
## You shouldn't need to configure past this point
1315

1416
CFLAGS="-Os -arch ppc -arch i386 -I${SRCDIR}/zlib-${ZLIBVERSION} -I${SRCDIR}/libpng-${PNGVERSION} -I${SRCDIR}/freetype-${FREETYPEVERSION}/include"
1517

1618
LDFLAGS="-arch ppc -arch i386 -L${SRCDIR}/zlib-${ZLIBVERSION} -L${SRCDIR}/libpng-${PNGVERSION} -L${SRCDIR}/freetype-${FREETYPEVERSION}"
1719

18-
CFLAGS_ZLIB="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
19-
LDFLAGS_ZLIB="-arch i386 -arch ppc -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
20+
CFLAGS_ZLIB="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
21+
LDFLAGS_ZLIB="-arch i386 -arch ppc -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
2022

21-
CFLAGS_DEPS="-arch i386 -arch ppc -I${SRCDIR}/zlib-${ZLIBVERSION} -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
22-
LDFLAGS_DEPS="-arch i386 -arch ppc -L${SRCDIR}/zlib-${ZLIBVERSION} -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
23+
CFLAGS_DEPS="-arch i386 -arch ppc -I${SRCDIR}/zlib-${ZLIBVERSION} -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
24+
LDFLAGS_DEPS="-arch i386 -arch ppc -L${SRCDIR}/zlib-${ZLIBVERSION} -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
2325

2426
clean:
2527
rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
@@ -29,12 +31,11 @@ clean:
2931
matplotlib-${MPLVERSION} *~
3032

3133
fetch:
32-
wget http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz &&\
33-
wget http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2 &&\
34-
wget http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2&&\
35-
wget http://pypi.python.org/packages/source/b/bdist_mpkg/bdist_mpkg-${BDISTMPKGVERSION}.tar.gz&&\
36-
tar xvfz bdist_mpkg-${BDISTMPKGVERSION}.tar.gz &&\
37-
echo "You need to to install bdist_mpkg-${BDISTMPKGVERSION} now"
34+
${PYTHON} -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\
35+
${PYTHON} -c 'import urllib; urllib.urlretrieve("http://downloads.sourceforge.net/project/libpng/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz", "libpng-${PNGVERSION}.tar.gz")' &&\
36+
${PYTHON} -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")' &&\
37+
${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")'
38+
3839

3940

4041

@@ -53,7 +54,7 @@ zlib:
5354
png: zlib
5455
unset PKG_CONFIG_PATH &&\
5556
rm -rf libpng-${PNGVERSION} &&\
56-
tar xvfj libpng-${PNGVERSION}.tar.bz2
57+
tar xvfz libpng-${PNGVERSION}.tar.gz &&\
5758
cd libpng-${PNGVERSION} &&\
5859
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
5960
export CFLAGS=${CFLAGS_DEPS} &&\
@@ -88,16 +89,16 @@ installers:
8889
cp ../data/setup.cfg ../data/ReadMe.txt . &&\
8990
export CFLAGS=${CFLAGS} &&\
9091
export LDFLAGS=${LDFLAGS} &&\
91-
/Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg --readme=ReadMe.txt &&\
92-
hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.dmg &&\
92+
${BDIST_MPKG} --readme=ReadMe.txt &&\
93+
hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${MACOSX_DEPLOYMENT_TARGET}.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${MACOSX_DEPLOYMENT_TARGET}.dmg &&\
9394
${PYTHON} setupegg.py bdist_egg
9495

9596
upload:
9697
rm -rf upload &&\
9798
mkdir upload &&\
9899
cp matplotlib-${MPLVERSION}.tar.gz upload/ &&\
99100
cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}_r0-py${PYVERSION}-macosx-10.3-fat.egg upload/matplotlib-${MPLVERSION}-macosx-py${PYVERSION}.egg &&\
100-
cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.zip upload/matplotlib-${MPLVERSION}-py${PYVERSION}-mpkg.zip&&\
101+
cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${MACOSX_DEPLOYMENT_TARGET}.zip upload/matplotlib-${MPLVERSION}-py${PYVERSION}-mpkg.zip&&\
101102
scp upload/* jdh2358@frs.sourceforge.net:uploads/
102103

103104
all:

‎release/osx/data/setup.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ dateutil = True
5454
#gtk = False
5555
#gtkagg = False
5656
tkagg = True
57-
wxagg = True
57+
wxagg = False
5858
macosx = True
5959

6060
[rc_options]

0 commit comments

Comments
 (0)