8347996: JavaCompilation.gmk should not include ZipArchive.gmk

[magicus]

JavaCompilation.gmk includes ZipArchive.gmk, which includes ToolsJdk.gmk, which in turns includes JavaCompilation.gmk. This causes a circular dependency, which is not ideal. Make handles this anyway, but when I was developing new functionality to the build system, I discovered that this became a blocker.

Fortunately, the solution is simple. We include ZipArchive.gmk to support the convenience argument SRCZIP. It is used only in a single place, when compiling demos, and we can just as well (and arguably even better) call SetupZipArchive directly there.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8347996: JavaCompilation.gmk should not include ZipArchive.gmk (Bug - P3)

Reviewers

• Erik Joelsson (@erikj79 - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23175/head:pull/23175
$ git checkout pull/23175

Update a local copy of the PR:
$ git checkout pull/23175
$ git pull https://git.openjdk.org/jdk.git pull/23175/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23175

View PR using the GUI difftool:
$ git pr show -t 23175

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23175.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back ihse! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@magicus This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8347996: JavaCompilation.gmk should not include ZipArchive.gmk

Reviewed-by: erikj

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 36 new commits pushed to the master branch:

• 6cc1c0a: 8347422: Crash during safepoint handler execution with -XX:+UseAPX
• baca7da: 8347733: Replace SIZE_FORMAT in runtime code
• 2ca1b4d: 8347840: Fix testlibrary compilation warnings
• 2c41f5a: 8347959: ThreadDumper leaks memory
• 15e06b6: 8345618: javax/swing/text/Caret/8163124/CaretFloatingPointAPITest.java leaves Caret is not complete
• 3ab521e: 8347924: Replace SIZE_FORMAT in memory and metaspace
• 8460072: 8342881: RISC-V: secondary_super_cache does not scale well: C1 and interpreter
• f5573f5: 8330851: C2: More efficient TypeFunc creation
• a3eef6c: 8346875: Test jdk/jdk/jfr/event/os/TestCPULoad.java fails on macOS
• 398a580: 8347911: Limit the length of inflated text chunks
• ... and 26 more: https://git.openjdk.org/jdk/compare/7df21a8f09ab606f38a44d84d841d4bba9f09adf...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[openjdk]

@magicus The following labels will be automatically applied to this pull request:

• build
• client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

[magicus]

/label -client

[openjdk]

@magicus
The client label was successfully removed.

[mlbridge]

Webrevs

• 00: Full (944e2411)

[erikj79]

Looks good. Did you compare the demo src zips before and after?

[magicus]

Did you compare the demo src zips before and after?

Yes.

[magicus]

/integrate

[openjdk]

Going to push as commit 3a4d5ff.
Since your change was applied there have been 52 commits pushed to the master branch:

• 0fbf10a: 8348038: Docs build failing in Options.notifyListeners with AssertionError
• 9346984: 8347916: Simplify javax.swing.text.html.CSS.LengthUnit.getValue
• 3c92392: 8348089: Serial: Remove virtual specifier in SerialHeap
• 8a83dc2: 8347018: C2: Insertion of Assertion Predicates ignores the effects of PhaseIdealLoop::clone_up_backedge_goo()
• 85fdd2c: 8347434: Richer VM operations events logging
• c207cc7: 8347923: Parallel: Simplify compute_survivor_space_size_and_threshold
• 4b4b1e9: 8347922: Remove runtime/cds/appcds/customLoader/HelloCustom_JFR.java from ProblemList.txt
• e7a1c86: 8217914: java/net/httpclient/ConnectTimeoutHandshakeSync.java failed on connection refused while doing POST
• 644d154: 8347474: Options singleton is used before options are parsed
• 3804082: 8346123: [REDO] NMT should not use ThreadCritical
• ... and 42 more: https://git.openjdk.org/jdk/compare/7df21a8f09ab606f38a44d84d841d4bba9f09adf...master

Your commit was automatically rebased without conflicts.

[openjdk]

@magicus Pushed as commit 3a4d5ff.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.