Revision: 7142
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7142&view=rev
Author: cmoad
Date: 2009-05-25 18:23:25 +0000 (Mon, 25 May 2009)
Log Message:
-----------
more win32 build updates
Modified Paths:
--------------
trunk/matplotlib/release/win32/Makefile
trunk/matplotlib/release/win32/data/setup.cfg
Modified: trunk/matplotlib/release/win32/Makefile
===================================================================
--- trunk/matplotlib/release/win32/Makefile 2009-05-25 17:39:45 UTC (rev
7141)
+++ trunk/matplotlib/release/win32/Makefile 2009-05-25 18:23:25 UTC (rev
7142)
@@ -1,4 +1,4 @@
-PYTHON=python
+PYTHON=C:/Python26/python.exe
SRCDIR=${PWD}
ZLIBVERSION=1.2.3
PNGVERSION=1.2.33
@@ -23,12 +23,14 @@
wget
http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2
zlib:
+ rm -rf zlib-${ZLIBVERSION}
tar xvfz zlib-${ZLIBVERSION}.tar.gz
cd zlib-${ZLIBVERSION} &&\
./configure &&\
make -j3
png: zlib
+ rm -rf libpng-${PNGVERSION}
tar xvfj libpng-${PNGVERSION}.tar.bz2
cd libpng-${PNGVERSION} &&\
export CFLAGS=${CFLAGS} &&\
@@ -38,10 +40,10 @@
cp .libs/libpng.a .
freetype:
- tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
+ rm -rf freetype-${FREETYPEVERSION}
+ tar xvfj freetype-${FREETYPEVERSION}.tar.bz2
cd freetype-${FREETYPEVERSION} &&\
- export GNUMAKE=mingw32-make &&\
- ./configure --disable-shared &&\
+ GNUMAKE=mingw32-make ./configure --disable-shared &&\
cp builds/win32/w32-mingw32.mk config.mk &&\
mingw32-make -j3 &&\
cp objs/libfreetype.a .
@@ -49,13 +51,12 @@
dependencies: png freetype
installers:
- tar xvzf matplotlib-${MPLVERSION}.tar.gz &&\
+ rm -rf matplotlib-${MPLVERSION}
+ tar xvzf matplotlib-${MPLVERSION}.tar.gz
cd matplotlib-${MPLVERSION} &&\
rm -rf build &&\
cp ../data/setup.cfg . &&\
- export CFLAGS=${CFLAGS} &&\
- export LDFLAGS=${LDFLAGS} &&\
${PYTHON} setup.py build -c mingw32 bdist_wininst &&\
- ${PYTHON) setupegg.py build -c mingw32 bdist_egg
+ ${PYTHON} setupegg.py build -c mingw32 bdist_egg
all: fetch_deps dependencies installers
Modified: trunk/matplotlib/release/win32/data/setup.cfg
===================================================================
--- trunk/matplotlib/release/win32/data/setup.cfg 2009-05-25 17:39:45 UTC
(rev 7141)
+++ trunk/matplotlib/release/win32/data/setup.cfg 2009-05-25 18:23:25 UTC
(rev 7142)
@@ -2,7 +2,7 @@
# build options.
[egg_info]
-tag_svn_revision = 0
+tag_svn_revision = 1
[status]
# To suppress display of the dependencies and their versions
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
