Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8321374: Add a configure option to explicitly set CompanyName property in VersionInfo resource for Windows exe/dll #16972

Closed
wants to merge 1 commit into from

Conversation

fthevenet
Copy link
Member

@fthevenet fthevenet commented Dec 5, 2023

When building OpenJDK on the Windows platform, version information are embedded as compiled resources into every native library and executable, which typically contain version numbers, copyright information, product name and vendor name (called "Company name" in this context).

Currently, the value for "Company name" is always the same as that of "vendor-name" but it It would be really useful to some build scenarios to allow for the "company name" property embedded in the VersionInfo compiled resources to be different from the "vendor name" property that is used within the JVM (e.g. java -version).

This PR adds a "--with-jdk-rc-company-name" configure option which can be used to set "Company name" to its own value, independently of "'vendor-name", in the same fashion as the existing "--with-jdk-rc-name", used to override the values of "File description" and "Product name".

If "--with-jdk-rc-company-name" isn't used, then the vendor-name value is used instead, reproducing the same behavior than without this patch.


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-8321374: Add a configure option to explicitly set CompanyName property in VersionInfo resource for Windows exe/dll (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16972

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

Using diff file

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

Webrev

Link to Webrev Comment

…y in VersionInfo resource for Windows exe/dll
@bridgekeeper
Copy link

bridgekeeper bot commented Dec 5, 2023

👋 Welcome back fthevenet! 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
Copy link

openjdk bot commented Dec 5, 2023

@fthevenet The following label will be automatically applied to this pull request:

  • build

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

@openjdk openjdk bot added the build build-dev@openjdk.org label Dec 5, 2023
@fthevenet
Copy link
Member Author

NB: Test "GathererTest::testMassivelyComposedGatherers" in tier1 on linux-86 is failing for reasons unrelated to this PR.

@fthevenet fthevenet marked this pull request as ready for review December 6, 2023 15:05
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 6, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 6, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Dec 6, 2023

@fthevenet 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:

8321374: Add a configure option to explicitly set CompanyName property in VersionInfo resource for Windows exe/dll

Reviewed-by: erikj, ihse

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 80 new commits pushed to the master branch:

  • bad5edf: 8320959: jdk/jfr/event/runtime/TestShutdownEvent.java crash with CONF=fastdebug -Xcomp
  • f577385: 8316738: java/net/httpclient/HttpClientLocalAddrTest.java failed in timeout
  • 86623aa: 8320786: Remove ThreadGroup.stop
  • af5c492: 8320532: Remove Thread/ThreadGroup suspend/resume
  • cb7e3d2: 8321560: [BACKOUT] 8299426: Heap dump does not contain virtual Thread stack references
  • 25dc476: 8286827: BogusColorSpace methods return wrong array
  • 11e4a92: 8320597: RSA signature verification fails on signed data that does not encode params correctly
  • 354ea4c: 8299426: Heap dump does not contain virtual Thread stack references
  • 959a443: 8288712: Typo in javadoc in javax.imageio.ImageReader.java
  • 4ed38f5: 8321409: Console read line with zero out should zero out underlying buffer in JLine (redux)
  • ... and 70 more: https://git.openjdk.org/jdk/compare/1cf7ef520b73321c9fe7856b2f55ca6ecb555126...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@erikj79, @magicus) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 6, 2023
@fthevenet
Copy link
Member Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 7, 2023
@openjdk
Copy link

openjdk bot commented Dec 7, 2023

@fthevenet
Your change (at version 8756034) is now ready to be sponsored by a Committer.

@fthevenet
Copy link
Member Author

Thanks for the reviews @erikj79 and @magicus.
Could one of you please sponsor this?

Cheers!

@magicus
Copy link
Member

magicus commented Dec 8, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 8, 2023

Going to push as commit 05f9509.
Since your change was applied there have been 82 commits pushed to the master branch:

  • 701bc3b: 8295166: IGV: dump graph at more locations
  • 9e48b90: 8310524: C2: record parser-generated LoadN nodes for IGVN
  • bad5edf: 8320959: jdk/jfr/event/runtime/TestShutdownEvent.java crash with CONF=fastdebug -Xcomp
  • f577385: 8316738: java/net/httpclient/HttpClientLocalAddrTest.java failed in timeout
  • 86623aa: 8320786: Remove ThreadGroup.stop
  • af5c492: 8320532: Remove Thread/ThreadGroup suspend/resume
  • cb7e3d2: 8321560: [BACKOUT] 8299426: Heap dump does not contain virtual Thread stack references
  • 25dc476: 8286827: BogusColorSpace methods return wrong array
  • 11e4a92: 8320597: RSA signature verification fails on signed data that does not encode params correctly
  • 354ea4c: 8299426: Heap dump does not contain virtual Thread stack references
  • ... and 72 more: https://git.openjdk.org/jdk/compare/1cf7ef520b73321c9fe7856b2f55ca6ecb555126...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 8, 2023
@openjdk openjdk bot closed this Dec 8, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 8, 2023
@openjdk
Copy link

openjdk bot commented Dec 8, 2023

@magicus @fthevenet Pushed as commit 05f9509.

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

@fthevenet
Copy link
Member Author

Thanks @magicus

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
3 participants