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)
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"
%: %.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
##
core:
- [ -d core ] || ( git submodule init && git submodule update )
+ [ -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
+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 $@
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
##
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
##
+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
##
## jquery
##
-
-JQUERY_PLUGINS=color
+JQUERY_VERSION=1.4.4
+JQUERY_PLUGINS=color form
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)))
+JQUERY_UI_VERSION=1.8.7
+JQUERY_UI=core tabs widget
+JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI)))
-jquery: htdocs/javascript/jquery.js htdocs/javascript/jquery.autocomplete.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES)
+JQUERY_TMPL_VERSION=vBeta1.0.0
+JQUERY_TMPL_PATH=htdocs/javascript/jquery.tmpl.js
-htdocs/javascript/jquery.js: DOWNLOAD_SRC = http://jquery.com/src/jquery-latest.min.js
-htdocs/javascript/jquery.js:
- @$(download)
+JSTREE_VERSION=1.0rc2
+JSTREE_PATH=htdocs/javascript/jquery.jstree.js
-htdocs/javascript/jquery.autocomplete.js: DOWNLOAD_SRC = http://jquery-autocomplete.googlecode.com/svn/trunk/jquery.autocomplete.js
-htdocs/javascript/jquery.autocomplete.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_TMPL_PATH) $(JSTREE_PATH)
+
+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)
-$(JQUERY_PLUGINS_PATHES): DOWNLOAD_SRC = http://plugins.jquery.com/files/$(@F).txt
+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)_0.txt
$(JQUERY_PLUGINS_PATHES):
+ @-rm htdocs/javascript/jquery.ui*.$*.js
@$(download)
-$(JQUERY_UI_PATHES): DOWNLOAD_SRC = http://ui.jquery.com/latest/ui/$(@F)
-$(JQUERY_UI_PATHES):
+htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js: DOWNLOAD_SRC = http://jquery-ui.googlecode.com/svn/tags/$(JQUERY_UI_VERSION)/ui/minified/jquery.ui.$*.min.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
+htdocs/javascript/jquery.tmpl-$(JQUERY_TMPL_VERSION).js: DOWNLOAD_SRC = https://github.com/jquery/jquery-tmpl/raw/$(JQUERY_TMPL_VERSION)/jquery.tmpl.min.js --no-check-certificate
+htdocs/javascript/jquery.tmpl-$(JQUERY_TMPL_VERSION).js:
+ @-rm htdocs/javascript/jquery.tmpl*.js
+ @$(download)
+
+$(JQUERY_TMPL_PATH): htdocs/javascript/jquery.tmpl-$(JQUERY_TMPL_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
+
+
+##
+## 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
projects / platal.git / blobdiff