Menu
▾
▴
SF.net SVN: matplotlib:[7358] branches/v0_99_maint
|
From: <jd...@us...> - 2009-08-05 02:29:21
|
Revision: 7358
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7358&view=rev
Author: jdh2358
Date: 2009-08-05 02:29:12 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
some fixes for osx builds on rc2
Modified Paths:
--------------
branches/v0_99_maint/doc/_templates/indexsidebar.html
branches/v0_99_maint/lib/matplotlib/__init__.py
branches/v0_99_maint/release/osx/Makefile
branches/v0_99_maint/release/osx/README.txt
Modified: branches/v0_99_maint/doc/_templates/indexsidebar.html
===================================================================
--- branches/v0_99_maint/doc/_templates/indexsidebar.html 2009-08-05 00:11:42 UTC (rev 7357)
+++ branches/v0_99_maint/doc/_templates/indexsidebar.html 2009-08-05 02:29:12 UTC (rev 7358)
@@ -3,7 +3,7 @@
<p>Please <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donate</a>
to support matplotlib development.</p>
-<p>A release candidate rc1 of matplotlib-0.99.0 is <a href="http://drop.io/xortel1#">available</a> for testing. Please post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>
+<p>A release candidate rc2 of matplotlib-0.99.0 is <a href="http://drop.io/xortel1#">available</a> for testing. Please post any bugs to the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>
</p>
<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">video lecture</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>Machine Learning Open Source Software</i></a>.
Modified: branches/v0_99_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/__init__.py 2009-08-05 00:11:42 UTC (rev 7357)
+++ branches/v0_99_maint/lib/matplotlib/__init__.py 2009-08-05 02:29:12 UTC (rev 7358)
@@ -89,7 +89,7 @@
"""
from __future__ import generators
-__version__ = '0.99.0.rc1'
+__version__ = '0.99.0.rc2'
__revision__ = '$Revision$'
__date__ = '$Date$'
Modified: branches/v0_99_maint/release/osx/Makefile
===================================================================
--- branches/v0_99_maint/release/osx/Makefile 2009-08-05 00:11:42 UTC (rev 7357)
+++ branches/v0_99_maint/release/osx/Makefile 2009-08-05 02:29:12 UTC (rev 7358)
@@ -1,10 +1,10 @@
-PYVERSION=2.6
+PYVERSION=2.5
PYTHON=python${PYVERSION}
SRCDIR=${PWD}
ZLIBVERSION=1.2.3
PNGVERSION=1.2.33
FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0.rc1
+MPLVERSION=0.99.0.rc2
BDISTMPKGVERSION=0.4.4
MPLSRC=matplotlib-${MPLVERSION}
MACOSX_DEPLOYMENT_TARGET=10.4
@@ -88,7 +88,7 @@
cp ../data/setup.cfg . &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
- bdist_mpkg &&\
+ /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg &&\
${PYTHON} setupegg.py bdist_egg &&\
cd dist && \
zip -ro matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5_mpkg.zip matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg
Modified: branches/v0_99_maint/release/osx/README.txt
===================================================================
--- branches/v0_99_maint/release/osx/README.txt 2009-08-05 00:11:42 UTC (rev 7357)
+++ branches/v0_99_maint/release/osx/README.txt 2009-08-05 02:29:12 UTC (rev 7358)
@@ -7,7 +7,7 @@
-------------
* :file:`bdist_mkpg` - the distutils.extension to build Installer.app
- mpkg installers.
+ mpkg installers.
* :file:`data` - some config files and patches needed for the build
@@ -19,16 +19,22 @@
How to build
--------------
-* You need a python framework build , numpy and wxpython to build the
+* You need a python framework build, numpy and wxpython to build the
mpl installers (wx requires this and we need wx to build the wxagg
- extension). You can get the three required dependencies as
- Installer apps, eg:
+ extension). I recommend building python from src as a framework build::
+ ./configure --enable-universalsdk --enable-framework
+ sudo make install
- http://www.python.org/ftp/python/2.6.2/python-2.6.2-macosx2009-04-16.dmg
- http://downloads.sourceforge.net/project/numpy/NumPy/1.3.0/numpy-1.3.0-py2.6-macosx10.5.dmg?use_mirror=voxel
- http://downloads.sourceforge.net/project/wxpython/wxPython/2.8.10.1/wxPython2.8-osx-unicode-2.8.10.1-universal-py2.6.dmg?use_mirror=voxel
+ and build numpy from src too since the 2.5 numpy installer doesn't work
+ with a python built from src::
+ sudo python setup.py install
+
+ you can use the pre-built installer for wx::
+
+ http://downloads.sourceforge.net/project/wxpython/wxPython/2.8.10.1/wxPython2.8-osx-unicode-2.8.10.1-universal-py2.6.dmg?use_mirror=voxel
+
* You need to make sure to unset PKG_CONFIG_PATH to make sure the
static linking below is respected. Otherwise the mpl build script
will dynamically link using the libs from pkgconfig if you have this
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
