X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=aecab8c7bb0d100d99a8b60b707e7b66f58c553d;hb=4d1f0f6bd236c719cf3bc2119767424dbf86616f;hp=958a9b1e6471e90afe2e740806abd11ee28221c5;hpb=384712208a260ae1b5b7e90ac95f0df84ffbe8af;p=platal.git

diff --git a/Makefile b/Makefile
index 958a9b1..aecab8c 100644
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,13 @@ endef
 
 all: build
 
-build: core conf banana wiki openid medals jquery
+build: core conf static banana wiki openid medals jquery
 
 check:
-	@find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected'
+	@!(find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected')
+
+test:
+	make -C core test
 
 q:
 	@echo -e "Code statistics\n"
@@ -46,7 +49,7 @@ q:
 ##
 
 core:
-	[ -d core ] || ( git submodule init && git submodule update )
+	[ -d core/.git ] || ( git submodule init && git submodule update )
 	make -C core all
 
 ##
@@ -65,6 +68,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
 ##
 
@@ -118,20 +129,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
 ##
@@ -160,25 +171,40 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 ##
 ## jquery
 ##
-
+JQUERY_VERSION=1.4.2
 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)
+JQUERY_UI_VERSION=1.6
+JQUERY_UI=core tabs
+JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI)))
 
-htdocs/javascript/jquery.js: DOWNLOAD_SRC = http://jquery.com/src/jquery-latest.min.js
-htdocs/javascript/jquery.js:
-	@$(download)
+# 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) $(JQUERY_UI_PATHES)
 
-htdocs/javascript/jquery.autocomplete.js: DOWNLOAD_SRC = http://jquery-autocomplete.googlecode.com/svn/trunk/jquery.autocomplete.js
-htdocs/javascript/jquery.autocomplete.js:
+htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://jquery.com/src/$(@F)
+htdocs/javascript/jquery-$(JQUERY_VERSION).min.js:
+	@-rm htdocs/javascript/jquery-*.min.js
 	@$(download)
 
+htdocs/javascript/jquery.js: htdocs/javascript/jquery-$(JQUERY_VERSION).min.js
+	ln -snf $(<F) $@
+
 $(JQUERY_PLUGINS_PATHES): DOWNLOAD_SRC = http://plugins.jquery.com/files/$(@F).txt
 $(JQUERY_PLUGINS_PATHES):
+	@-rm htdocs/javascript/jquery.ui*.$*.js
 	@$(download)
 
+htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js: DOWNLOAD_SRC = http://jquery-ui.googlecode.com/svn/tags/$(JQUERY_UI_VERSION)/ui/ui.$*.js
+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
+	ln -snf $(<F) $@
+
 ################################################################################
 
-.PHONY: build dist clean core wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http* check
+.PHONY: build dist clean core wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http* check test