X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=446aedd0a76c5847452d6a9233d8c4f4fb4b4e35;hb=e46cf8c46341b447cc3701c8afcc9baec3da11e5;hp=768d9cade79bc457976d91d2cd245a08812dfe2d;hpb=e22c2761d5be9abc55283092cd0f92e5c53fb93c;p=platal.git

diff --git a/Makefile b/Makefile
index 768d9ca..446aedd 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,11 @@
 ################################################################################
 # definitions
 
-VERSION := $(shell grep VERSION ChangeLog | head -1 | sed -e "s/VERSION //;s/\t.*//;s/ .*//")
+VERSNUM := $(shell grep VERSION ChangeLog | head -1 | sed -e "s/VERSION //;s/ .*//")
+VERSTAG := $(shell grep VERSION ChangeLog | head -1 | grep 'XX' > /dev/null 2> /dev/null && echo 'beta')
+BANANA  := $(shell ( [ -d ../banana ] && echo `pwd`"/../banana" ) || echo "/home/web/dev/banana")
+
+VERSION = $(VERSNUM)$(VERSTAG)
 
 PKG_NAME = platal
 PKG_DIST = $(PKG_NAME)-$(VERSION)
@@ -12,12 +16,20 @@ PKG_DIRS = configs htdocs include install.d plugins po scripts templates upgrade
 
 VCS_FILTER = ! -name .arch-ids ! -name CVS
 
+define download
+@echo "Downloading $@ from $(DOWNLOAD_SRC)"
+wget $(DOWNLOAD_SRC) -O $@ -q || ($(RM) $@; exit 1)
+endef
+
 ################################################################################
 # global targets
 
 all: build
 
-build: core banana wiki jquery
+build: core conf banana wiki openid medals jquery
+
+check:
+	@!(find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected')
 
 q:
 	@echo -e "Code statistics\n"
@@ -33,9 +45,17 @@ q:
 ## core
 ##
 
-core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess
+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/templates_c spool/mails_c spool/uploads spool/conf spool/tmp:
 	mkdir -p $@
 	chmod o+w $@
 
@@ -60,7 +80,7 @@ wiki: get-wiki build-wiki
 
 build-wiki: $(WIKI_NEEDS) | get-wiki
 
-htdocs/uploads: spool/uploads
+htdocs/uploads:
 	cd htdocs && ln -sf ../spool/uploads
 
 htdocs/wiki:
@@ -86,31 +106,85 @@ 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
 ##
 
-banana: htdocs/images/banana htdocs/css/banana.css
+banana: htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php
 htdocs/images/banana:
-	cd $(@D) && ln -sf /usr/share/banana/img $(@F)
+	cd $(@D) && ln -snf $(BANANA)/img $(@F)
 
 htdocs/css/banana.css:
-	cd $(@D) && ln -sf /usr/share/banana/css/style.css $(@F)
+	cd $(@D) && ln -snf $(BANANA)/css/style.css $(@F)
+
+include/banana/banana.inc.php:
+	cd $(@D) && find $(BANANA)/banana/ -name '*.php' -exec ln -snf {} . ";"
+
+##
+## Medal thumbnails
+##
+MEDAL_PICTURES=$(wildcard htdocs/images/medals/*.jpg)
+MEDAL_THUMBNAILS=$(subst /medals/,/medals/thumb/,$(MEDAL_PICTURES))
+
+medals: $(MEDAL_THUMBNAILS)
+
+$(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
+	convert -resize x50 $(subst /medals/thumb/,/medals/,$@) $@
 
 ##
 ## jquery
 ##
 
-jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js
+JQUERY_PLUGINS=color
+JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS)))
+
+JQUERY_UI=core tabs
+JQUERY_UI_PATHES=$(addprefix htdocs/javascript/ui.,$(addsuffix .js,$(JQUERY_UI)))
+
+# 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.js: DOWNLOAD_SRC = http://jquery.com/src/jquery-latest.min.js
 htdocs/javascript/jquery.js:
-	wget http://jquery.com/src/jquery-latest.pack.js -O $@ -q || ($(RM) $@; exit 1)
+	@$(download)
+
+$(JQUERY_PLUGINS_PATHES): DOWNLOAD_SRC = http://plugins.jquery.com/files/$(@F).txt
+$(JQUERY_PLUGINS_PATHES):
+	@$(download)
+
+$(JQUERY_UI_PATHES): DOWNLOAD_SRC = http://ui.jquery.com/latest/ui/$(@F)
+$(JQUERY_UI_PATHES):
+	@$(download)
 
 ################################################################################
 
-.PHONY: build dist clean wiki build-wiki banana
+.PHONY: build dist clean core wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http* check