[Pkg-javascript-commits] [node-mapnik] 09/11: Build using node-gyp, fix install paths, copy vector-tile.pb.cc at the right place

[Jérémy Lal]

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

kapouer pushed a commit to branch master
in repository node-mapnik.

commit c74c5e3e4afa5297eaeac653dd34fc5e2c9d3fe4
Author: Jérémy Lal <kapouer at melix.org>
Date:   Thu Aug 29 14:26:11 2013 +0200

    Build using node-gyp, fix install paths, copy vector-tile.pb.cc at the right place
---
 debian/dirs    |    1 +
 debian/install |    4 +---
 debian/rules   |   19 +++++++++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/install b/debian/install
index 88a97c3..fbc772d 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1 @@
-usr/bin/*
-
-usr/lib/node/*	usr/lib/nodejs/
+lib/*	usr/lib/nodejs/mapnik
diff --git a/debian/rules b/debian/rules
index 779d7cb..13b5d56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,28 +4,35 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+vector_tile_dir=$(CURDIR)/node_modules/mapnik-vector-tile/src
+
 %:
 	dh $@
 
 override_dh_install:
 	dh_install
 	dh_buildinfo
-
 	for i in mapnik-inspect mapnik-render; do \
-		mv $(CURDIR)/debian/node-mapnik/usr/bin/$$i.js $(CURDIR)/debian/node-mapnik/usr/bin/$$i; \
-		sed -i "s@#!node@#!/usr/bin/node at g" $(CURDIR)/debian/node-mapnik/usr/bin/$$i; \
+		cp bin/$$i.js $(CURDIR)/debian/node-mapnik/usr/bin/$$i; \
+		sed -i "s@#!/usr/bin/env node@#!/usr/bin/nodejs at g" $(CURDIR)/debian/node-mapnik/usr/bin/$$i; \
 	done
+	chmod 644 $(CURDIR)/debian/node-mapnik/usr/lib/nodejs/mapnik/_mapnik.node
 
 override_dh_auto_configure:
-	node-waf configure
+	node-gyp configure
 
 override_dh_auto_build:
-	node-waf build
+	mkdir -p $(vector_tile_dir)
+	cp /usr/include/vector_tile.pb.cc $(vector_tile_dir)/
+	node-gyp build
 
 override_dh_auto_test:
 
 override_dh_auto_install:
-	node-waf install --destdir=$(CURDIR)/debian/tmp/
+
+override_dh_clean:
+	dh_clean
+	rm -rf $(vector_tile_dir)
 
 override_dh_shlibdeps:
 	dpkg-shlibdeps \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-mapnik.git