X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=bb8ae77239eca94ee5f105fc34177d840bb66ac2;hb=01bb23e6f5ae192ffaa6afbbd94b21b2b37f2138;hp=d982bca45763e078d57bb747893710096dea39a0;hpb=524d1205c09d3f8e14a5751b2cbbce7e2fd23008;p=platal.git diff --git a/Makefile b/Makefile index d982bca..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) @@ -26,10 +25,13 @@ endef 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" @@ -46,7 +48,7 @@ q: ## core: - [ -d core ] || ( git submodule init && git submodule update ) + [ -d core/.git ] || ( git submodule init && git submodule update ) make -C core all ## @@ -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 $@ @@ -65,6 +67,14 @@ htdocs/.htaccess: htdocs/.htaccess.in Makefile 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 ## @@ -118,33 +128,32 @@ get-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: - 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 @@ -160,32 +169,59 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F)) ## ## jquery ## - +JQUERY_VERSION=1.4.2 JQUERY_PLUGINS=color 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/ui.,$(addsuffix .js,$(JQUERY_UI))) +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) +# 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) -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) -htdocs/javascript/jquery.autocomplete.js: DOWNLOAD_SRC = http://jquery-autocomplete.googlecode.com/svn/trunk/jquery.autocomplete.js -htdocs/javascript/jquery.autocomplete.js: - @$(download) +htdocs/javascript/jquery.js: htdocs/javascript/jquery-$(JQUERY_VERSION).min.js + ln -snf $(