X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=6a8a175e4515514cf238fb235d0bfa86a4cc6fe3;hb=ee3e477faa6c7aa33b2151ec4019dd87a8015d76;hp=ef741855e9fca37e6fbb2793596386101b95c64d;hpb=98c7bd6aab4205686eabb0a79fc6c46200ef5e47;p=platal.git

diff --git a/Makefile b/Makefile
index ef74185..6a8a175 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ endef
 
 all: build
 
-build: core conf static banana wiki openid medals jquery
+build: core conf static banana wiki openid medals jquery maps
 
 check:
 	@!(find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected')
@@ -45,7 +45,7 @@ update:
 	@git fetch && git rebase `git symbolic-ref HEAD | sed -e 's~refs/heads/~origin/~'` && git submodule update
 
 doc:
-	@doxygen doc/doxygen.cfg
+	@doxygen core/doc/doxygen.cfg
 
 ################################################################################
 # targets
@@ -76,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
@@ -84,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
 ##
@@ -135,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
@@ -182,12 +169,12 @@ $(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=core widget tabs datepicker
+JQUERY_UI_VERSION=1.8.10
+JQUERY_UI=core widget tabs datepicker autocomplete position
 JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI)))
 
 JQUERY_TMPL_VERSION=vBeta1.0.0
@@ -196,12 +183,9 @@ JQUERY_TMPL_PATH=htdocs/javascript/jquery.tmpl.js
 JSTREE_VERSION=1.0rc2
 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.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
+htdocs/javascript/jquery.xorg.js: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_TMPL_PATH)
 	cat $^ > $@
 
 htdocs/javascript/jquery.ui.xorg.js: $(JQUERY_UI_PATHES) htdocs/javascript/jquery.ui.datepicker-fr.js
@@ -224,7 +208,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
@@ -249,6 +237,14 @@ $(JSTREE_PATH):
 	ln -snf jquery.jstree-$(JSTREE_VERSION).js htdocs/javascript/jquery.jstree.js
 	rm -Rf spool/tmp/jstree
 
+##
+## Maps auxiliary scripts
+##
+maps: htdocs/javascript/markerclusterer.js
+
+## Try and use taged version asap (from http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/…).
+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
 
 ##
 ## lists rpc