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

[<jd...@us...>]

Revision: 7330
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7330&view=rev
Author:   jdh2358
Date:     2009-08-01 19:27:43 +0000 (Sat, 01 Aug 2009)

Log Message:
-----------
more fixes for osx

Modified Paths:
--------------
    branches/v0_99_maint/doc/faq/installing_faq.rst
    branches/v0_99_maint/release/osx/Makefile

Modified: branches/v0_99_maint/doc/faq/installing_faq.rst
===================================================================
--- branches/v0_99_maint/doc/faq/installing_faq.rst	2009-08-01 19:11:58 UTC (rev 7329)
+++ branches/v0_99_maint/doc/faq/installing_faq.rst	2009-08-01 19:27:43 UTC (rev 7330)
@@ -298,7 +298,7 @@
 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
+like file:`matplotlib-0.99.0.rc1-py2.5-macosx10.5_mpkg.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

Modified: branches/v0_99_maint/release/osx/Makefile
===================================================================
--- branches/v0_99_maint/release/osx/Makefile	2009-08-01 19:11:58 UTC (rev 7329)
+++ branches/v0_99_maint/release/osx/Makefile	2009-08-01 19:27:43 UTC (rev 7330)
@@ -1,4 +1,5 @@
-PYTHON=python2.6
+PYVERSION=2.6
+PYTHON=python${PYVERSION}
 SRCDIR=${PWD}
 ZLIBVERSION=1.2.3
 PNGVERSION=1.2.33
@@ -90,14 +91,14 @@
 	bdist_mpkg &&\
 	${PYTHON} setupegg.py bdist_egg &&\
 	cd dist && \
-	zip -ro matplotlib-${MPLVERSION}-py2.5-macosx10.5.zip matplotlib-${MPLVERSION}-py2.5-macosx10.5.mpkg
+	zip -ro matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5_mpkg.zip matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg
 
 upload:
 	rm -rf upload &&\
 	mkdir upload &&\
 	cp matplotlib-${MPLVERSION}.tar.gz upload/ &&\
-	cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}_r0-py2.5-macosx-10.3-fat.egg upload/matplotlib-${MPLVERSION}-macosx-py2.5.egg &&\
-	cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py2.5-macosx10.5.zip upload/matplotlib-${MPLVERSION}-py2.5-mpkg.zip&&\
+	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&&\
 	scp upload/* jd...@fr...:uploads/
 
 all:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.