X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=3233b9fd24d1c250b93b83a1b86f21c50a87e2b3;hb=ee54e839e8a28c0d7b2f2a622158749313f7c0b6;hp=3fb1921d911878c0fa605596d80821f0f798383d;hpb=ba47d308c452b1de51336b006ff2b1337dd9bd00;p=platal.git

diff --git a/Makefile b/Makefile
index 3fb1921..3233b9f 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ endef
 
 all: build
 
-build: core conf banana wiki openid medals jquery
+build: core conf static banana wiki openid medals jquery
 
 q:
 	@echo -e "Code statistics\n"
@@ -62,6 +62,14 @@ htdocs/.htaccess: htdocs/.htaccess.in Makefile
 	sed -e "s,@REWRITE_BASE@,$$REWRITE_BASE,g" $< > $@
 
 ##
+## static content
+##
+static: htdocs/javascript@VERSION
+
+%@VERSION: % Makefile ChangeLog
+	cd $< && rm -f $(VERSION) && ln -sf . $(VERSION)
+
+##
 ## wiki
 ##
 
@@ -115,20 +123,20 @@ get-wiki:
 openid: get-openid spool/openid/store
 
 # There is no obvious way to automatically use the latest version
+OPENID_VERSION = 2.1.3
 get-openid:
 	@if ! test -d include/Auth; then                                  \
-	    wget http://openidenabled.com/files/php-openid/packages/php-openid-2.1.2.tar.bz2; \
-	    tar -xjf php-openid-2.1.2.tar.bz2;                            \
-	    mv php-openid-2.1.2/Auth include/;                            \
-	    rm php-openid-2.1.2.tar.bz2;                                  \
-	    rm -r php-openid-2.1.2;                                       \
+	    wget http://openidenabled.com/files/php-openid/packages/php-openid-$(OPENID_VERSION).tar.bz2; \
+	    tar -xjf php-openid-$(OPENID_VERSION).tar.bz2;                \
+	    mv php-openid-$(OPENID_VERSION)/Auth include/;                \
+	    rm php-openid-$(OPENID_VERSION).tar.bz2;                      \
+	    rm -r php-openid-$(OPENID_VERSION);                           \
 	fi
 
 spool/openid/store:
 	mkdir -p $@
 	chmod o+w $@
 
-
 ##
 ## banana
 ##
@@ -161,16 +169,15 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 JQUERY_PLUGINS=color
 JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS)))
 
-jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js $(JQUERY_PLUGINS_PATHES)
+# 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)
 
 htdocs/javascript/jquery.js: DOWNLOAD_SRC = http://jquery.com/src/jquery-latest.min.js
 htdocs/javascript/jquery.js:
 	@$(download)
 
-htdocs/javascript/jquery.autocomplete.js: DOWNLOAD_SRC = http://jquery-autocomplete.googlecode.com/svn/trunk/jquery.autocomplete.js
-htdocs/javascript/jquery.autocomplete.js:
-	@$(download)
-
 $(JQUERY_PLUGINS_PATHES): DOWNLOAD_SRC = http://plugins.jquery.com/files/$(@F).txt
 $(JQUERY_PLUGINS_PATHES):
 	@$(download)