some fixes for the binary builds

jdh2358 · jdh2358 · commit 100ad8b17cb7 · 2009-08-01T19:11:58.000Z
svn path=/branches/v0_99_maint/; revision=7329
diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst
@@ -287,11 +287,66 @@ official OS X version from `python.org
 <http://www.python.org/download/>`_.
 
 
+.. _install_osx_binaries:
+
+Installing OSX binaries
+-----------------------
+
+If you want to install matplotlib from one of the binary installers we
+build, you have two choices: a mpkg installer, which is a typical
+Installer.app, or an binary OSX egg, which you can install via
+setuptools easy_install.  
+
+The mkpg installer will have a "zip" extension, and will have a name
+like file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5.zip` depending on
+the python, matplotlib, and OSX versions.  You need to unzip this file
+using either the "unzip" command on OSX, or simply double clicking on
+it to run StuffIt Expander.  When you double click on the resultant
+mpkd directory, which will have a name like
+file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5.mpkg`, it will run the
+Installer.app, prompt you for a password if you need system wide
+installation privileges, and install to a directory like
+file:`/Library/Python/2.5/site-packages/`, again depedending on your
+python version.  This directory may not be in your python path, so you
+can test your installation with::
+
+  > python -c 'import matplotlib; print matplotlib.__version__, matplotlib.__file__'
+
+If you get an error like::
+
+    Traceback (most recent call last):
+      File "<string>", line 1, in <module>
+    ImportError: No module named matplotlib
+
+then you will need to set your PYTHONPATH, eg::
+
+    export PYTHONPATH=/Library/Python/2.5/site-packages:$PYTHONPATH 
+
+See also ref:`environment-variables`.
+
 .. _easy-install-osx-egg:
 
-easy_install from egg?
+easy_install from egg
 ------------------------------
 
+You can also us the eggs we build for OSX (see the `installation
+instructions
+<http://pypi.python.org/pypi/setuptools#cygwin-mac-os-x-linux-other>`_
+for easy_install if you do not have it on your system already).  You
+can try::
+
+    > easy_install matplotlib
+
+which should grab the latest egg from the sourceforge site, but the
+naming conventions for OSX eggs appear to be broken (see below) so
+there is no guarantee the right egg will be found.  We recommend you
+download the latest egg from our `download site
+<http://sourceforge.net/projects/matplotlib/files/>`_ directly to your
+harddrive, and manually install it with
+
+    > easy_install --install-dir=~/dev/lib/python2.5/site-packages/  matplotlib-0.99.0.rc1-py2.5-macosx-10.5-i386.egg 
+
+
 Some users have reported problems with the egg for 0.98 from the
 matplotlib download site, with ``easy_install``, getting an error::
 
diff --git a/doc/users/installing.rst b/doc/users/installing.rst
@@ -63,14 +63,17 @@ configuration details for you, so you can get up and running quickly::
 And a *voila*, a figure pops up.  But we are putting the cart ahead of
 the horse -- first we need to get matplotlib installed.  We provide
 prebuilt binaries for OS X and Windows on the matplotlib `download
-<http://sourceforge.net/project/showfiles.php?group_id=80706>`_ page.
-Click on the latest release of the "matplotlib" package, choose your
-python version (2.4 or 2.5) and your platform (macosx or win32) and
-you should be good to go.  If you have any problems, please check the
+<http://sourceforge.net/projects/matplotlib/files/>`_ page.  Click on
+the latest release of the "matplotlib" package, choose your python
+version (2.4 or 2.5) and your platform (macosx or win32) and you
+should be good to go.  If you have any problems, please check the
 :ref:`installing-faq`, google around a little bit, and post a question
 the `mailing list
 <http://sourceforge.net/project/showfiles.php?group_id=80706>`_.
 
+Instructions for installing our OSX binaries are found in the FAQ
+ref:`install_osx_binaries`.
+
 Note that when testing matplotlib installations from the interactive
 python console, there are some issues relating to user interface
 toolkits and interactive settings that are discussed in
diff --git a/release/osx/Makefile b/release/osx/Makefile
@@ -1,8 +1,10 @@
+PYTHON=python2.6
 SRCDIR=${PWD}
 ZLIBVERSION=1.2.3
 PNGVERSION=1.2.33
 FREETYPEVERSION=2.3.7
 MPLVERSION=0.99.0.rc1
+BDISTMPKGVERSION=0.4.4
 MPLSRC=matplotlib-${MPLVERSION}
 MACOSX_DEPLOYMENT_TARGET=10.4
 
@@ -20,19 +22,18 @@ LDFLAGS_DEPS="-arch i386 -arch ppc -L${SRCDIR}/zlib-${ZLIBVERSION} -syslibroot,/
 
 clean:
 	rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
-	freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-0.4.3.tar.gz \
-	bdist_mpkg-0.4.3 \
+	freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \
+	bdist_mpkg-${BDISTMPKGVERSION} \
 	zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
 	matplotlib-${MPLVERSION} *~
 
 fetch_deps:
 	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-0.4.3.tar.gz&&\
-	tar xvfz bdist_mpkg-0.4.3.tar.gz &&\
-	patch -p0 < data/bdist.patch
-	echo "You need to to install bdist_mpkg-0.4.3 now"
+	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"
 
 
 
@@ -87,7 +88,7 @@ installers:
 	export CFLAGS=${CFLAGS} &&\
 	export LDFLAGS=${LDFLAGS} &&\
 	bdist_mpkg &&\
-	python setupegg.py bdist_egg &&\
+	${PYTHON} setupegg.py bdist_egg &&\
 	cd dist && \
 	zip -ro matplotlib-${MPLVERSION}-py2.5-macosx10.5.zip matplotlib-${MPLVERSION}-py2.5-macosx10.5.mpkg
 
diff --git a/release/osx/README.txt b/release/osx/README.txt
@@ -7,9 +7,7 @@ Dir Contents
 -------------
 
 * :file:`bdist_mkpg` - the distutils.extension to build Installer.app
-  mpkg installers.  It is patched from the tarball with
-  file:`data/bdist.patch` because 0.4.3 is broken on OS X 10.5.
-  Instructions on how to patch and install are below
+  mpkg installers.  
 
 * :file:`data` - some config files and patches needed for the build
 
@@ -38,7 +36,7 @@ How to build
 
 * install the patched bdist_mpkg, that the fetch_deps step just created::
 
-      cd bdist_mpkg-0.4.3
+      cd bdist_mpkg-0.4.4
       sudo python setup.py install
 
 * build the dependencies::
@@ -64,7 +62,7 @@ Build the dependencies::
     cd release/osx/
     unset PKG_CONFIG_PATH
     make fetch_deps
-    cd bdist_mpkg-0.4.3
+    cd bdist_mpkg-0.4.4
     sudo python setup.py install
     cd ..
     make dependencies
