[Pkg-javascript-commits] [json-js] 14/85: Generalize (even more) rules file variables. Use uglifyjs (not yui-compressor). Update build-dependencies accordingly.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository json-js.

commit c47ec7b58f46889b45dbd075e775edafb13d00da
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Apr 22 12:30:55 2011 +0200

    Generalize (even more) rules file variables. Use uglifyjs (not yui-compressor). Update build-dependencies accordingly.
---
 debian/install |  2 --
 debian/rules   | 20 ++++++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/install b/debian/install
deleted file mode 100644
index fdd114e..0000000
--- a/debian/install
+++ /dev/null
@@ -1,2 +0,0 @@
-*.js		/usr/share/javascript/json
-debian/*.js	/usr/share/javascript/json
diff --git a/debian/rules b/debian/rules
index 142f302..773d93c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,17 +19,25 @@
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
+libname = json
+libdirname = $(libname)
+libpkgname = libjs-$(libname)
+
 # suppress optional build-dependencies
 CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
 
-CDBS_BUILD_DEPENDS += , yui-compressor
+CDBS_BUILD_DEPENDS += , uglifyjs
+
+js-basedir =
+js-stems = $(basename $(wildcard $(js-basedir)*.js))
+js-min = $(js-stems:$(js-basedir)%=debian/%.min.js)
+js-destdir = /usr/share/javascript/$(libdirname)
 
-js-stems = $(basename $(wildcard *.js))
-js-min = $(js-stems:%=debian/%.min.js)
+DEB_DH_INSTALL_ARGS_DEFAULT = $(addsuffix .js,$(js-stems)) debian/*.min.js $(js-destdir)
 
-build/libjs-json:: $(js-min)
-$(js-min): debian/%.min.js: %.js
-	yui-compressor $< -o $@
+build/$(libpkgname):: $(js-min)
+$(js-min): debian/%.min.js: $(js-basedir)%.js
+	uglifyjs -o $@ $<
 clean::
 	rm -f debian/*.js
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/json-js.git