[Pkg-javascript-commits] [node-expat] 278/371: Use and build-depend on node-gyp.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository node-expat.

commit 2fbe152efb02a25861b565768b6ef47385ecc6e7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Sep 8 20:37:48 2014 +0200

    Use and build-depend on node-gyp.
---
 debian/dirs    |  1 -
 debian/install |  2 ++
 debian/rules   | 32 +++++++++++++++-----------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index d21444e..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/nodejs
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..4d1e964
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+lib/* usr/lib/nodejs/node-expat
+build/Release/*.node usr/lib/nodejs/node-expat/native
diff --git a/debian/rules b/debian/rules
index f3c26e1..6eab187 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ CDBS_BUILD_DEPENDS_rules_buildcore_config-guess-sub =
 deps = nodejs, node-bindings, node-nan
 
 # Needed by upstream build process
-bdeps = nodejs-dev, libexpat-dev, node-vows, node-iconv
+bdeps = nodejs-dev, node-gyp, libexpat-dev, node-vows, node-iconv
 
 CDBS_BUILD_DEPENDS +=, $(bdeps), $(deps)
 CDBS_DEPENDS_$(pkg) = $(deps)
@@ -43,29 +43,27 @@ DEB_INSTALL_DOCS_$(pkg) += README.markdown
 # Fix backwards compatibility. See bug#678762
 DEB_DH_LINK_$(pkg) = usr/lib/nodejs/node_expat.node /usr/lib/nodejs/node-expat.node
 
-# node-waf build routines
-NODE-WAF-BUILDFLAGS = CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LINKFLAGS="$(LDFLAGS)"
-NODE-WAF = NOCOLOR=1 NODE_PATH=$(cdbs_curdestdir)usr/lib/nodejs node-waf -v
 NODE = NODE_DISABLE_COLORS=1 node
-configure/$(pkg):: debian/stamp-node-waf-configure
-debian/stamp-node-waf-configure:
-	$(NODE-WAF-BUILDFLAGS) $(NODE-WAF) configure
+configure/$(pkg):: debian/stamp-node-gyp-configure
+debian/stamp-node-gyp-configure:
+	node-gyp configure
 	touch $@
-build/$(pkg):: debian/stamp-node-waf-build
-debian/stamp-node-waf-build:
-	$(NODE-WAF) build
+build/$(pkg):: debian/stamp-node-gyp-build
+debian/stamp-node-gyp-build:
+	V=1 $(foreach flag,CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS,\
+		$(flag)="$($(flag))") \
+		node-gyp build
 	$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,$(NODE) test.js)
 	touch $@
-install/$(pkg)::
-	$(NODE-WAF) install
 clean::
-	rm -rf build
-	rm -f .lock-wscript
-	rm -f debian/stamp-node-waf-configure debian/stamp-node-waf-build
+	node-gyp clean
+	rm -f debian/stamp-node-gyp-*
 
-# Node modules have an uncommon extension preventing autodetection by
-# dh_shlibdeps, so we do it manually
+# Node modules have an uncommon path and extension preventing
+# autodetection by dh_shlibdeps or dh_fixperms, so we do it manually
 binary-strip-IMPL/$(pkg)::
 	$(if $(is_debug_package)$(filter nostrip,$(DEB_BUILD_OPTIONS)),,find "$(cdbs_curdestdir)" -name "*.node" -exec strip --remove-section=.comment --remove-section=.note --strip-unneeded {} +)
+binary-fixup/$(pkg)::
+	find "$(cdbs_curdestdir)" -name "*.node" -exec chmod -x {} +
 binary-predeb-IMPL/$(pkg)::
 	find "$(cdbs_curdestdir)" -name "*.node" -exec dpkg-shlibdeps -Tdebian/$(cdbs_curpkg).substvars {} +

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