X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=30bf7ce9a5ffa99fd789bb16de9d353a7b5c6722;hb=HEAD;hp=6a8a175e4515514cf238fb235d0bfa86a4cc6fe3;hpb=e93255ef54304c697ef7ac101247f23dc5f7b31f;p=platal.git

diff --git a/Makefile b/Makefile
index 6a8a175..30bf7ce 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ endef
 
 all: build
 
-build: core conf static banana wiki openid medals jquery maps
+build: core conf static banana wiki openid medals jquery maps raven
 
 check:
 	@!(find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected')
@@ -170,6 +170,7 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 ## jquery
 ##
 JQUERY_VERSION=1.5.1
+JQUERY_COLOR_VERSION=2.1.2
 JQUERY_PLUGINS=color form
 JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS)))
 
@@ -191,7 +192,7 @@ htdocs/javascript/jquery.xorg.js: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_P
 htdocs/javascript/jquery.ui.xorg.js: $(JQUERY_UI_PATHES) htdocs/javascript/jquery.ui.datepicker-fr.js
 	cat $^ > $@
 
-htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://jquery.com/src/$(@F)
+htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://code.jquery.com/$(@F)
 htdocs/javascript/jquery-$(JQUERY_VERSION).min.js:
 	@-rm htdocs/javascript/jquery-*.min.js
 	@$(download)
@@ -199,9 +200,17 @@ htdocs/javascript/jquery-$(JQUERY_VERSION).min.js:
 htdocs/javascript/jquery.js: htdocs/javascript/jquery-$(JQUERY_VERSION).min.js
 	ln -snf $(<F) $@
 
-$(JQUERY_PLUGINS_PATHES): DOWNLOAD_SRC = http://plugins.jquery.com/files/$(@F)_0.txt
-$(JQUERY_PLUGINS_PATHES):
-	@-rm htdocs/javascript/jquery.ui*.$*.js
+htdocs/javascript/jquery.color-$(JQUERY_COLOR_VERSION).min.js: DOWNLOAD_SRC = http://code.jquery.com/color/$(@F)
+htdocs/javascript/jquery.color-$(JQUERY_COLOR_VERSION).min.js:
+	@-rm htdocs/javascript/jquery.color-*.min.js
+	@$(download)
+
+htdocs/javascript/jquery.color.js: htdocs/javascript/jquery.color-$(JQUERY_COLOR_VERSION).min.js
+	ln -snf $(<F) $@
+
+htdocs/javascript/jquery.form.js: DOWNLOAD_SRC = http://malsup.github.com/min/jquery.form.min.js
+htdocs/javascript/jquery.form.js:
+	@-rm htdocs/javascript/jquery.form*.js
 	@$(download)
 
 htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js: DOWNLOAD_SRC = http://jquery-ui.googlecode.com/svn/tags/$(JQUERY_UI_VERSION)/ui/minified/jquery.ui.$*.min.js
@@ -242,9 +251,25 @@ $(JSTREE_PATH):
 ##
 maps: htdocs/javascript/markerclusterer.js
 
-## Try and use taged version asap (from http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/…).
+## Try and use taged version asap (from http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/...).
+## Force to use https to retrieve images
 htdocs/javascript/markerclusterer.js:
-	wget "http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/src/markerclusterer_compiled.js?r=308" -O htdocs/javascript/markerclusterer.js
+	wget 'http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/src/markerclusterer_compiled.js?r=308' -O $@.tmp -q || ($(RM) $@.tmp; false)
+	sed 's,http\(://google-maps-utility-library-v3.googlecode.com\),https\1,g' < $@.tmp > $@
+	$(RM) $@.tmp
+
+##
+## Raven-js
+##
+RAVEN_VERSION=1.1.2
+raven: $(addprefix htdocs/javascript/raven.,min.js min.map js)
+
+# Documentation: http://raven-js.readthedocs.org/en/latest/install/index.html
+htdocs/javascript/raven.%: DOWNLOAD_SRC = http://cdn.ravenjs.com/$(RAVEN_VERSION)/$(@F)
+htdocs/javascript/raven.%:
+	@-rm $@
+	$(download)
+
 
 ##
 ## lists rpc
@@ -265,8 +290,10 @@ restart-listrpc: stop-listrpc start-listrpc
 
 ################################################################################
 
-.PHONY: build dist clean core http* check test
-.PHONY: wiki build-wiki
+.PHONY: all build dist clean core http* q check test
+.PHONY: wiki build-wiki get-wiki
+.PHONY: openid
 .PHONY: banana banana-sub htdocs/images/banana htdocs/css/banana.css
+.PHONY: medals jquery maps raven
 .PHONY: start-listrpc start-listrpc-fg stop-listrpc restart-listrpc
 .PHONY: up update doc