RFR: JDK-8129503: The SOURCE value in release file of JDK 9 doesn't contain changesets since b49
tim.bell at oracle.com
Tue Jun 23 12:55:16 UTC 2015
> Please review this small fix for the source-tips generation, which is
> used in the release file to identify the exact sources a build was
> made from.
> In JDK-8065576, we added "-e -o pipefail" to the default shell args.
> This causes shell expressions which are chained with ';' to abort when
> a sub expression fails. In the definition for REPO_LIST, the first
> 'ls' would fail if there were no .hg files to be found and so the
> second 'ls' would never be run to find the .hgtip files. I see no
> reason for separate calls to 'ls'. The -d flag does not hurt when
> looking for the .hgtip files.
> Bug: https://bugs.openjdk.java.net/browse/JDK-8129503
> diff -r eed77fcd7771 make/common/MakeBase.gmk
> --- a/make/common/MakeBase.gmk
> +++ b/make/common/MakeBase.gmk
> @@ -369,8 +369,9 @@
> HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO
> REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \
> - $(shell $(CD) $(SRC_ROOT) ; ( $(LS) -d
> $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) ; \
> - $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
> + $(shell $(CD) $(SRC_ROOT) ; \
> + $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) \
> + $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) \
> 2> /dev/null)))))
> # Emit the repo:tip pairs to $@
Looks good to me.
More information about the build-dev