Fixes display of emails in profile edition.

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index 3233b9f..bb8ae77 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@
 
 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)
 
@@ -28,6 +27,12 @@ all: build
 
 build: core conf static banana wiki openid medals jquery
 
+check:
+       @!(find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected')
+
+test:
+       make -C core test
+
 q:
        @echo -e "Code statistics\n"
        @sloccount $(filter-out wiki/ spool/, $(wildcard */)) 2> /dev/null | egrep '^[a-z]*:'
@@ -52,7 +57,7 @@ core:
 
 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:
+spool/templates_c spool/mails_c spool/uploads spool/conf spool/tmp spool/run:
        mkdir -p $@
        chmod o+w $@
 
@@ -140,16 +145,15 @@ spool/openid/store:
 ##
 ## banana
 ##
+banana: htdocs/images/banana htdocs/css/banana.css
+htdocs/images/banana: banana-sub
+       cd $(@D) && ln -snf ../../banana/img $(@F)
 
-banana: htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php
-htdocs/images/banana:
-       cd $(@D) && ln -snf $(BANANA)/img $(@F)
+htdocs/css/banana.css: banana-sub
+       cd $(@D) && ln -snf ../../banana/css/style.css $(@F)
 
-htdocs/css/banana.css:
-       cd $(@D) && ln -snf $(BANANA)/css/style.css $(@F)
-
-include/banana/banana.inc.php:
-       cd $(@D) && find $(BANANA)/banana/ -name '*.php' -exec ln -snf {} . ";"
+banana-sub:
+       make -C banana
 
 ##
 ## Medal thumbnails
@@ -165,24 +169,59 @@ $(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_UI_VERSION=1.6
+JQUERY_UI=core tabs
+JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.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: 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:
+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)
 
-.PHONY: build dist clean core wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http*
+$(JQUERY_UI_PATHES): htdocs/javascript/jquery.ui.%.js: htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js
+       ln -snf $(<F) $@
+
+##
+## lists rpc
+##
+start-listrpc: spool/run
+       sudo -u list /sbin/start-stop-daemon --pidfile spool/run/listrpc.pid -m -b -x $$PWD/bin/lists.rpc.py --start
+       @sleep 2
+       @sudo -u list kill -0 $$(cat spool/run/listrpc.pid)
+
+start-listrpc-fg: spool/run
+       sudo -u list ./bin/lists.rpc.py
+
+stop-listrpc:
+       -sudo -u list /sbin/start-stop-daemon --pidfile spool/run/listrpc.pid --stop
+       @-rm -f spool/run/listrpc.pid
+
+restart-listrpc: stop-listrpc start-listrpc
+
+################################################################################
 
+.PHONY: build dist clean core http* check test
+.PHONY: wiki build-wiki
+.PHONY: banana banana-sub htdocs/images/banana htdocs/css/banana.css
+.PHONY: start-listrpc start-listrpc-fg stop-listrpc restart-listrpc