[jdk8u-dev] Integrated: 8031567: Better model for storing source revision information

[Andrew John Hughes]

On Mon, 23 May 2022 00:24:22 GMT, Andrew John Hughes <andrew at openjdk.org> wrote:

> In implementing [JDK-8222975](https://bugs.openjdk.java.net/browse/JDK-8222975) and backporting [JDK-8210283](https://bugs.openjdk.java.net/browse/JDK-8210283), we have avoided backporting [JDK-8031567](https://bugs.openjdk.java.net/browse/JDK-8031567) in order to keep things simple. However, the net result has been that we have introduced [unique 8u bugs](https://mail.openjdk.java.net/pipermail/jdk8u-dev/2022-April/014842.html)
> 
> Rather than just patching up 8u again, it seems to make sense to just bring it into line with later JDKs. There might have been a reason to keep 8u different when it was a forest of Mercurial repositories, but it is now a single Git tree like the other JDK repositories. Handling the same thing but in a unique way just makes any future backporting harder to deal with.
> 
> In light of this, I've now backported 8031567. I started by reverting the two 8u-specific patches, 8210283 & 8222975, and then applied 8136771 & 8031567 (which includes 8222975), along with follow-up fixes 8170385 & 8170392. 8210283 was then rebackported on top of this.
> 
> A couple of additional fixes were then made to workaround Makefile differences in 8u. Due to the lack of [JDK-8069261](https://bugs.openjdk.java.net/browse/JDK-8069261) the `MakeDir` usage needs to be wrapped in `eval`. 8u also doesn't have the modern macro format from  [JDK-8074988](https://bugs.openjdk.java.net/browse/JDK-8074988) and earlier fixes, so the `SetupGetRevisionForRepo` macro was modified to work in a similar way to other macros do in 8u. The stripping of `$1` is necessary to avoid it trying to create variables beginning with a space (something which led to empty variables and confused me for some time)
> 
> I did consider backporting those as well, but felt there were too intrusive to other areas of the build. At least we now have a template in this patch for how to convert any future instances.
> 
> The end result actually looks pretty straightforward and differences between this and the `make/SourceRevision.gmk` file in 11u are small.

This pull request has now been integrated.

Changeset: e3b9a06a
Author:    Andrew John Hughes <andrew at openjdk.org>
URL:       https://git.openjdk.java.net/jdk8u-dev/commit/e3b9a06ab885289e943167935912b42ab53244e3
Stats:     267 lines in 13 files changed: 190 ins; 45 del; 32 mod

8031567: Better model for storing source revision information
8170385: JDK-8031567 broke source bundles
8170392: JDK-8031567 broke builds from source bundles

Reviewed-by: sgehwolf
Backport-of: 27b7ab8b27a5548ed4cd823d35c8190a594bfdd1

-------------

PR: https://git.openjdk.java.net/jdk8u-dev/pull/62