diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-02-28 21:36:38 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-02-28 21:36:38 -0500 |
commit | 94cb6df76692cea50e2989e58512947debbe70e4 (patch) | |
tree | bcd0518d318deffd12b7f2999aa43e040e5d50f3 /media/Makefile | |
parent | 9e90f1968802d350157bcbeef0cebd7d96eb1ada (diff) | |
parent | 9c6fd09153b4bac9f6b95e2584a3776a0d91ba42 (diff) |
Merge commit '9c6fd0' from archweb: upgrade to d3-2.6.1
Conflicts:
media/d3.layout.min.js
media/d3.min.js
This brought out a few bugs in the Makefile, fix them.
Diffstat (limited to 'media/Makefile')
-rw-r--r-- | media/Makefile | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/media/Makefile b/media/Makefile index a250a414..b872e26c 100644 --- a/media/Makefile +++ b/media/Makefile @@ -1,7 +1,9 @@ -d3version=2.4.3 +d3version=2.6.1 jqueryversion=1.4.4 -all: d3.min.js d3.layout.min.js jquery-$(jqueryversion).min.js jquery.tablesorter.min.js +# Force creating the d3 directory before we even evaluate how to make d3.js +all: .d3/d3-$(d3version) jquery-$(jqueryversion).min.js jquery.tablesorter.min.js + $(MAKE) d3.min.js d3.layout.min.js %.min.js: %.js $(closurecompiler) '$<' @@ -9,23 +11,28 @@ all: d3.min.js d3.layout.min.js jquery-$(jqueryversion).min.js jquery.tablesorte jquery-$(jqueryversion).js: wget http://code.jquery.com/$@ -d3.%: .d3/d3-$(d3version) Makefile +d3.%: .d3/d3-$(d3version)/d3.% .d3/d3-$(d3version)/LICENSE Makefile echo '/* $@ - Data Driven Documents' > $@ echo ' * Version: $(d3version)' >> $@ echo ' * Homepage: http://mbostock.github.com/d3/' >> $@ echo ' * Copyright: 2010, Michael Bostock' >> $@ echo ' * Licence: 3-Clause BSD' >> $@ echo ' *' >> $@ - sed 's/./ * &/' $</LICENSE >> $@ + sed 's/.*/ * &/' $(<D)/LICENSE >> $@ echo ' */' >> $@ - cat $</$@ >> $@ + cat $< >> $@ + .d3/d3-%.tar.gz: Makefile mkdir -p $(@D) wget https://github.com/mbostock/d3/tarball/v$* -O $@ -.d3/d3-%: .d3/d3-%.tar.gz Makefile +.d3/d3-%.tar.gz.d: .d3/d3-%.tar.gz Makefile + rm -rf $@ mkdir -p $<.d - cd $<.d && tar xzf ../d3-$*.tar.gz - cp -r $<.d/*/ $@ + cd $@ && tar xzf ../d3-$*.tar.gz +.d3/d3-%: .d3/d3-%.tar.gz.d Makefile + rm -rf $@ + cp -r $</*/ $@ + rm $@/*.min.js .SECONDARY: closurecompiler=compiler() { cp "$$1" "$${1%.js}.min.js"; }; compiler |