updated setepext to work with darwin

jdh2358 · jdh2358 · commit 4c50d0c72ea5 · 2004-02-18T18:11:27.000Z
svn path=/trunk/matplotlib/; revision=151
diff --git a/DEVNOTES b/DEVNOTES
@@ -35,8 +35,7 @@ http://matplotlib.sourceforge.net
   > rfr -f savefig -r '#savefig' *.py
   > rfr -f '##savefig' -r '#savefig' *.py
 
-2) edit license for website to the correct version number and
-   matplotlib/__init__.py to update __version
+2) edit license.html.template and matplotlib.__init__ to the correct version number 
    local> clearbak
    local> make htmldocs
    local> scp htdocs/site.tar.gz jdh2358@matplotlib.sf.net:/home/groups/m/ma/matplotlib/htdocs/
diff --git a/Makefile b/Makefile
@@ -2,6 +2,9 @@
 # Copyright (C) 2003  <jdhunter@ace.bsd.uchicago.edu>
 # $Header$
 # $Log$
+# Revision 1.22  2004/02/18 18:11:24  jdh2358
+# updated setepext to work with darwin
+#
 # Revision 1.21  2004/02/17 15:10:43  jdh2358
 # updating to 0.50
 #
@@ -105,6 +108,7 @@ RELEASE = matplotlib-${VERSION}
 
 clean: 
 	${PYTHON} setup.py clean;\
+	find . -name "_tmp*.py" | xargs rm -f;\
 	find . \( -name "*~" -o -name "*.pyc" \) | xargs rm -f;\
 	find examples \( -name "*.png" -o -name "*.ps"  -o -name "*.jpg" -o -name "*.eps" \) | xargs rm -f
 
diff --git a/TODO b/TODO
@@ -203,9 +203,9 @@
 
 -- DONE - website docs for agg - eg, backends.html#Agg
 
--- build win installer for paint, agg, gd, matplotlib-0.50
+-- DONE 2004-02-17 build win installer for agg matplotlib-0.50
 
--- incorporate John Gill's PS patch
+-- DONE 2004-02-16 incorporate John Gill's PS patch
 
 -- DONE 2004-02-13 agg bug; when repeated calls to savefig are made,
    the dpi setting in the second one is ignored.
@@ -220,4 +220,4 @@
 
 -- DONE update fonts page with TTFPATH and info on how to use win32 fonts.
 
--- make legend attributes accessible
+-- DONE 2004-02-17 make legend attributes accessible
diff --git a/examples/arctest.py b/examples/arctest.py
@@ -11,6 +11,6 @@ def f(t):
 l = plot(t1, f(t1), 'ro')
 set(l, 'markersize', 30)
 set(l, 'markerfacecolor', 'b')
-#savefig('arctest', dpi=150)
+savefig('arctest', dpi=150)
 show()
 
diff --git a/setup.py b/setup.py
@@ -5,24 +5,24 @@
 
 # Build the fonttools and TTFQuery packages, required by the Paint,
 # Agg and GD backends.
-BUILD_FONTTOOLS = 0
+BUILD_FONTTOOLS = 1
 
 # AGG is a new backend that wraps the antigrain geometry toolkit; set
 # BUILD_AGG to 1 to build it.  Agg makes heavy use of templates, so it
 # probably requires a fairly recent compiler to build it.  It makes
 # very nice antialiased output and also supports alpha blending
-BUILD_AGG          = 0
+BUILD_AGG          = 1
 
 # The two builds below are experimental.  They use an image backend
 # (eg GD or Agg) to render to the GTK canvas.  The idea is that we
 # could use a single high quality image renderer to render to all the
 # GUI windows
 
 # build GTK GUI with Agg renderer ; requires pygtk src distros installed
-BUILD_GTKAGG       = 0
+BUILD_GTKAGG       = 1
 
 # build GTK GUI with GD renderer ; requires pygtk and GD src distros installed
-BUILD_GTKGD        = 0   
+BUILD_GTKGD        = 1
 
 
 ## You shouldn't need to customize below this point
@@ -47,7 +47,7 @@
     ]
 
 
-if BUILD_FONTTOOLS or BUILD_AGG or BUILD_GTKAGG or BUILDGTKGD:
+if BUILD_FONTTOOLS or BUILD_AGG or BUILD_GTKAGG or BUILD_GTKGD:
     build_fonttools(ext_modules, packages)
     # we need to manually install FontTools.pth since we can't use
     # extra_path which puts all packages -- matplotlib, ttfquery and
diff --git a/setupext.py b/setupext.py
@@ -27,7 +27,7 @@ def add_agg_flags(module):
     'Add the module flags to build extensions which use agg'
 
     module.include_dirs.extend(['src','agg2/include'])
-    if sys.platform=='win32':
+    if sys.platform in ('win32', 'darwin'):
         module.include_dirs.extend(
             [  # build these libs on win32
             'win32src/freetype1',
@@ -41,7 +41,7 @@ def add_agg_flags(module):
             )
 
 
-    if sys.platform != 'win32':
+    if sys.platform not in ('win32', 'darwin'):
         module.libraries.extend(['z', 'ttf', 'png'])
 
 
@@ -111,7 +111,7 @@ def build_agg(ext_modules, packages):
     
     deps = ['src/_backend_agg.cpp', 'src/font.cpp'] 
     deps.extend(glob.glob('agg2/src/*.cpp'))
-    if sys.platform=='win32':
+    if sys.platform in ('win32', 'darwin'):
         deps.extend(glob.glob('win32src/freetype1/freetype/*.c'))
         deps.extend(glob.glob('win32src/libpng/*.c'))
         deps.extend(glob.glob('win32src/zlib/*.c'))
@@ -129,15 +129,6 @@ def build_fonttools(ext_modules, packages):
 
     global builtFonttools
 
-    # only build them if not already installed
-    #if sys.platform != 'win32':
-    if 0:
-        try: import ttfquery
-        except ImportError: pass
-        else:
-            builtFonttools = True
-            return 
-
     if builtFonttools: return # only build it if you you haven't already
     packages.extend(
         ['ttfquery',
