X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=84edd6f563e6ab7cbf1495e7adec4f312eb6324b;hb=99e442152ce11c81dd42c559b8cb09c82177ab52;hp=be74079f7f4a64fab3570ece1c15b930807ec8b9;hpb=905ab10422941d19d99b4957c009914a64d19399;p=platal.git

diff --git a/Makefile b/Makefile
index be74079..84edd6f 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
 
@@ -73,7 +76,7 @@ htdocs/.htaccess: htdocs/.htaccess.in Makefile
 ##
 ## static content
 ##
-static: htdocs/javascript/core.js htdocs/javascript@VERSION
+static: htdocs/javascript/core.js htdocs/javascript@VERSION htdocs/javascript/json2.js
 
 htdocs/javascript/core.js:
 	cd htdocs/javascript/ && ln -s ../../core/htdocs/javascript/core.js
@@ -81,6 +84,10 @@ htdocs/javascript/core.js:
 %@VERSION: % Makefile ChangeLog
 	cd $< && rm -f $(VERSION) && ln -sf . $(VERSION)
 
+htdocs/javascript/json2.js: DOWNLOAD_SRC = https://github.com/douglascrockford/JSON-js/raw/master/json2.js --no-check-certificate
+htdocs/javascript/json2.js:
+	@$(download)
+
 ##
 ## wiki
 ##
@@ -132,25 +139,8 @@ get-wiki:
 ## openid
 ##
 
-openid: get-openid spool/openid/store
-
-# There is no obvious way to automatically use the latest version
-OPENID_VERSION = 2.2.2
-OPENID_COMMIT  = 782224d
-get-openid:
-	@if ! test -d include/Auth; then                                  \
-		wget --no-check-certificate                                   \
-			https://github.com/openid/php-openid/tarball/$(OPENID_VERSION) \
-			-O php-openid-$(OPENID_VERSION).tar.gz; \
-		tar -xzf php-openid-$(OPENID_VERSION).tar.gz;                \
-		mv openid-php-openid-$(OPENID_COMMIT)/Auth include/;                \
-		rm php-openid-$(OPENID_VERSION).tar.gz;                      \
-		rm -r openid-php-openid-$(OPENID_COMMIT);                           \
-	fi
-
-spool/openid/store:
-	mkdir -p $@
-	chmod o+w $@
+openid:
+	-rm -rf include/Auth
 
 ##
 ## banana
@@ -179,11 +169,11 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 ##
 ## jquery
 ##
-JQUERY_VERSION=1.5
+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_VERSION=1.8.10
 JQUERY_UI=core widget tabs datepicker
 JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI)))
 
@@ -221,7 +211,11 @@ htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js: DOWNLOAD_SRC = http://jqu
 htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js:
 	@$(download)
 
-$(JQUERY_UI_PATHES): htdocs/javascript/jquery.ui.%.js: htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js
+htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).datepicker-fr.js: DOWNLOAD_SRC = http://jquery-ui.googlecode.com/svn/tags/$(JQUERY_UI_VERSION)/ui/minified/i18n/jquery.ui.datepicker-fr.min.js
+htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).datepicker-fr.js:
+	@$(download)
+
+$(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.js --no-check-certificate
@@ -270,4 +264,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