Skip to content

Commit 9c124a6

Browse files
jasondaviesjasondavies
committed
Merge branch 'master' into mouse
Conflicts: Makefile d3.min.js d3.v2.js examples/zoom/zoom.html
2 parents a59ade5 + 3081dd4 commit 9c124a6

300 files changed

Lines changed: 8033 additions & 13854 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 22 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,24 @@ NODE_PATH ?= ./node_modules
44
JS_COMPILER = $(NODE_PATH)/uglify-js/bin/uglifyjs
55
JS_TESTER = $(NODE_PATH)/vows/bin/vows
66

7-
JS_FILES = \
8-
d3.js \
9-
d3.chart.js \
10-
d3.layout.js \
11-
d3.csv.js \
12-
d3.geo.js \
13-
d3.geom.js \
14-
d3.time.js
15-
167
all: \
17-
$(JS_FILES) \
18-
$(JS_FILES:.js=.min.js) \
8+
d3.v2.js \
9+
d3.v2.min.js \
1910
package.json
2011

2112
# Modify this rule to build your own custom release.
22-
# Run `make d3.custom.min.js` to produce the minified version.
23-
24-
d3.custom.js: \
25-
d3.js \
26-
d3.geom.js \
27-
d3.layout.js
2813

29-
.INTERMEDIATE d3.js: \
14+
.INTERMEDIATE d3.v2.js: \
3015
src/start.js \
3116
d3.core.js \
3217
d3.scale.js \
33-
d3.behavior.js \
3418
d3.svg.js \
19+
d3.behavior.js \
20+
d3.layout.js \
21+
d3.csv.js \
22+
d3.geo.js \
23+
d3.geom.js \
24+
d3.time.js \
3525
src/end.js
3626

3727
d3.core.js: \
@@ -151,28 +141,18 @@ d3.svg.js: \
151141
src/svg/chord.js \
152142
src/svg/diagonal.js \
153143
src/svg/diagonal-radial.js \
144+
src/svg/mouse.js \
145+
src/svg/touches.js \
154146
src/svg/symbol.js \
155147
src/svg/axis.js \
156-
src/svg/brush.js \
157-
src/svg/mouse.js \
158-
src/svg/touches.js
148+
src/svg/brush.js
159149

160150
d3.behavior.js: \
161151
src/behavior/behavior.js \
162152
src/behavior/drag.js \
163153
src/behavior/zoom.js
164154

165-
d3.chart.js: \
166-
src/start.js \
167-
src/chart/chart.js \
168-
src/chart/box.js \
169-
src/chart/bullet.js \
170-
src/chart/horizon.js \
171-
src/chart/qq.js \
172-
src/end.js
173-
174155
d3.layout.js: \
175-
src/start.js \
176156
src/layout/layout.js \
177157
src/layout/bundle.js \
178158
src/layout/chord.js \
@@ -185,11 +165,9 @@ d3.layout.js: \
185165
src/layout/pack.js \
186166
src/layout/cluster.js \
187167
src/layout/tree.js \
188-
src/layout/treemap.js \
189-
src/end.js
168+
src/layout/treemap.js
190169

191170
d3.geo.js: \
192-
src/start.js \
193171
src/geo/geo.js \
194172
src/geo/azimuthal.js \
195173
src/geo/albers.js \
@@ -201,18 +179,14 @@ d3.geo.js: \
201179
src/geo/bounds.js \
202180
src/geo/circle.js \
203181
src/geo/greatArc.js \
204-
src/geo/greatCircle.js \
205-
src/end.js
182+
src/geo/greatCircle.js
206183

207184
d3.csv.js: \
208-
src/start.js \
209185
src/csv/csv.js \
210186
src/csv/parse.js \
211-
src/csv/format.js \
212-
src/end.js
187+
src/csv/format.js
213188

214189
d3.time.js: \
215-
src/start.js \
216190
src/time/time.js \
217191
src/time/format.js \
218192
src/time/format-utc.js \
@@ -233,19 +207,16 @@ d3.time.js: \
233207
src/time/year.js \
234208
src/time/years.js \
235209
src/time/scale.js \
236-
src/time/scale-utc.js \
237-
src/end.js
210+
src/time/scale-utc.js
238211

239212
d3.geom.js: \
240-
src/start.js \
241213
src/geom/geom.js \
242214
src/geom/contour.js \
243215
src/geom/hull.js \
244216
src/geom/polygon.js \
245217
src/geom/voronoi.js \
246218
src/geom/delaunay.js \
247-
src/geom/quadtree.js \
248-
src/end.js
219+
src/geom/quadtree.js
249220

250221
test: all
251222
@$(JS_TESTER)
@@ -254,7 +225,7 @@ test: all
254225
@rm -f $@
255226
$(JS_COMPILER) < $< > $@
256227

257-
d3.%: Makefile
228+
d3%.js: Makefile
258229
@rm -f $@
259230
cat $(filter %.js,$^) > $@
260231
@chmod a-w $@
@@ -263,8 +234,10 @@ install:
263234
mkdir -p node_modules
264235
npm install
265236

266-
package.json: d3.js src/package.js
237+
package.json: d3.v2.js src/package.js
238+
@rm -f $@
267239
node src/package.js > $@
240+
@chmod a-w $@
268241

269242
clean:
270-
rm -f d3*.js
243+
rm -f d3*.js package.json

0 commit comments

Comments
 (0)