X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=30bf7ce9a5ffa99fd789bb16de9d353a7b5c6722;hb=HEAD;hp=4e808b6364ffb9b962aa86dbb6e467e6d3a82717;hpb=1fccdc2430528143c120eea03ecbc4e1ead448bf;p=platal.git

diff --git a/Makefile b/Makefile
index 4e808b6..30bf7ce 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ endef
 
 all: build
 
-build: core conf static banana wiki openid medals jquery
+build: core conf static banana wiki openid medals jquery maps raven
 
 check:
 	@!(find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected')
@@ -40,6 +40,13 @@ 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
+
+doc:
+	@doxygen core/doc/doxygen.cfg
+
 ################################################################################
 # targets
 
@@ -55,9 +62,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 $@
 
@@ -69,11 +76,18 @@ htdocs/.htaccess: htdocs/.htaccess.in Makefile
 ##
 ## static content
 ##
-static: htdocs/javascript@VERSION
+static: htdocs/javascript/core.js htdocs/javascript@VERSION htdocs/javascript/json2.js
+
+htdocs/javascript/core.js:
+	cd htdocs/javascript/ && ln -s ../../core/htdocs/javascript/core.js
 
 %@VERSION: % Makefile ChangeLog
 	cd $< && rm -f $(VERSION) && ln -sf . $(VERSION)
 
+htdocs/javascript/json2.js: DOWNLOAD_SRC = https://github.com/douglascrockford/JSON-js/raw/master/json2.js --no-check-certificate
+htdocs/javascript/json2.js:
+	@$(download)
+
 ##
 ## wiki
 ##
@@ -115,46 +129,28 @@ 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;                                             \
+		wget http://www.pmwiki.org/pub/pmwiki/pmwiki-latest.tgz;      \
+		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 $@
+openid:
+	-rm -rf include/Auth
 
 ##
 ## 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
@@ -173,20 +169,30 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 ##
 ## jquery
 ##
-JQUERY_VERSION=1.4.2
-JQUERY_PLUGINS=color
+JQUERY_VERSION=1.5.1
+JQUERY_COLOR_VERSION=2.1.2
+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_VERSION=1.8.10
+JQUERY_UI=core widget tabs datepicker autocomplete position
 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_UI_PATHES)
+JQUERY_TMPL_VERSION=vBeta1.0.0
+JQUERY_TMPL_PATH=htdocs/javascript/jquery.tmpl.js
+
+JSTREE_VERSION=1.0rc2
+JSTREE_PATH=htdocs/javascript/jquery.jstree.js
+
+jquery: htdocs/javascript/jquery.xorg.js htdocs/javascript/jquery.ui.xorg.js $(JSTREE_PATH)
 
-htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://jquery.com/src/$(@F)
+htdocs/javascript/jquery.xorg.js: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_TMPL_PATH)
+	cat $^ > $@
+
+htdocs/javascript/jquery.ui.xorg.js: $(JQUERY_UI_PATHES) htdocs/javascript/jquery.ui.datepicker-fr.js
+	cat $^ > $@
+
+htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://code.jquery.com/$(@F)
 htdocs/javascript/jquery-$(JQUERY_VERSION).min.js:
 	@-rm htdocs/javascript/jquery-*.min.js
 	@$(download)
@@ -194,19 +200,100 @@ 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):
-	@-rm htdocs/javascript/jquery.ui*.$*.js
+htdocs/javascript/jquery.color-$(JQUERY_COLOR_VERSION).min.js: DOWNLOAD_SRC = http://code.jquery.com/color/$(@F)
+htdocs/javascript/jquery.color-$(JQUERY_COLOR_VERSION).min.js:
+	@-rm htdocs/javascript/jquery.color-*.min.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.color.js: htdocs/javascript/jquery.color-$(JQUERY_COLOR_VERSION).min.js
+	ln -snf $(<F) $@
+
+htdocs/javascript/jquery.form.js: DOWNLOAD_SRC = http://malsup.github.com/min/jquery.form.min.js
+htdocs/javascript/jquery.form.js:
+	@-rm htdocs/javascript/jquery.form*.js
+	@$(download)
+
+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
+htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).datepicker-fr.js: DOWNLOAD_SRC = http://jquery-ui.googlecode.com/svn/tags/$(JQUERY_UI_VERSION)/ui/minified/i18n/jquery.ui.datepicker-fr.min.js
+htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).datepicker-fr.js:
+	@$(download)
+
+$(JQUERY_UI_PATHES) htdocs/javascript/jquery.ui.datepicker-fr.js: htdocs/javascript/jquery.ui.%.js: htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js
 	ln -snf $(<F) $@
 
-################################################################################
+htdocs/javascript/jquery.tmpl-$(JQUERY_TMPL_VERSION).js: DOWNLOAD_SRC = https://github.com/jquery/jquery-tmpl/raw/$(JQUERY_TMPL_VERSION)/jquery.tmpl.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
 
-.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
+##
+## Maps auxiliary scripts
+##
+maps: htdocs/javascript/markerclusterer.js
+
+## Try and use taged version asap (from http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/...).
+## Force to use https to retrieve images
+htdocs/javascript/markerclusterer.js:
+	wget 'http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/src/markerclusterer_compiled.js?r=308' -O $@.tmp -q || ($(RM) $@.tmp; false)
+	sed 's,http\(://google-maps-utility-library-v3.googlecode.com\),https\1,g' < $@.tmp > $@
+	$(RM) $@.tmp
+
+##
+## Raven-js
+##
+RAVEN_VERSION=1.1.2
+raven: $(addprefix htdocs/javascript/raven.,min.js min.map js)
+
+# Documentation: http://raven-js.readthedocs.org/en/latest/install/index.html
+htdocs/javascript/raven.%: DOWNLOAD_SRC = http://cdn.ravenjs.com/$(RAVEN_VERSION)/$(@F)
+htdocs/javascript/raven.%:
+	@-rm $@
+	$(download)
+
+
+##
+## 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: all build dist clean core http* q check test
+.PHONY: wiki build-wiki get-wiki
+.PHONY: openid
+.PHONY: banana banana-sub htdocs/images/banana htdocs/css/banana.css
+.PHONY: medals jquery maps raven
+.PHONY: start-listrpc start-listrpc-fg stop-listrpc restart-listrpc
+.PHONY: up update doc