X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=90a37136a62f53460f17eca9a343c6e7e4ba0567;hb=d82359a556779137f8a90d0312b3098a2db6f482;hp=e4b15e5f02ed4b9a46aa3673db9285e3ec2d65ba;hpb=5660032ac785d410f90e3f5b0d6948dc90b0cfea;p=platal.git diff --git a/Makefile b/Makefile index e4b15e5..90a3713 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]*:' @@ -38,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 @@ -53,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 $@ @@ -67,7 +76,10 @@ htdocs/.htaccess: htdocs/.htaccess.in Makefile ## ## static content ## -static: htdocs/javascript@VERSION +static: htdocs/javascript/core.js htdocs/javascript@VERSION + +htdocs/javascript/core.js: + cd htdocs/javascript/ && ln -s ../../core/htdocs/javascript/core.js %@VERSION: % Makefile ChangeLog cd $< && rm -f $(VERSION) && ln -sf . $(VERSION) @@ -113,10 +125,10 @@ 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 ## @@ -126,14 +138,17 @@ get-wiki: openid: get-openid spool/openid/store # There is no obvious way to automatically use the latest version -OPENID_VERSION = 2.1.3 +OPENID_VERSION = 2.2.2 +OPENID_COMMIT = 782224d 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); \ + wget --no-check-certificate \ + https://github.com/openid/php-openid/tarball/$(OPENID_VERSION) \ + -O php-openid-$(OPENID_VERSION).tar.gz; \ + tar -xzf php-openid-$(OPENID_VERSION).tar.gz; \ + mv openid-php-openid-$(OPENID_COMMIT)/Auth include/; \ + rm php-openid-$(OPENID_VERSION).tar.gz; \ + rm -r openid-php-openid-$(OPENID_COMMIT); \ fi spool/openid/store: @@ -143,16 +158,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 @@ -168,31 +182,99 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F)) ## ## jquery ## - -JQUERY_PLUGINS=color +JQUERY_VERSION=1.5.1 +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.10 +JQUERY_UI=core widget tabs datepicker +JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI))) + +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 # 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.xorg.js htdocs/javascript/jquery.ui.xorg.js $(JSTREE_PATH) + +htdocs/javascript/jquery.xorg.js: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_TMPL_PATH) htdocs/javascript/jquery.autocomplete.js + cat $^ > $@ + +htdocs/javascript/jquery.ui.xorg.js: $(JQUERY_UI_PATHES) htdocs/javascript/jquery.ui.datepicker-fr.js + cat $^ > $@ -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) -$(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 $(