date:20100309

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

2010-03-09 Thread jdh2358

Revision: 8183
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8183&view=rev
Author:   jdh2358
Date: 2010-03-09 14:19:49 + (Tue, 09 Mar 2010)

Log Message:
---
update make.osx to build on 10.6

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

Modified: trunk/matplotlib/make.osx
===
--- trunk/matplotlib/make.osx   2010-03-08 18:33:04 UTC (rev 8182)
+++ trunk/matplotlib/make.osx   2010-03-09 14:19:49 UTC (rev 8183)
@@ -4,17 +4,22 @@
 PYVERSION=2.6
 PYTHON=python${PYVERSION}
 ZLIBVERSION=1.2.3
-PNGVERSION=1.2.40
+PNGVERSION=1.2.39
 FREETYPEVERSION=2.3.11
-MACOSX_DEPLOYMENT_TARGET=10.4
-OSX_SDK_VER=10.4u
-ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
+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"
+
 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 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 \
@@ -23,9 +28,10 @@
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://download.sourceforge.net/libpng/libpng-${PNGVERSION}.tar.gz";,
 "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")'
 
 
@@ -34,7 +40,7 @@
 zlib:
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} &&\
@@ -46,7 +52,7 @@
 png: zlib
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf libpng-${PNGVERSION} &&\
-   tar xvfz libpng-${PNGVERSION}.tar.gz
+   tar xvfz libpng-${PNGVERSION}.tar.gz && \
cd libpng-${PNGVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\

Modified: trunk/matplotlib/release/osx/Makefile
===
--- trunk/matplotlib/release/osx/Makefile   2010-03-08 18:33:04 UTC (rev 
8182)
+++ trunk/matplotlib/release/osx/Makefile   2010-03-09 14:19:49 UTC (rev 
8183)
@@ -4,7 +4,7 @@
 ZLIBVERSION=1.2.3
 PNGVERSION=1.2.33
 FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0
+MPLVERSION=1.0
 BDISTMPKGVERSION=0.4.4
 MPLSRC=matplotlib-${MPLVERSION}
 MACOSX_DEPLOYMENT_TARGET=10.4


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
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[8184] branches/v0_99_maint

2010-03-09 Thread jdh2358

Revision: 8184
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8184&view=rev
Author:   jdh2358
Date: 2010-03-09 15:41:30 + (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.py2010-03-09 14:19:49 UTC 
(rev 8183)
+++ branches/v0_99_maint/lib/matplotlib/cbook.py2010-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

SF.net SVN: matplotlib:[8185] branches/v0_99_maint

2010-03-09 Thread jdh2358

Revision: 8185
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8185&view=rev
Author:   jdh2358
Date: 2010-03-09 15:44:16 + (Tue, 09 Mar 2010)

Log Message:
---
remove micromicro version num

Modified Paths:
--
branches/v0_99_maint/lib/matplotlib/__init__.py
branches/v0_99_maint/release/osx/Makefile

Modified: branches/v0_99_maint/lib/matplotlib/__init__.py
===
--- branches/v0_99_maint/lib/matplotlib/__init__.py 2010-03-09 15:41:30 UTC 
(rev 8184)
+++ branches/v0_99_maint/lib/matplotlib/__init__.py 2010-03-09 15:44:16 UTC 
(rev 8185)
@@ -89,7 +89,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.99.1.3rc1'
+__version__  = '0.99.3rc1'
 __revision__ = '$Revision$'
 __date__ = '$Date$'
 

Modified: branches/v0_99_maint/release/osx/Makefile
===
--- branches/v0_99_maint/release/osx/Makefile   2010-03-09 15:41:30 UTC (rev 
8184)
+++ branches/v0_99_maint/release/osx/Makefile   2010-03-09 15:44:16 UTC (rev 
8185)
@@ -4,7 +4,7 @@
 ZLIBVERSION=1.2.3
 PNGVERSION=1.2.39
 FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.1.3rc1
+MPLVERSION=0.99.3rc1
 BDISTMPKGVERSION=0.4.4
 MPLSRC=matplotlib-${MPLVERSION}
 OSX_SDK_VER=10.6


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
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

SF.net SVN: matplotlib:[8186] trunk/matplotlib/ttconv/pprdrv_tt.cpp

2010-03-09 Thread mdboom

Revision: 8186
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8186&view=rev
Author:   mdboom
Date: 2010-03-09 21:09:51 + (Tue, 09 Mar 2010)

Log Message:
---
Fix PS Type 3 font output -- the custom encoding seems to cause more trouble 
than it's worth.

Modified Paths:
--
trunk/matplotlib/ttconv/pprdrv_tt.cpp

Modified: trunk/matplotlib/ttconv/pprdrv_tt.cpp
===
--- trunk/matplotlib/ttconv/pprdrv_tt.cpp   2010-03-09 15:44:16 UTC (rev 
8185)
+++ trunk/matplotlib/ttconv/pprdrv_tt.cpp   2010-03-09 21:09:51 UTC (rev 
8186)
@@ -420,19 +420,21 @@
 -*/
 void ttfont_encoding(TTStreamWriter& stream, struct TTFONT *font, 
std::vector& glyph_ids, font_type_enum target_type)
 {
-if (target_type == PS_TYPE_3) {
-stream.printf("/Encoding [ ");
+stream.putline("/Encoding ISOLatin1Encoding def");
 
-for (std::vector::const_iterator i = glyph_ids.begin();
- i != glyph_ids.end(); ++i) {
-const char* name = ttfont_CharStrings_getname(font, *i);
-stream.printf("/%s ", name);
-}
+// if (target_type == PS_TYPE_3) {
+// stream.printf("/Encoding [ ");
 
-stream.printf("] def\n");
-} else {
-stream.putline("/Encoding StandardEncoding def");
-}
+// for (std::vector::const_iterator i = glyph_ids.begin();
+//  i != glyph_ids.end(); ++i) {
+// const char* name = ttfont_CharStrings_getname(font, *i);
+// stream.printf("/%s ", name);
+// }
+
+// stream.printf("] def\n");
+// } else {
+// stream.putline("/Encoding StandardEncoding def");
+// }
 } /* end of ttfont_encoding() */
 
 /*---


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
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

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

SF.net SVN: matplotlib:[8184] branches/v0_99_maint

SF.net SVN: matplotlib:[8185] branches/v0_99_maint

SF.net SVN: matplotlib:[8186] trunk/matplotlib/ttconv/pprdrv_tt.cpp

4 matches

Site Navigation

Mail list logo

Footer information