X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=ba24d7eede2def15d33ae7679510e441112661b8;hb=87f8bf5aa29183f7fdd3dea37ac7caccd7da9086;hp=6b18c746929c6324a459a3c6a502a84556ff636d;hpb=7e846cdf3eccd46da782dd6eba28043c842c2949;p=platal.git

diff --git a/Makefile b/Makefile
index 6b18c74..ba24d7e 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ endef
 
 all: build
 
-build: core conf banana wiki medals jquery
+build: core conf banana wiki openid medals jquery
 
 q:
 	@echo -e "Code statistics\n"
@@ -43,7 +43,7 @@ q:
 ##
 
 core:
-	[ -d core ] || ( git submodule init && git submodule update )
+	[ -d core/.git ] || ( git submodule init && git submodule update )
 	make -C core all
 
 ##
@@ -103,12 +103,33 @@ wiki/pub/skins/empty:
 get-wiki:
 	@if ! test -d wiki; then                                          \
 	    wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz;      \
-	    tar -xzvf pmwiki-latest.tgz;				  \
-	    rm pmwiki-latest.tgz;					  \
-	    mv pmwiki-* wiki;						  \
+	    tar -xzvf pmwiki-latest.tgz;                                  \
+	    rm pmwiki-latest.tgz;                                         \
+	    mv pmwiki-* wiki;                                             \
 	fi
 
 ##
+## openid
+##
+
+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-$(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
 ##
 
@@ -140,16 +161,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)