From: Sander Hoentjen Date: Wed, 13 Jan 2016 15:23:41 +0000 (+0100) Subject: Add src JS files X-Git-Tag: dnsdist-1.0.0-alpha2~30^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cc65f8ab23ff40c03994be3e5e57cd279b3f1f6;p=thirdparty%2Fpdns.git Add src JS files The reason for this is to make downstreams like Fedora happy. This makes checking those files for changes against upstream for example easier. In the progress I updated the js-libraries so I know which versions are used for both src and minified version. This is noted in the file src_js/SOURCES Also I deleted jsrender.js and purl.js because the were unused. Finally I added a Makefile option to build the minified js files yourself if you want to do so. --- diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am index 665aa8da3e..3241086894 100644 --- a/pdns/dnsdistdist/Makefile.am +++ b/pdns/dnsdistdist/Makefile.am @@ -12,6 +12,14 @@ BUILT_SOURCES=htmlfiles.h htmlfiles.h: html/* ./incfiles > $@ +SRC_JS_FILES := $(wildcard src_js/*.js) +MIN_JS_FILES := $(patsubst src_js/%.js,html/js/%.min.js,$(SRC_JS_FILES)) + +html/js/%.min.js: src_js/%.js + uglifyjs $< > $@ + +min_js: $(MIN_JS_FILES) + EXTRA_DIST=dnslabeltext.rl \ dnsdistconf.lua \ README.md \ diff --git a/pdns/dnsdistdist/html/index.html b/pdns/dnsdistdist/html/index.html index 547038c963..135808ee0b 100644 --- a/pdns/dnsdistdist/html/index.html +++ b/pdns/dnsdistdist/html/index.html @@ -1,10 +1,9 @@ - - - - + + +