X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=90a37136a62f53460f17eca9a343c6e7e4ba0567;hb=2b13c66c646c46b57037bc6b1ff0adf84988b3fc;hp=4171e6b8e997a4d46d62dd795ba73198cc2222e1;hpb=91a3c52142f3fef6d6074fa94413d4492dcca1d3;p=platal.git

diff --git a/Makefile b/Makefile
index 4171e6b..90a3713 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,9 @@ up: update
 update:
 	@git fetch && git rebase `git symbolic-ref HEAD | sed -e 's~refs/heads/~origin/~'` && git submodule update
 
+doc:
+	@doxygen core/doc/doxygen.cfg
+
 ################################################################################
 # targets
 
@@ -179,12 +182,12 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 ##
 ## jquery
 ##
-JQUERY_VERSION=1.4.4
+JQUERY_VERSION=1.5.1
 JQUERY_PLUGINS=color form
 JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS)))
 
-JQUERY_UI_VERSION=1.8.7
-JQUERY_UI=core tabs datepicker widget
+JQUERY_UI_VERSION=1.8.10
+JQUERY_UI=core widget tabs datepicker
 JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI)))
 
 JQUERY_TMPL_VERSION=vBeta1.0.0
@@ -196,7 +199,13 @@ JSTREE_PATH=htdocs/javascript/jquery.jstree.js
 # TODO: jquery.autocomplete.js should rather be downloaded from an official source. The issue
 # is that the version we use is not available anymore on the Internet, and the latest version
 # we could use is not backward compatible with our current code.
-jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES) $(JQUERY_TMPL_PATH) $(JSTREE_PATH) htdocs/javascript/jquery.ui.datepicker-fr.js
+jquery: htdocs/javascript/jquery.xorg.js htdocs/javascript/jquery.ui.xorg.js $(JSTREE_PATH)
+
+htdocs/javascript/jquery.xorg.js: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_TMPL_PATH) htdocs/javascript/jquery.autocomplete.js
+	cat $^ > $@
+
+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:
@@ -222,7 +231,7 @@ htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).datepicker-fr.js:
 $(JQUERY_UI_PATHES) htdocs/javascript/jquery.ui.datepicker-fr.js: htdocs/javascript/jquery.ui.%.js: htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js
 	ln -snf $(<F) $@
 
-htdocs/javascript/jquery.tmpl-$(JQUERY_TMPL_VERSION).js: DOWNLOAD_SRC = https://github.com/jquery/jquery-tmpl/raw/$(JQUERY_TMPL_VERSION)/jquery.tmpl.min.js --no-check-certificate
+htdocs/javascript/jquery.tmpl-$(JQUERY_TMPL_VERSION).js: DOWNLOAD_SRC = https://github.com/jquery/jquery-tmpl/raw/$(JQUERY_TMPL_VERSION)/jquery.tmpl.js --no-check-certificate
 htdocs/javascript/jquery.tmpl-$(JQUERY_TMPL_VERSION).js:
 	@-rm htdocs/javascript/jquery.tmpl*.js
 	@$(download)
@@ -268,4 +277,4 @@ restart-listrpc: stop-listrpc start-listrpc
 .PHONY: wiki build-wiki
 .PHONY: banana banana-sub htdocs/images/banana htdocs/css/banana.css
 .PHONY: start-listrpc start-listrpc-fg stop-listrpc restart-listrpc
-.PHONY: up update
+.PHONY: up update doc