X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=6a8a175e4515514cf238fb235d0bfa86a4cc6fe3;hb=ee3e477faa6c7aa33b2151ec4019dd87a8015d76;hp=26f294edc0eea77ce845b279b59015ef1f48ee89;hpb=ac639b4ce3f43e0d1b48aa91c7487cbe2ac60550;p=platal.git diff --git a/Makefile b/Makefile index 26f294e..6a8a175 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 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/run: +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,32 +129,18 @@ 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 @@ -169,21 +169,27 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F)) ## ## jquery ## -JQUERY_VERSION=1.4.2 +JQUERY_VERSION=1.5.1 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))) +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) $(JSTREE_PATH) +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) + 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://jquery.com/src/$(@F) htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: @@ -198,11 +204,23 @@ $(JQUERY_PLUGINS_PATHES): @-rm htdocs/javascript/jquery.ui*.$*.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.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 $(