On Sat, Feb 22, 2020 at 12:08 AM Langer, Christoph <christoph.lan...@sap.com> wrote:
> Hi, > > Thanks, Volker for backporting this to JDK11 and thanks Andrew for > reviewing it. > > > On 30/12/2019 20:18, Volker Simonis wrote: > > > Hi, > > > I'd like to downport the support for Visual Studio Code project > > > creation to 11u. I think we will have to support 11u for quite some > > > years and it makes sense to have as good as possible tool support in > > > 11u as well. > > > > I just came across this proposal in the process of backporting > > JDK-8232748: "Build static versions of certain JDK libraries". The only > > hunk of that changeset which isn't a simple context difference is that > > which applies to JdkNativeCompilation.gmk and the FindLib & > > FindStaticLib rules it introduces. > > > > I was going to just drop this hunk, as I didn't see any reason to > > backport JDK-8210459, but then I saw your existing RFR referenced on the > > bug. If JDK-8210459 is to be backported, I thus need this in place > > before posting JDK-8232748 for review. > > Thanks for waiting, Andrew. I'll approve JDK-8210459 now in order to get > it pushed to unblock your work on JDK-8210459. > Thanks, pushed. > > > > Finally, I've added an additional fix to this last change, whch fixes > > > the make tests (i.e. "make test-make"). These tests are currently > > > broken in jdk11u. They have been broken by JDK-8212028 (which has > > > already been downported to jdk11u) and fixed in jdk 12 as part of > > > "8210958: Rename "make run-test" to "make test"" (which hasn't been > > > downported yet and probably won't be donwported at all). Because the > > > fix is trivial (that's why it was done as part of 8210958 without an > > > extra bug ID) and because I wanted to run "make test-make" in jdk11u > > > as well to verify my changes, I've decided to downport this fix as > > > part of 8223678: > > > > > > diff -r 8599975f5b33 test/make/TestMakeBase.gmk > > > --- a/test/make/TestMakeBase.gmk Tue Feb 12 08:40:43 2019 +0100 > > > +++ b/test/make/TestMakeBase.gmk Mon Dec 23 22:10:46 2019 +0100 > > > KWBASE := > > APA=banan;GURKA=tomat;COUNT=1%202%203%204%205;SUM=1+2+3+4+5 > > ;MANY_WORDS=I > > > have the best words. > > > > > > $(eval $(call ParseKeywordVariable, KWBASE, \ > > > - KEYWORDS := APA GURKA SUM, \ > > > + SINGLE_KEYWORDS := APA GURKA SUM, \ > > > STRING_KEYWORDS := COUNT MANY_WORDS, \ > > > )) > > > > > > @@ -364,7 +376,7 @@ > > > KWBASE_WEIRD := ;;APA=banan;;;GURKA=apelsin;APA=skansen;; > > > > > > $(eval $(call ParseKeywordVariable, KWBASE_WEIRD, \ > > > - KEYWORDS := APA GURKA SUM, \ > > > + SINGLE_KEYWORDS := APA GURKA SUM, \ > > > STRING_KEYWORDS := COUNT, \ > > > )) > > > > > > > I agree it doesn't make sense to backport JDK-8210958, as that's a major > > change to the test infrastructure. However, I think this warrants its > > own 11u bug rather than being smuggled in under JDK-8223678. Otherwise, > > you're just mirroring the same problem that was created by mixing this > > in with JDK-8210958. An independent bug can describe the breakage and > > link to the original issue that caused it. > > Hm, I think Volker's way of adding this trivial correction to the backport > of 8223678 is okay. But, of course a separate bug could also be a good way > to document this fix. Maybe we need a tiebreaker here? 😊 > No problem. I've created "JDK-8240073: Fix 'test-make' build target in 11u" for this issue now and sent out a RFR here: https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2020-February/002589.html Please take a look if possible :) > So I'll approve the series of backports now, except for JDK-8223678. > > Thanks, I've pushed 8210459 and 8218807 now and sent out a new RFR for "JDK-8223678: Add Visual Studio Code workspace generation support (for native code)" without the extra fix which has been moved to JDK-8240073: https://mail.openjdk.java.net/pipermail/jdk-updates-dev/2020-February/002588.html Please take a look if possible :) Thank you and best regards, Volker > Cheers > Christoph > >
