X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=232aa1f80d95519738d8ab420965ce9fb8edc03d;hb=dc4fabf8df4a8a6321ad13cd9440d7c29e9781ae;hp=9bdef660b49afc9e10866a5f750dd0541cd17fa0;hpb=b8971a3ed64f3ba69becf1cd8f3b32ee2292026d;p=platal.git

diff --git a/Makefile b/Makefile
index 9bdef66..232aa1f 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ endef
 
 all: build
 
-build: core banana wiki medals jquery
+build: core conf banana wiki openid medals jquery
 
 q:
 	@echo -e "Code statistics\n"
@@ -42,7 +42,15 @@ q:
 ## core
 ##
 
-core: spool/templates_c spool/mails_c classes/platalglobals.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp
+core:
+	[ -d core/.git ] || ( git submodule init && git submodule update )
+	make -C core all
+
+##
+## conf
+##
+
+conf: spool/templates_c spool/mails_c classes/platalglobals.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp 
 
 spool/templates_c spool/mails_c spool/uploads spool/conf spool/tmp:
 	mkdir -p $@
@@ -95,11 +103,32 @@ 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
+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;                                       \
 	fi
 
+spool/openid/store:
+	mkdir -p $@
+	chmod o+w $@
+
+
 ##
 ## banana
 ##
@@ -132,21 +161,20 @@ $(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.pack.js
+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)
 
 ################################################################################
 
-.PHONY: build dist clean wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http*
+.PHONY: build dist clean core wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http*