Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d24e00e

Browse files
bnoordhuisBethGriggs
authored andcommittedJul 10, 2018
build: fix rm commands in tarball rule
The `$(RM) {foo,bar,baz}` rules don't seem to work with GNU make 4.1. Write them out in full and get rid of a few overlong lines in the process. PR-URL: nodejs#18332 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Jon Moss <[email protected]>
1 parent 90cde52 commit d24e00e

File tree

1 file changed

+30
-10
lines changed

1 file changed

+30
-10
lines changed
 

‎Makefile

+30-10
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,11 @@ coverage-clean:
140140
$(RM) -r gcovr build
141141
$(RM) -r out/$(BUILDTYPE)/.coverage
142142
$(RM) -r .cov_tmp
143-
$(RM) out/$(BUILDTYPE)/obj.target/node/{src,gen}/*.gcda
143+
$(RM) out/$(BUILDTYPE)/obj.target/node/gen/*.gcda
144+
$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda
144145
$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcda
145-
$(RM) out/$(BUILDTYPE)/obj.target/node/{src,gen}/*.gcno
146+
$(RM) out/$(BUILDTYPE)/obj.target/node/gen/*.gcno
147+
$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcno
146148
$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcno
147149
$(RM) out/$(BUILDTYPE)/obj.target/cctest/src/*.gcno
148150
$(RM) out/$(BUILDTYPE)/obj.target/cctest/test/cctest/*.gcno
@@ -175,7 +177,8 @@ coverage-build: all
175177
coverage-test: coverage-build
176178
$(RM) -r out/$(BUILDTYPE)/.coverage
177179
$(RM) -r .cov_tmp
178-
$(RM) out/$(BUILDTYPE)/obj.target/node/{src,gen}/*.gcda
180+
$(RM) out/$(BUILDTYPE)/obj.target/node/gen/*.gcda
181+
$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda
179182
$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcda
180183
-$(MAKE) $(COVTESTS)
181184
mv lib lib__
@@ -853,15 +856,32 @@ $(TARBALL): release-only $(NODE_EXE) doc
853856
mkdir -p $(TARNAME)/doc/api
854857
cp doc/node.1 $(TARNAME)/doc/node.1
855858
cp -r out/doc/api/* $(TARNAME)/doc/api/
856-
$(RM) -r $(TARNAME)/deps/v8/{test,samples,tools/profviz,tools/run-tests.py}
857-
$(RM) -r $(TARNAME)/doc/images # too big
858-
$(RM) -r $(TARNAME)/deps/uv/{docs,samples,test}
859-
$(RM) -r $(TARNAME)/deps/openssl/openssl/{doc,demos,test}
859+
$(RM) -r $(TARNAME)/.editorconfig
860+
$(RM) -r $(TARNAME)/.git*
861+
$(RM) -r $(TARNAME)/.mailmap
862+
$(RM) -r $(TARNAME)/deps/openssl/openssl/demos
863+
$(RM) -r $(TARNAME)/deps/openssl/openssl/doc
864+
$(RM) -r $(TARNAME)/deps/openssl/openssl/test
865+
$(RM) -r $(TARNAME)/deps/uv/docs
866+
$(RM) -r $(TARNAME)/deps/uv/samples
867+
$(RM) -r $(TARNAME)/deps/uv/test
868+
$(RM) -r $(TARNAME)/deps/v8/samples
869+
$(RM) -r $(TARNAME)/deps/v8/test
870+
$(RM) -r $(TARNAME)/deps/v8/tools/profviz
871+
$(RM) -r $(TARNAME)/deps/v8/tools/run-tests.py
860872
$(RM) -r $(TARNAME)/deps/zlib/contrib # too big, unused
861-
$(RM) -r $(TARNAME)/.{editorconfig,git*,mailmap}
862-
$(RM) -r $(TARNAME)/tools/{eslint,eslint-rules,osx-pkg.pmdoc,pkgsrc,remark-cli,remark-preset-lint-node}
863-
$(RM) -r $(TARNAME)/tools/{osx-*,license-builder.sh,cpplint.py}
873+
$(RM) -r $(TARNAME)/doc/images # too big
864874
$(RM) -r $(TARNAME)/test*.tap
875+
$(RM) -r $(TARNAME)/tools/cpplint.py
876+
$(RM) -r $(TARNAME)/tools/eslint
877+
$(RM) -r $(TARNAME)/tools/eslint-rules
878+
$(RM) -r $(TARNAME)/tools/license-builder.sh
879+
$(RM) -r $(TARNAME)/tools/node_modules
880+
$(RM) -r $(TARNAME)/tools/osx-*
881+
$(RM) -r $(TARNAME)/tools/osx-pkg.pmdoc
882+
$(RM) -r $(TARNAME)/tools/pkgsrc
883+
$(RM) -r $(TARNAME)/tools/remark-cli
884+
$(RM) -r $(TARNAME)/tools/remark-preset-lint-node
865885
find $(TARNAME)/ -name ".eslint*" -maxdepth 2 | xargs $(RM)
866886
find $(TARNAME)/ -type l | xargs $(RM) # annoying on windows
867887
tar -cf $(TARNAME).tar $(TARNAME)

0 commit comments

Comments
 (0)
Please sign in to comment.