diff options
| author | Roger Meier <roger@apache.org> | 2015-02-03 21:45:28 +0100 |
|---|---|---|
| committer | Roger Meier <roger@apache.org> | 2015-02-03 23:45:21 +0100 |
| commit | 281bdae6b2e40694db57f19b0ee13eb51b575c39 (patch) | |
| tree | 8c73190028711f3c3c336415bdb55f7b342d54ce | |
| parent | b3654df14cd4b391943eeab8124735a005fa7454 (diff) | |
| download | thrift-281bdae6b2e40694db57f19b0ee13eb51b575c39.tar.gz | |
THRIFT-2940 nodejs: move package.json to root folder
fix make dist & co
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | Makefile.am | 1 | ||||
| -rwxr-xr-x | lib/nodejs/Makefile.am | 8 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 65bb2ec24..228c6acc5 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 diff --git a/Makefile.am b/Makefile.am index 6835fe458..0a9e43180 100755 --- a/Makefile.am +++ b/Makefile.am @@ -78,6 +78,7 @@ EXTRA_DIST = \ debian \ doc \ doap.rdf \ + package.json \ sonar-project.properties \ LICENSE \ CHANGES \ diff --git a/lib/nodejs/Makefile.am b/lib/nodejs/Makefile.am index 3868905d3..999834811 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 |