X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=Makefile;h=0041ae29558e0f9ee535a1c4c5d889879c671ead;hb=43f0c0402fc23c2e9dd9814eea20942cce07994d;hp=d7ee751a66bd7673249c26ae8b00131f82c19f53;hpb=f8a1899eceabb9648adb85071fab66d49d549337;p=platal.git diff --git a/Makefile b/Makefile index d7ee751..0041ae2 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,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) @@ -178,7 +181,7 @@ JQUERY_PLUGINS=color form JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS))) JQUERY_UI_VERSION=1.8.7 -JQUERY_UI=core tabs widget +JQUERY_UI=core tabs datepicker widget JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI))) JQUERY_TMPL_VERSION=vBeta1.0.0 @@ -190,7 +193,7 @@ 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_TMPL_PATH) $(JSTREE_PATH) +jquery: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_PATHES) $(JQUERY_UI_PATHES) $(JQUERY_TMPL_PATH) $(JSTREE_PATH) htdocs/javascript/jquery.ui.datepicker-fr.js htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://jquery.com/src/$(@F) htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: @@ -209,7 +212,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 $(