X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=bb8ae77239eca94ee5f105fc34177d840bb66ac2;hb=79e610a9c765e4a6425e2dfb203caea643ace50d;hp=e92826348fae3cf0942565f17910a1dee4d98455;hpb=889d98079cdcca4a527fbbcfc55e2e5f928b9acf;p=platal.git

diff --git a/Makefile b/Makefile
index e928263..bb8ae77 100644
--- 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)
 
@@ -31,6 +30,9 @@ 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]*:'
@@ -55,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 $@
 
@@ -143,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:
-	cd $(@D) && ln -snf $(BANANA)/css/style.css $(@F)
+htdocs/css/banana.css: banana-sub
+	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
@@ -168,11 +169,11 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 ##
 ## jquery
 ##
-JQUERY_VERSION=1.3.2
+JQUERY_VERSION=1.4.2
 JQUERY_PLUGINS=color
 JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS)))
 
-JQUERY_UI_VERSION=1.7.2
+JQUERY_UI_VERSION=1.6
 JQUERY_UI=core tabs
 JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI)))
 
@@ -183,13 +184,15 @@ jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES)
 
 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 $< $@
+	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
@@ -197,9 +200,28 @@ 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 $< $@
+	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)
 
-.PHONY: build dist clean core wiki build-wiki banana htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http* check
+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