Repository: thrift Updated Branches: refs/heads/master b3654df14 -> 281bdae6b
THRIFT-2940 nodejs: move package.json to root folder fix make dist & co Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/281bdae6 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/281bdae6 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/281bdae6 Branch: refs/heads/master Commit: 281bdae6b2e40694db57f19b0ee13eb51b575c39 Parents: b3654df Author: Roger Meier <[email protected]> Authored: Tue Feb 3 21:45:28 2015 +0100 Committer: Roger Meier <[email protected]> Committed: Tue Feb 3 23:45:21 2015 +0100 ---------------------------------------------------------------------- .gitignore | 1 + Makefile.am | 1 + lib/nodejs/Makefile.am | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/281bdae6/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 65bb2ec..228c6ac 100644 --- a/.gitignore +++ b/.gitignore @@ -217,6 +217,7 @@ test-driver /libtool /ltmain.sh /missing +/node_modules/ /stamp-h1 /test/status.html /test/c_glib/test_client http://git-wip-us.apache.org/repos/asf/thrift/blob/281bdae6/Makefile.am ---------------------------------------------------------------------- diff --git a/Makefile.am b/Makefile.am index 6835fe4..0a9e431 100755 --- a/Makefile.am +++ b/Makefile.am @@ -78,6 +78,7 @@ EXTRA_DIST = \ debian \ doc \ doap.rdf \ + package.json \ sonar-project.properties \ LICENSE \ CHANGES \ http://git-wip-us.apache.org/repos/asf/thrift/blob/281bdae6/lib/nodejs/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/nodejs/Makefile.am b/lib/nodejs/Makefile.am index 3868905..9998348 100755 --- a/lib/nodejs/Makefile.am +++ b/lib/nodejs/Makefile.am @@ -21,18 +21,18 @@ THRIFT = $(top_srcdir)/compiler/cpp/thrift #stubs: $(top_srcdir)/test/ThriftTest.thrift # $(THRIFT) --gen js:node -o test/ $(top_srcdir)/test/ThriftTest.thrift -deps: package.json - $(NPM) install --no-bin-links +deps: $(top_srcdir)/package.json + $(NPM) install --no-bin-links $(top_srcdir)/ check: deps - $(NPM) test + cd $(top_srcdir) && $(NPM) test && cd lib/nodejs clean-local: $(RM) -r test/gen-nodejs + $(RM) -r $(top_srcdir)/node_modules EXTRA_DIST = \ examples \ lib \ - package.json \ test \ README.md
