8000 updated setepext to work with darwin · matplotlib/matplotlib@4c50d0c · GitHub
[go: up one dir, main page]
Skip to content

Commit 4c50d0c

Browse files
jdh2358jdh2358
committed
updated setepext to work with darwin
svn path=/trunk/matplotlib/; revision=151
1 parent e5a272c commit 4c50d0c

File tree

6 files changed

+17
-23
lines changed

6 files changed

+17
-23
lines changed

‎DEVNOTES

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ http://matplotlib.sourceforge.net
3535
> rfr -f savefig -r '#savefig' *.py
3636
> rfr -f '##savefig' -r '#savefig' *.py
3737

38-
2) edit license for website to the correct version number and
39-
matplotlib/__init__.py to update __version
38+
2) edit license.html.template and matplotlib.__init__ to the correct version number
4039
local> clearbak
4140
local> make htmldocs
4241
local> scp htdocs/site.tar.gz jdh2358@matplotlib.sf.net:/home/groups/m/ma/matplotlib/htdocs/

‎Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# Copyright (C) 2003 <jdhunter@ace.bsd.uchicago.edu>
33
# $Header$
44
# $Log$
5+
# Revision 1.22 2004/02/18 18:11:24 jdh2358
6+
# updated setepext to work with darwin
7+
#
58
# Revision 1.21 2004/02/17 15:10:43 jdh2358
69
# updating to 0.50
710
#
@@ -105,6 +108,7 @@ RELEASE = matplotlib-${VERSION}
105108

106109
clean:
107110
${PYTHON} setup.py clean;\
111+
find . -name "_tmp*.py" | xargs rm -f;\
108112
find . \( -name "*~" -o -name "*.pyc" \) | xargs rm -f;\
109113
find examples \( -name "*.png" -o -name "*.ps" -o -name "*.jpg" -o -name "*.eps" \) | xargs rm -f
110114

‎TODO

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@
203203

204204
-- DONE - website docs for agg - eg, backends.html#Agg
205205

206-
-- build win installer for paint, agg, gd, matplotlib-0.50
206+
-- DONE 2004-02-17 build win installer for agg matplotlib-0.50
207207

208-
-- incorporate John Gill's PS patch
208+
-- DONE 2004-02-16 incorporate John Gill's PS patch
209209

210210
-- DONE 2004-02-13 agg bug; when repeated calls to savefig are made,
211211
the dpi setting in the second one is ignored.
@@ -220,4 +220,4 @@
220220

221221
-- DONE update fonts page with TTFPATH and info on how to use win32 fonts.
222222

223-
-- make legend attributes accessible
223+
-- DONE 2004-02-17 make legend attributes accessible

‎examples/arctest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ def f(t):
1111
l = plot(t1, f(t1), 'ro')
1212
set(l, 'markersize', 30)
1313
set(l, 'markerfacecolor', 'b')
14-
#savefig('arctest', dpi=150)
14+
savefig('arctest', dpi=150)
1515
show()
1616

‎setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@
55

66
# Build the fonttools and TTFQuery packages, required by the Paint,
77
# Agg and GD backends.
8-
BUILD_FONTTOOLS = 0
8+
BUILD_FONTTOOLS = 1
99

1010
# AGG is a new backend that wraps the antigrain geometry toolkit; set
1111
# BUILD_AGG to 1 to build it. Agg makes heavy use of templates, so it
1212
# probably requires a fairly recent compiler to build it. It makes
1313
# very nice antialiased output and also supports alpha blending
14-
BUILD_AGG = 0
14+
BUILD_AGG = 1
1515

1616
# The two builds below are experimental. They use an image backend
1717
# (eg GD or Agg) to render to the GTK canvas. The idea is that we
1818
# could use a single high quality image renderer to render to all the
1919
# GUI windows
2020

2121
# build GTK GUI with Agg renderer ; requires pygtk src distros installed
22-
BUILD_GTKAGG = 0
22+
BUILD_GTKAGG = 1
2323

2424
# build GTK GUI with GD renderer ; requires pygtk and GD src distros installed
25-
BUILD_GTKGD = 0
25+
BUILD_GTKGD = 1
2626

2727

2828
## You shouldn't need to customize below this point
@@ -47,7 +47,7 @@
4747
]
4848

4949

50-
if BUILD_FONTTOOLS or BUILD_AGG or BUILD_GTKAGG or BUILDGTKGD:
50+
if BUILD_FONTTOOLS or BUILD_AGG or BUILD_GTKAGG or BUILD_GTKGD:
5151
build_fonttools(ext_modules, packages)
5252
# we need to manually install FontTools.pth since we can't use
5353
# extra_path which puts all packages -- matplotlib, ttfquery and

‎setupext.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def add_agg_flags(module):
2727
'Add the module flags to build extensions which use agg'
2828

2929
module.include_dirs.extend(['src','agg2/include'])
30-
if sys.platform=='win32':
30+
if sys.platform in ('win32', 'darwin'):
3131
module.include_dirs.extend(
3232
[ # build these libs on win32
3333
'win32src/freetype1',
@@ -41,7 +41,7 @@ def add_agg_flags(module):
4141
)
4242

4343

44-
if sys.platform != 'win32':
44+
if sys.platform not in ('win32', 'darwin'):
4545
module.libraries.extend(['z', 'ttf', 'png'])
4646

4747

@@ -111,7 +111,7 @@ def build_agg(ext_modules, packages):
111111

112112
deps = ['src/_backend_agg.cpp', 'src/font.cpp']
113113
deps.extend(glob.glob('agg2/src/*.cpp'))
114-
if sys.platform=='win32':
114+
if sys.platform in ('win32', 'darwin'):
115115
deps.extend(glob.glob('win32src/freetype1/freetype/*.c'))
116116
deps.extend(glob.glob('win32src/libpng/*.c'))
117117
deps.extend(glob.glob('win32src/zlib/*.c'))
@@ -129,15 +129,6 @@ def build_fonttools(ext_modules, packages):
129129

130130
global builtFonttools
131131

132-
# only build them if not already installed
133-
#if sys.platform != 'win32':
134-
if 0:
135-
try: import ttfquery
136-
except ImportError: pass
137-
else:
138-
builtFonttools = True
139-
return
140-
141132
if builtFonttools: return # only build it if you you haven't already
142133
packages.extend(
143134
['ttfquery',

0 commit comments

Comments
 (0)
0