Smash!

Makefile

-# See the README for installation instructions.
-
-JS_UGLIFY = node_modules/.bin/uglifyjs
-JS_TESTER = node_modules/.bin/vows
 LOCALE ?= en_US
 
 all: \
@@ -10,267 +6,33 @@ all: \
 	component.json \
 	package.json
 
-# Modify this rule to build your own custom release.
-
-.INTERMEDIATE d3.js: \
-	src/start.js \
-	d3.core.js \
-	d3.scale.js \
-	d3.svg.js \
-	d3.behavior.js \
-	d3.layout.js \
-	d3.dsv.js \
-	d3.geo.js \
-	d3.geom.js \
-	d3.time.js \
-	src/end.js
-
-d3.core.js: \
-	src/core/core.js \
-	src/core/format-$(LOCALE).js \
-	src/compat/date.js \
-	src/compat/style.js \
-	src/core/class.js \
-	src/core/array.js \
-	src/core/map.js \
-	src/core/set.js \
-	src/core/identity.js \
-	src/core/true.js \
-	src/core/functor.js \
-	src/core/rebind.js \
-	src/core/ascending.js \
-	src/core/descending.js \
-	src/core/mean.js \
-	src/core/median.js \
-	src/core/min.js \
-	src/core/max.js \
-	src/core/extent.js \
-	src/core/random.js \
-	src/core/number.js \
-	src/core/sum.js \
-	src/core/quantile.js \
-	src/core/shuffle.js \
-	src/core/transpose.js \
-	src/core/zip.js \
-	src/core/bisect.js \
-	src/core/nest.js \
-	src/core/keys.js \
-	src/core/values.js \
-	src/core/entries.js \
-	src/core/permute.js \
-	src/core/merge.js \
-	src/core/collapse.js \
-	src/core/range.js \
-	src/core/requote.js \
-	src/core/round.js \
-	src/core/xhr.js \
-	src/core/text.js \
-	src/core/json.js \
-	src/core/html.js \
-	src/core/xml.js \
-	src/core/ns.js \
-	src/core/dispatch.js \
-	src/core/format.js \
-	src/core/formatPrefix.js \
-	src/core/ease.js \
-	src/core/event.js \
-	src/core/transform.js \
-	src/core/interpolate.js \
-	src/core/uninterpolate.js \
-	src/core/color.js \
-	src/core/rgb.js \
-	src/core/hsl.js \
-	src/core/hcl.js \
-	src/core/lab.js \
-	src/core/xyz.js \
-	src/core/selection.js \
-	src/core/selection-select.js \
-	src/core/selection-selectAll.js \
-	src/core/selection-attr.js \
-	src/core/selection-classed.js \
-	src/core/selection-style.js \
-	src/core/selection-property.js \
-	src/core/selection-text.js \
-	src/core/selection-html.js \
-	src/core/selection-append.js \
-	src/core/selection-insert.js \
-	src/core/selection-remove.js \
-	src/core/selection-data.js \
-	src/core/selection-datum.js \
-	src/core/selection-filter.js \
-	src/core/selection-order.js \
-	src/core/selection-sort.js \
-	src/core/selection-on.js \
-	src/core/selection-each.js \
-	src/core/selection-call.js \
-	src/core/selection-empty.js \
-	src/core/selection-node.js \
-	src/core/selection-transition.js \
-	src/core/selection-root.js \
-	src/core/selection-enter.js \
-	src/core/selection-enter-select.js \
-	src/core/transition.js \
-	src/core/transition-select.js \
-	src/core/transition-selectAll.js \
-	src/core/transition-filter.js \
-	src/core/transition-attr.js \
-	src/core/transition-style.js \
-	src/core/transition-text.js \
-	src/core/transition-remove.js \
-	src/core/transition-ease.js \
-	src/core/transition-delay.js \
-	src/core/transition-duration.js \
-	src/core/transition-each.js \
-	src/core/transition-transition.js \
-	src/core/transition-tween.js \
-	src/core/timer.js \
-	src/core/mouse.js \
-	src/core/touches.js \
-	src/core/noop.js
-
-d3.scale.js: \
-	src/scale/scale.js \
-	src/scale/nice.js \
-	src/scale/linear.js \
-	src/scale/bilinear.js \
-	src/scale/polylinear.js \
-	src/scale/log.js \
-	src/scale/pow.js \
-	src/scale/sqrt.js \
-	src/scale/ordinal.js \
-	src/scale/category.js \
-	src/scale/quantile.js \
-	src/scale/quantize.js \
-	src/scale/threshold.js \
-	src/scale/identity.js
-
-d3.svg.js: \
-	src/svg/svg.js \
-	src/svg/arc.js \
-	src/svg/line.js \
-	src/svg/line-radial.js \
-	src/svg/area.js \
-	src/svg/area-radial.js \
-	src/svg/chord.js \
-	src/svg/diagonal.js \
-	src/svg/diagonal-radial.js \
-	src/svg/symbol.js \
-	src/svg/axis.js \
-	src/svg/brush.js
-
-d3.behavior.js: \
-	src/behavior/behavior.js \
-	src/behavior/drag.js \
-	src/behavior/zoom.js
-
-d3.layout.js: \
-	src/layout/layout.js \
-	src/layout/bundle.js \
-	src/layout/chord.js \
-	src/layout/force.js \
-	src/layout/partition.js \
-	src/layout/pie.js \
-	src/layout/stack.js \
-	src/layout/histogram.js \
-	src/layout/hierarchy.js \
-	src/layout/pack.js \
-	src/layout/cluster.js \
-	src/layout/tree.js \
-	src/layout/treemap.js \
-	src/layout/voronoi.js
-
-d3.geo.js: \
-	src/geo/geo.js \
-	src/geo/area.js \
-	src/geo/bounds.js \
-	src/geo/cartesian.js \
-	src/geo/centroid.js \
-	src/geo/circle.js \
-	src/geo/clip.js \
-	src/geo/clip-antimeridian.js \
-	src/geo/clip-circle.js \
-	src/geo/clip-polygon.js \
-	src/geo/clip-view.js \
-	src/geo/compose.js \
-	src/geo/distance.js \
-	src/geo/graticule.js \
-	src/geo/haversin.js \
-	src/geo/greatArc.js \
-	src/geo/interpolate.js \
-	src/geo/length.js \
-	src/geo/path-area.js \
-	src/geo/path-buffer.js \
-	src/geo/path-centroid.js \
-	src/geo/path-context.js \
-	src/geo/path.js \
-	src/geo/projection.js \
-	src/geo/resample.js \
-	src/geo/rotation.js \
-	src/geo/spherical.js \
-	src/geo/stream.js \
-	src/geo/albers.js \
-	src/geo/albers-usa.js \
-	src/geo/azimuthal.js \
-	src/geo/azimuthal-equal-area.js \
-	src/geo/azimuthal-equidistant.js \
-	src/geo/conic.js \
-	src/geo/conic-conformal.js \
-	src/geo/conic-equal-area.js \
-	src/geo/conic-equidistant.js \
-	src/geo/equirectangular.js \
-	src/geo/gnomonic.js \
-	src/geo/mercator.js \
-	src/geo/orthographic.js \
-	src/geo/stereographic.js \
-	src/geo/transverse-mercator.js
-
-d3.dsv.js: \
-	src/dsv/dsv.js \
-	src/dsv/csv.js \
-	src/dsv/tsv.js
-
-d3.time.js: \
-	src/time/time.js \
-	src/time/format-$(LOCALE).js \
-	src/time/format.js \
-	src/time/format-utc.js \
-	src/time/format-iso.js \
-	src/time/interval.js \
-	src/time/second.js \
-	src/time/minute.js \
-	src/time/hour.js \
-	src/time/day.js \
-	src/time/week.js \
-	src/time/month.js \
-	src/time/year.js \
-	src/time/scale.js \
-	src/time/scale-utc.js
-
-d3.geom.js: \
-	src/geom/geom.js \
-	src/geom/hull.js \
-	src/geom/polygon.js \
-	src/geom/voronoi.js \
-	src/geom/delaunay.js \
-	src/geom/quadtree.js
-
 test: all
-	@$(JS_TESTER)
+	@node_modules/.bin/vows
 
 benchmark: all
 	@node test/geo/benchmark.js
 
-%.min.js: %.js Makefile
-	@rm -f $@
-	$(JS_UGLIFY) $< -c -m -o $@
+.INTERMEDIATE: \
+	src/core/format-localized.js \
+	src/time/format-localized.js
+
+src/core/format-localized.js: src/locale.js src/core/format-locale.js
+	LC_NUMERIC=$(LOCALE) locale -ck LC_NUMERIC | node src/locale.js src/core/format-locale.js > $@
 
-d3%js: Makefile
+src/time/format-localized.js: src/locale.js src/time/format-locale.js
+	LC_TIME=$(LOCALE) locale -ck LC_TIME | node src/locale.js src/time/format-locale.js > $@
+
+d3%js: src/d3%js src/core/format-localized.js src/time/format-localized.js
 	@rm -f $@
-	@cat $(filter %.js,$^) > $@.tmp
-	$(JS_UGLIFY) $@.tmp -b indent-level=2 -o $@
+	node_modules/.bin/smash $< > $@.tmp
+	node_modules/.bin/uglifyjs $@.tmp -b indent-level=2 -o $@
 	@rm $@.tmp
 	@chmod a-w $@
 
+%.min.js: %.js
+	@rm -f $@
+	node_modules/.bin/uglifyjs $< -c -m -o $@
+
 component.json: src/component.js d3.js
 	@rm -f $@
 	node src/component.js > $@
@@ -281,15 +43,5 @@ package.json: src/package.js d3.js
 	node src/package.js > $@
 	@chmod a-w $@
 
-src/core/format-$(LOCALE).js: src/locale.js src/core/format-locale.js
-	LC_NUMERIC=$(LOCALE) locale -ck LC_NUMERIC | node src/locale.js src/core/format-locale.js > $@
-
-src/time/format-$(LOCALE).js: src/locale.js src/time/format-locale.js
-	LC_TIME=$(LOCALE) locale -ck LC_TIME | node src/locale.js src/time/format-locale.js > $@
-
-.INTERMEDIATE: \
-	src/core/format-$(LOCALE).js \
-	src/time/format-$(LOCALE).js
-
 clean:
 	rm -f d3*.js package.json component.json

package.json

@@ -31,6 +31,7 @@
     "jsdom": "~0.5.2"
   },
   "devDependencies": {
+    "smash": "0.0.x",
     "uglify-js": "2.2.x",
     "vows": "0.7.x"
   },

src/d3.js

+import "start";
+
+import "core/core";
+import "core/format-localized";
+import "compat/date";
+import "compat/style";
+import "core/class";
+import "core/array";
+import "core/map";
+import "core/set";
+import "core/identity";
+import "core/true";
+import "core/functor";
+import "core/rebind";
+import "core/ascending";
+import "core/descending";
+import "core/mean";
+import "core/median";
+import "core/min";
+import "core/max";
+import "core/extent";
+import "core/random";
+import "core/number";
+import "core/sum";
+import "core/quantile";
+import "core/shuffle";
+import "core/transpose";
+import "core/zip";
+import "core/bisect";
+import "core/nest";
+import "core/keys";
+import "core/values";
+import "core/entries";
+import "core/permute";
+import "core/merge";
+import "core/collapse";
+import "core/range";
+import "core/requote";
+import "core/round";
+import "core/xhr";
+import "core/text";
+import "core/json";
+import "core/html";
+import "core/xml";
+import "core/ns";
+import "core/dispatch";
+import "core/format";
+import "core/formatPrefix";
+import "core/ease";
+import "core/event";
+import "core/transform";
+import "core/interpolate";
+import "core/uninterpolate";
+import "core/color";
+import "core/rgb";
+import "core/hsl";
+import "core/hcl";
+import "core/lab";
+import "core/xyz";
+import "core/selection";
+import "core/selection-select";
+import "core/selection-selectAll";
+import "core/selection-attr";
+import "core/selection-classed";
+import "core/selection-style";
+import "core/selection-property";
+import "core/selection-text";
+import "core/selection-html";
+import "core/selection-append";
+import "core/selection-insert";
+import "core/selection-remove";
+import "core/selection-data";
+import "core/selection-datum";
+import "core/selection-filter";
+import "core/selection-order";
+import "core/selection-sort";
+import "core/selection-on";
+import "core/selection-each";
+import "core/selection-call";
+import "core/selection-empty";
+import "core/selection-node";
+import "core/selection-transition";
+import "core/selection-root";
+import "core/selection-enter";
+import "core/selection-enter-select";
+import "core/transition";
+import "core/transition-select";
+import "core/transition-selectAll";
+import "core/transition-filter";
+import "core/transition-attr";
+import "core/transition-style";
+import "core/transition-text";
+import "core/transition-remove";
+import "core/transition-ease";
+import "core/transition-delay";
+import "core/transition-duration";
+import "core/transition-each";
+import "core/transition-transition";
+import "core/transition-tween";
+import "core/timer";
+import "core/mouse";
+import "core/touches";
+import "core/noop";
+
+import "scale/scale";
+import "scale/nice";
+import "scale/linear";
+import "scale/bilinear";
+import "scale/polylinear";
+import "scale/log";
+import "scale/pow";
+import "scale/sqrt";
+import "scale/ordinal";
+import "scale/category";
+import "scale/quantile";
+import "scale/quantize";
+import "scale/threshold";
+import "scale/identity";
+
+import "svg/svg";
+import "svg/arc";
+import "svg/line";
+import "svg/line-radial";
+import "svg/area";
+import "svg/area-radial";
+import "svg/chord";
+import "svg/diagonal";
+import "svg/diagonal-radial";
+import "svg/symbol";
+import "svg/axis";
+import "svg/brush";
+
+import "behavior/behavior";
+import "behavior/drag";
+import "behavior/zoom";
+
+import "layout/layout";
+import "layout/bundle";
+import "layout/chord";
+import "layout/force";
+import "layout/partition";
+import "layout/pie";
+import "layout/stack";
+import "layout/histogram";
+import "layout/hierarchy";
+import "layout/pack";
+import "layout/cluster";
+import "layout/tree";
+import "layout/treemap";
+import "layout/voronoi";
+
+import "geo/geo";
+import "geo/area";
+import "geo/bounds";
+import "geo/cartesian";
+import "geo/centroid";
+import "geo/circle";
+import "geo/clip";
+import "geo/clip-antimeridian";
+import "geo/clip-circle";
+import "geo/clip-polygon";
+import "geo/clip-view";
+import "geo/compose";
+import "geo/distance";
+import "geo/graticule";
+import "geo/haversin";
+import "geo/greatArc";
+import "geo/interpolate";
+import "geo/length";
+import "geo/path-area";
+import "geo/path-buffer";
+import "geo/path-centroid";
+import "geo/path-context";
+import "geo/path";
+import "geo/projection";
+import "geo/resample";
+import "geo/rotation";
+import "geo/spherical";
+import "geo/stream";
+import "geo/albers";
+import "geo/albers-usa";
+import "geo/azimuthal";
+import "geo/azimuthal-equal-area";
+import "geo/azimuthal-equidistant";
+import "geo/conic";
+import "geo/conic-conformal";
+import "geo/conic-equal-area";
+import "geo/conic-equidistant";
+import "geo/equirectangular";
+import "geo/gnomonic";
+import "geo/mercator";
+import "geo/orthographic";
+import "geo/stereographic";
+import "geo/transverse-mercator";
+
+import "dsv/dsv";
+import "dsv/csv";
+import "dsv/tsv";
+
+import "time/time";
+import "time/format-localized";
+import "time/format";
+import "time/format-utc";
+import "time/format-iso";
+import "time/interval";
+import "time/second";
+import "time/minute";
+import "time/hour";
+import "time/day";
+import "time/week";
+import "time/month";
+import "time/year";
+import "time/scale";
+import "time/scale-utc";
+
+import "geom/geom";
+import "geom/hull";
+import "geom/polygon";
+import "geom/voronoi";
+import "geom/delaunay";
+import "geom/quadtree";
+
+import "end";

src/package.js

@@ -33,6 +33,7 @@ console.log(JSON.stringify({
     "jsdom": "~0.5.2"
   },
   "devDependencies": {
+    "smash": "0.0.x",
     "uglify-js": "2.2.x",
     "vows": "0.7.x"
   },