Skip to content

Commit deac028

Browse files
bnoordhuisevanlucas
authored andcommitted
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: #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 c84dd03 commit deac028

File tree

1 file changed

+29
-10
lines changed

1 file changed

+29
-10
lines changed

Makefile

+29-10
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,11 @@ coverage-clean:
148148
$(RM) -r gcovr build
149149
$(RM) -r out/$(BUILDTYPE)/.coverage
150150
$(RM) -r .cov_tmp
151-
$(RM) out/$(BUILDTYPE)/obj.target/node/{src,gen}/*.gcda
151+
$(RM) out/$(BUILDTYPE)/obj.target/node/gen/*.gcda
152+
$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda
152153
$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcda
153-
$(RM) out/$(BUILDTYPE)/obj.target/node/{src,gen}/*.gcno
154+
$(RM) out/$(BUILDTYPE)/obj.target/node/gen/*.gcno
155+
$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcno
154156
$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcno
155157
$(RM) out/$(BUILDTYPE)/obj.target/cctest/src/*.gcno
156158
$(RM) out/$(BUILDTYPE)/obj.target/cctest/test/cctest/*.gcno
@@ -186,7 +188,8 @@ coverage-build: all
186188
coverage-test: coverage-build
187189
$(RM) -r out/$(BUILDTYPE)/.coverage
188190
$(RM) -r .cov_tmp
189-
$(RM) out/$(BUILDTYPE)/obj.target/node/{src,gen}/*.gcda
191+
$(RM) out/$(BUILDTYPE)/obj.target/node/gen/*.gcda
192+
$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda
190193
$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcda
191194
-$(MAKE) $(COVTESTS)
192195
mv lib lib__
@@ -908,15 +911,31 @@ $(TARBALL): release-only $(NODE_EXE) doc
908911
mkdir -p $(TARNAME)/doc/api
909912
cp doc/node.1 $(TARNAME)/doc/node.1
910913
cp -r out/doc/api/* $(TARNAME)/doc/api/
911-
$(RM) -r $(TARNAME)/deps/v8/{test,samples,tools/profviz,tools/run-tests.py}
912-
$(RM) -r $(TARNAME)/doc/images # too big
913-
$(RM) -r $(TARNAME)/deps/uv/{docs,samples,test}
914-
$(RM) -r $(TARNAME)/deps/openssl/openssl/{doc,demos,test}
914+
$(RM) -r $(TARNAME)/.editorconfig
915+
$(RM) -r $(TARNAME)/.git*
916+
$(RM) -r $(TARNAME)/.mailmap
917+
$(RM) -r $(TARNAME)/deps/openssl/openssl/demos
918+
$(RM) -r $(TARNAME)/deps/openssl/openssl/doc
919+
$(RM) -r $(TARNAME)/deps/openssl/openssl/test
920+
$(RM) -r $(TARNAME)/deps/uv/docs
921+
$(RM) -r $(TARNAME)/deps/uv/samples
922+
$(RM) -r $(TARNAME)/deps/uv/test
923+
$(RM) -r $(TARNAME)/deps/v8/samples
924+
$(RM) -r $(TARNAME)/deps/v8/test
925+
$(RM) -r $(TARNAME)/deps/v8/tools/profviz
926+
$(RM) -r $(TARNAME)/deps/v8/tools/run-tests.py
915927
$(RM) -r $(TARNAME)/deps/zlib/contrib # too big, unused
916-
$(RM) -r $(TARNAME)/.{editorconfig,git*,mailmap}
917-
$(RM) -r $(TARNAME)/tools/{eslint-rules,node_modules,osx-pkg.pmdoc,pkgsrc,remark-cli,remark-preset-lint-node}
918-
$(RM) -r $(TARNAME)/tools/{osx-*,license-builder.sh,cpplint.py}
928+
$(RM) -r $(TARNAME)/doc/images # too big
919929
$(RM) -r $(TARNAME)/test*.tap
930+
$(RM) -r $(TARNAME)/tools/cpplint.py
931+
$(RM) -r $(TARNAME)/tools/eslint-rules
932+
$(RM) -r $(TARNAME)/tools/license-builder.sh
933+
$(RM) -r $(TARNAME)/tools/node_modules
934+
$(RM) -r $(TARNAME)/tools/osx-*
935+
$(RM) -r $(TARNAME)/tools/osx-pkg.pmdoc
936+
$(RM) -r $(TARNAME)/tools/pkgsrc
937+
$(RM) -r $(TARNAME)/tools/remark-cli
938+
$(RM) -r $(TARNAME)/tools/remark-preset-lint-node
920939
find $(TARNAME)/ -name ".eslint*" -maxdepth 2 | xargs $(RM)
921940
find $(TARNAME)/ -type l | xargs $(RM) # annoying on windows
922941
tar -cf $(TARNAME).tar $(TARNAME)

0 commit comments

Comments
 (0)