From: <as...@us...> - 2009-08-23 06:43:59
|
Revision: 7538 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7538&view=rev Author: astraw Date: 2009-08-23 06:43:53 +0000 (Sun, 23 Aug 2009) Log Message: ----------- Remove trailing whitespace from source code file. (This is mostly just a touch of the file to test the buildbot change detector.) Modified Paths: -------------- trunk/matplotlib/make.osx Modified: trunk/matplotlib/make.osx =================================================================== --- trunk/matplotlib/make.osx 2009-08-23 05:36:23 UTC (rev 7537) +++ trunk/matplotlib/make.osx 2009-08-23 06:43:53 UTC (rev 7538) @@ -1,4 +1,4 @@ -# 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 PYVERSION=2.6 @@ -21,7 +21,7 @@ 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} fetch: ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\ @@ -78,7 +78,7 @@ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ export CFLAGS=${CFLAGS_DEPS} &&\ export LDFLAGS=${LDFLAGS_DEPS} &&\ - python setup.py build + python setup.py build mpl_install: export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jd...@us...> - 2009-08-30 03:44:12
|
Revision: 7590 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7590&view=rev Author: jdh2358 Date: 2009-08-30 03:44:06 +0000 (Sun, 30 Aug 2009) Log Message: ----------- sync before merge Modified Paths: -------------- trunk/matplotlib/make.osx Modified: trunk/matplotlib/make.osx =================================================================== --- trunk/matplotlib/make.osx 2009-08-30 03:40:08 UTC (rev 7589) +++ trunk/matplotlib/make.osx 2009-08-30 03:44:06 UTC (rev 7590) @@ -5,7 +5,7 @@ PYTHON=python${PYVERSION} ZLIBVERSION=1.2.3 PNGVERSION=1.2.33 -FREETYPEVERSION=2.3.7 +FREETYPEVERSION=2.3.5 MACOSX_DEPLOYMENT_TARGET=10.4 ## You shouldn't need to configure past this point This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jd...@us...> - 2009-09-06 12:19:47
|
Revision: 7657 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7657&view=rev Author: jdh2358 Date: 2009-09-06 12:16:41 +0000 (Sun, 06 Sep 2009) Log Message: ----------- add dyld to mac osx file Modified Paths: -------------- trunk/matplotlib/make.osx Modified: trunk/matplotlib/make.osx =================================================================== --- trunk/matplotlib/make.osx 2009-09-06 07:11:57 UTC (rev 7656) +++ trunk/matplotlib/make.osx 2009-09-06 12:16:41 UTC (rev 7657) @@ -76,6 +76,8 @@ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ export CFLAGS=${CFLAGS_DEPS} &&\ export LDFLAGS=${LDFLAGS_DEPS} &&\ + export LD_LIBRARY_PATH=${PREFIX}/lib &&\ + export DYLD_LIBRARY_PATH=${PREFIX}/lib &&\ python setup.py build mpl_install: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jd...@us...> - 2009-11-30 21:13:51
|
Revision: 7992 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7992&view=rev Author: jdh2358 Date: 2009-11-30 21:13:34 +0000 (Mon, 30 Nov 2009) Log Message: ----------- add Matthew's OSX makefile patch Modified Paths: -------------- trunk/matplotlib/make.osx Modified: trunk/matplotlib/make.osx =================================================================== --- trunk/matplotlib/make.osx 2009-11-30 18:30:09 UTC (rev 7991) +++ trunk/matplotlib/make.osx 2009-11-30 21:13:34 UTC (rev 7992) @@ -4,21 +4,24 @@ PYVERSION=2.6 PYTHON=python${PYVERSION} ZLIBVERSION=1.2.3 -PNGVERSION=1.2.33 -FREETYPEVERSION=2.3.5 +PNGVERSION=1.2.40 +FREETYPEVERSION=2.3.11 MACOSX_DEPLOYMENT_TARGET=10.4 +OSX_SDK_VER=10.4u +ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64" ## You shouldn't need to configure past this point PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig" -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" +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" 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")' &&\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jd...@us...> - 2010-05-26 12:46:52
|
Revision: 8336 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8336&view=rev Author: jdh2358 Date: 2010-05-26 12:46:46 +0000 (Wed, 26 May 2010) Log Message: ----------- fixed a tar argument bug in make.osx Modified Paths: -------------- trunk/matplotlib/make.osx Modified: trunk/matplotlib/make.osx =================================================================== --- trunk/matplotlib/make.osx 2010-05-24 20:06:20 UTC (rev 8335) +++ trunk/matplotlib/make.osx 2010-05-26 12:46:46 UTC (rev 8336) @@ -40,7 +40,7 @@ zlib: export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\ rm -rf zlib-${ZLIBVERSION} &&\ - tar xvfj zlib-${ZLIBVERSION}.tar.gz &&\ + tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\ cd zlib-${ZLIBVERSION} &&\ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ export CFLAGS=${CFLAGS} &&\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jd...@us...> - 2010-05-26 15:03:41
|
Revision: 8337 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8337&view=rev Author: jdh2358 Date: 2010-05-26 15:03:34 +0000 (Wed, 26 May 2010) Log Message: ----------- fix the download urls for zlib and libpng for osx build Modified Paths: -------------- trunk/matplotlib/make.osx Modified: trunk/matplotlib/make.osx =================================================================== --- trunk/matplotlib/make.osx 2010-05-26 12:46:46 UTC (rev 8336) +++ trunk/matplotlib/make.osx 2010-05-26 15:03:34 UTC (rev 8337) @@ -29,9 +29,10 @@ 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://downloads.sourceforge.net/project/libpng/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz", "libpng-${PNGVERSION}.tar.gz")' &&\ + ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://superb-sea2.dl.sourceforge.net/project/libpng/zlib/${ZLIBVERSION}/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\ + ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://sourceforge.net/projects/libpng/files/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz/download", "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")' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jo...@us...> - 2010-09-10 16:46:10
|
Revision: 8695 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8695&view=rev Author: jouni Date: 2010-09-10 16:46:04 +0000 (Fri, 10 Sep 2010) Log Message: ----------- Remind make.osx users to set PREFIX Modified Paths: -------------- trunk/matplotlib/make.osx Modified: trunk/matplotlib/make.osx =================================================================== --- trunk/matplotlib/make.osx 2010-09-09 12:03:09 UTC (rev 8694) +++ trunk/matplotlib/make.osx 2010-09-10 16:46:04 UTC (rev 8695) @@ -21,6 +21,9 @@ LDFLAGS="-arch i386 -arch x86_64 -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk" FFLAGS="-arch i386 -arch x86_64" +check-prefix: + @if [ ! -d "$(PREFIX)" ]; then echo Set PREFIX to a directory - see README.osx; exit 1; fi + clean: rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \ freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \ @@ -38,7 +41,7 @@ -zlib: +zlib: check-prefix export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\ rm -rf zlib-${ZLIBVERSION} &&\ tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\ @@ -50,7 +53,7 @@ MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} make -j3 install&& \ unset MACOSX_DEPLOYMENT_TARGET -png: zlib +png: zlib check-prefix export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\ rm -rf libpng-${PNGVERSION} &&\ tar xvfz libpng-${PNGVERSION}.tar.gz && \ @@ -64,7 +67,7 @@ unset MACOSX_DEPLOYMENT_TARGET -freetype: zlib +freetype: zlib check-prefix export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\ rm -rf ${FREETYPEVERSION} &&\ tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\ @@ -88,7 +91,7 @@ export LDFLAGS=${LDFLAGS} &&\ ${PYTHON} setup.py build -mpl_install: +mpl_install: check-prefix export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\ export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\ export CFLAGS=${CFLAGS} &&\ @@ -96,7 +99,7 @@ ${PYTHON} setup.py install --prefix=${PREFIX} -binaries: +binaries: check-prefix unset PKG_CONFIG_PATH &&\ cp release/osx/data/setup.cfg release/osx/data/ReadMe.txt . &&\ export CFLAGS=${CFLAGS} &&\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |