From 079d90b9f31bf93bbe685c3970e0e1bd02f2afdd Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Thu, 1 Apr 2021 19:56:20 -0400 Subject: [PATCH] build: package release changelog for releases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package the changelog for the release line as `CHANGELOG.md` when building a release binary tarball. PR-URL: https://github.com/nodejs/node/pull/38033 Fixes: https://github.com/nodejs/node/issues/38025 Reviewed-By: Juan José Arboleda Reviewed-By: Rich Trott Reviewed-By: Michaël Zasso Reviewed-By: Beth Griggs Reviewed-By: James M Snell --- Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Makefile b/Makefile index f0ef4bb83281f2..5bb5d7df5f87e2 100644 --- a/Makefile +++ b/Makefile @@ -767,6 +767,7 @@ docclean: RAWVER=$(shell $(PYTHON) tools/getnodeversion.py) VERSION=v$(RAWVER) +CHANGELOG=doc/changelogs/CHANGELOG_V$(firstword $(subst ., ,$(RAWVER))).md # For nightly builds, you must set DISTTYPE to "nightly", "next-nightly" or # "custom". For the nightly and next-nightly case, you need to set DATESTRING @@ -954,6 +955,15 @@ release-only: check-xz echo "" >&2 ; \ exit 1 ; \ fi + @if [ "$(RELEASE)" = "0" -o -f "$(CHANGELOG)" ]; then \ + exit 0; \ + else \ + echo "" >&2 ; \ + echo "#NODE_VERSION_IS_RELEASE is set to $(RELEASE) but " >&2 ; \ + echo "$(CHANGELOG) does not exist." >&2 ; \ + echo "" >&2 ; \ + exit 1 ; \ + fi $(PKG): release-only $(RM) -r $(MACOSOUTDIR) @@ -1121,7 +1131,11 @@ $(BINARYTAR): release-only $(MAKE) install DESTDIR=$(BINARYNAME) V=$(V) PORTABLE=1 cp README.md $(BINARYNAME) cp LICENSE $(BINARYNAME) +ifeq ("$(wildcard $(CHANGELOG))","") cp CHANGELOG.md $(BINARYNAME) +else + cp $(CHANGELOG) $(BINARYNAME)/CHANGELOG.md +endif ifeq ($(OSTYPE),darwin) SIGN="$(CODESIGN_CERT)" PKGDIR="$(BINARYNAME)" sh tools/osx-codesign.sh endif