Revision: 7210
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7210&view=rev
Author: jdh2358
Date: 2009-06-10 21:28:07 +0000 (Wed, 10 Jun 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/matplotlib/release/win32/Makefile
trunk/matplotlib/release/win32/data/setupwin.py
Modified: trunk/matplotlib/release/win32/Makefile
===================================================================
--- trunk/matplotlib/release/win32/Makefile 2009-06-10 17:39:22 UTC (rev
7209)
+++ trunk/matplotlib/release/win32/Makefile 2009-06-10 21:28:07 UTC (rev
7210)
@@ -10,7 +10,7 @@
## You shouldn't need to configure past this point
-CFLAGS = -Os
+CFLAGS = -Os -D_ftime=ftime64 -DPNG_NO_READ_tIME -DPNG_NO_WRITE_tIME
PY_INCLUDE =
"${WINSRCDIR}\\zlib-${ZLIBVERSION};${WINSRCDIR}/libpng-${PNGVERSION};${WINSRCDIR}/freetype-${FREETYPEVERSION}/include;${WINSRCDIR}/tcl${TCLTKVERSION}/generic;${WINSRCDIR}/tcl${TCLTKVERSION}/win;${WINSRCDIR}/tk${TCLTKVERSION}/generic;${WINSRCDIR}/tk${TCLTKVERSION}/win;${WINSRCDIR}/tk${TCLTKVERSION}/xlib"
@@ -36,7 +36,7 @@
rm -rf zlib-${ZLIBVERSION}
tar xvfz zlib-${ZLIBVERSION}.tar.gz
cd zlib-${ZLIBVERSION} &&\
- export CFLAGS=${CFLAGS} &&\
+ export CFLAGS="${CFLAGS}" &&\
./configure &&\
make -j3
@@ -88,8 +88,9 @@
cd matplotlib-${MPLVERSION} &&\
rm -rf build &&\
cp ../data/setup*.* . &&\
- ${PYTHON} setupwin.py build_ext -c mingw32 -I ${PY_INCLUDE} -L
${PY_LINKER} bdist_wininst
- ${PYTHON} setupwinegg.py build_ext -c mingw32 -I ${PY_INCLUDE} -L
${PY_LINKER} bdist_egg
+ export CFLAGS="${CFLAGS}" &&\
+ ${PYTHON} setupwin.py build_ext -c mingw32 -I ${PY_INCLUDE} -L
${PY_LINKER} bdist_wininst
+ #${PYTHON} setupwinegg.py build_ext -c mingw32 -I ${PY_INCLUDE} -L
${PY_LINKER} bdist_egg
inplace:
@@ -102,7 +103,10 @@
cd matplotlib-${MPLVERSION}/lib &&\
${PYTHON} -c 'import matplotlib; matplotlib.use("Agg"); from pylab
import *; print matplotlib.__file__; plot([1,2,3]); savefig("test.png")'
-test:
+test_png:
${PYTHON} -c 'import matplotlib; matplotlib.use("Agg"); from pylab
import *; print matplotlib.__file__; plot([1,2,3]); savefig("test.png")'
+test_plot:
+ ${PYTHON} -c 'import matplotlib; from pylab import *; print
matplotlib.__file__; plot([1,2,3]); show()'
+
all: fetch_deps dependencies installers
Modified: trunk/matplotlib/release/win32/data/setupwin.py
===================================================================
--- trunk/matplotlib/release/win32/data/setupwin.py 2009-06-10 17:39:22 UTC
(rev 7209)
+++ trunk/matplotlib/release/win32/data/setupwin.py 2009-06-10 21:28:07 UTC
(rev 7210)
@@ -2,9 +2,9 @@
try:
# Python 2.6
- # Replace the msvcr func to return an 'msvcr71'
+ # Replace the msvcr func to return an []
cygwinccompiler.get_msvcr
- cygwinccompiler.get_msvcr = lambda: ['msvcr71']
+ cygwinccompiler.get_msvcr = lambda: []
except AttributeError:
pass
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
