X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=d63ab9b9d73828d67c621e980315050080049aeb;hb=05978b09201b86278849d6448a15b4a59e2ed852;hp=be74079f7f4a64fab3570ece1c15b930807ec8b9;hpb=76362eeb011de4f2cd7825f557643a72494475f9;p=platal.git diff --git a/Makefile b/Makefile index be74079..d63ab9b 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,9 @@ 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 @@ -73,7 +76,7 @@ htdocs/.htaccess: htdocs/.htaccess.in Makefile ## ## static content ## -static: htdocs/javascript/core.js 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 @@ -81,6 +84,10 @@ 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 ## @@ -179,11 +186,11 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F)) ## ## jquery ## -JQUERY_VERSION=1.5 +JQUERY_VERSION=1.5.1 JQUERY_PLUGINS=color form JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS))) -JQUERY_UI_VERSION=1.8.7 +JQUERY_UI_VERSION=1.8.10 JQUERY_UI=core widget tabs datepicker JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI))) @@ -221,7 +228,11 @@ htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js: DOWNLOAD_SRC = http://jqu 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 $(