Fixes vcard export (Closes #1296).

[platal.git] / Makefile

diff --git a/Makefile b/Makefile
index 4e808b6..1fa6d71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,10 @@ q:
 %: %.in Makefile ChangeLog
        sed -e 's,@VERSION@,$(VERSION),g' $< > $@
 
+up: update
+update:
+       @git fetch && git rebase `git symbolic-ref HEAD | sed -e 's~refs/heads/~origin/~'` && git submodule update
+
 ################################################################################
 # targets
 
@@ -55,9 +59,9 @@ core:
 ## conf
 ##
 
-conf: spool/templates_c spool/mails_c classes/platalglobals.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp 
+conf: spool/templates_c spool/mails_c classes/platalglobals.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp spool/banana
 
-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 spool/banana:
        mkdir -p $@
        chmod o+w $@
 
@@ -145,16 +149,12 @@ spool/openid/store:
 ##
 ## banana
 ##
-
-banana: htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php
+banana: htdocs/images/banana htdocs/css/banana.css
 htdocs/images/banana: banana-sub
-       cd $(@D) && ln -snf banana/banana/img $(@F)
+       cd $(@D) && ln -snf ../../banana/img $(@F)
 
 htdocs/css/banana.css: banana-sub
-       cd $(@D) && ln -snf banana/css/style.css $(@F)
-
-include/banana/banana.inc.php: banana-sub
-       cd $(@D) && find ../../banana/banana/ -name '*.php' -exec ln -snf {} . ";"
+       cd $(@D) && ln -snf ../../banana/css/style.css $(@F)
 
 banana-sub:
        make -C banana
@@ -174,17 +174,20 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 ## jquery
 ##
 JQUERY_VERSION=1.4.2
-JQUERY_PLUGINS=color
+JQUERY_PLUGINS=color form
 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)))
 
+JSTREE_VERSION=1.0rc2
+JSTREE_PATH=htdocs/javascript/jquery.jstree.js
+
 # 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)
+jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES) $(JSTREE_PATH)
 
 htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://jquery.com/src/$(@F)
 htdocs/javascript/jquery-$(JQUERY_VERSION).min.js:
@@ -194,7 +197,7 @@ htdocs/javascript/jquery-$(JQUERY_VERSION).min.js:
 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): DOWNLOAD_SRC = http://plugins.jquery.com/files/$(@F)_0.txt
 $(JQUERY_PLUGINS_PATHES):
        @-rm htdocs/javascript/jquery.ui*.$*.js
        @$(download)
@@ -206,7 +209,42 @@ htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js:
 $(JQUERY_UI_PATHES): htdocs/javascript/jquery.ui.%.js: htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js
        ln -snf $(<F) $@
 
-################################################################################
+$(JSTREE_PATH):
+       rm -f htdocs/javascript/jquery.jstree-*.js
+       mkdir spool/tmp/jstree
+       wget http://jstree.googlecode.com/files/jsTree.v.$(JSTREE_VERSION).zip -O spool/tmp/jstree/jquery.jstree-$(JSTREE_VERSION).zip
+       unzip spool/tmp/jstree/jquery.jstree-$(JSTREE_VERSION).zip -d spool/tmp/jstree/
+       mv -f spool/tmp/jstree/themes/default/style.css htdocs/css/jstree.css
+       mv -f spool/tmp/jstree/themes/default/d.png htdocs/images/jstree.png
+       mv -f spool/tmp/jstree/jquery.jstree.js htdocs/javascript/jquery.jstree-$(JSTREE_VERSION).js
+       sed -i -e 's/"d\.png"/"..\/images\/jstree.png"/' htdocs/css/jstree.css
+       sed -i -e 's/"throbber\.gif"/"..\/images\/wait.gif"/' htdocs/css/jstree.css
+       sed -i -e 's/#ffffee/inherit/' htdocs/css/jstree.css
+       ln -snf jquery.jstree-$(JSTREE_VERSION).js htdocs/javascript/jquery.jstree.js
+       rm -Rf spool/tmp/jstree
+
 
-.PHONY: build dist clean core wiki build-wiki banana banana-sub htdocs/images/banana htdocs/css/banana.css include/banana/banana.inc.php http* check test
+##
+## 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
+.PHONY: up update