Skip to content

Commit

Permalink
8321374: Add a configure option to explicitly set CompanyName propert…
Browse files Browse the repository at this point in the history
…y in VersionInfo resource for Windows exe/dll

Reviewed-by: erikj, ihse
  • Loading branch information
fthevenet authored and magicus committed Dec 8, 2023
1 parent 701bc3b commit 05f9509
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
9 changes: 9 additions & 0 deletions make/autoconf/jdk-version.m4
Expand Up @@ -110,6 +110,15 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
AC_SUBST(COMPANY_NAME)
# Set the JDK RC Company name
# Otherwise uses the value set for "vendor-name".
UTIL_ARG_WITH(NAME: jdk-rc-company-name, TYPE: string,
DEFAULT: $COMPANY_NAME,
DESC: [Set JDK RC company name. This is used for CompanyName properties of MS Windows binaries.],
DEFAULT_DESC: [from branding.conf],
CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
AC_SUBST(JDK_RC_COMPANY_NAME)
# The vendor URL, if any
# Only set VENDOR_URL if '--with-vendor-url' was used and is not empty.
# Otherwise we will use the value from "branding.conf" included above.
Expand Down
1 change: 1 addition & 0 deletions make/autoconf/spec.gmk.in
Expand Up @@ -191,6 +191,7 @@ PRODUCT_NAME := @PRODUCT_NAME@
PRODUCT_SUFFIX := @PRODUCT_SUFFIX@
JDK_RC_PLATFORM_NAME := @JDK_RC_PLATFORM_NAME@
JDK_RC_NAME := @JDK_RC_NAME@
JDK_RC_COMPANY_NAME:=@JDK_RC_COMPANY_NAME@

This comment has been minimized.

Copy link
@jerboaa

jerboaa Dec 18, 2023

Contributor

@fthevenet Looks like this change should get the style adjusted? JDK_RC_COMPANY_NAME := @JDK_RC_COMPANY_NAME@ to match surrounding lines?

This comment has been minimized.

Copy link
@fthevenet

fthevenet Dec 18, 2023

Author Member

Yes you are right. I realized that as I backported it, but unfortunately I missed it in the original PR and it went unnoticed during the review.
Do you think this requires a follow-up to fix it?

This comment has been minimized.

Copy link
@jerboaa

jerboaa Dec 18, 2023

Contributor

Yes, a follow-up fix. Should be a trivial change and a quick review.

This comment has been minimized.

Copy link
@fthevenet

fthevenet Dec 18, 2023

Author Member

Sure thing. Thanks!

COMPANY_NAME := @COMPANY_NAME@
HOTSPOT_VM_DISTRO := @HOTSPOT_VM_DISTRO@
MACOSX_BUNDLE_NAME_BASE := @MACOSX_BUNDLE_NAME_BASE@
Expand Down
2 changes: 1 addition & 1 deletion make/common/JdkNativeCompilation.gmk
Expand Up @@ -98,7 +98,7 @@ GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/ve

JDK_RCFLAGS=$(RCFLAGS) \
-D"JDK_VERSION_STRING=$(VERSION_STRING)" \
-D"JDK_COMPANY=$(COMPANY_NAME)" \
-D"JDK_COMPANY=$(JDK_RC_COMPANY_NAME)" \
-D"JDK_VER=$(VERSION_NUMBER_FOUR_POSITIONS)" \
-D"JDK_COPYRIGHT=Copyright \xA9 $(COPYRIGHT_YEAR)" \
-D"JDK_NAME=$(JDK_RC_NAME) $(VERSION_SHORT)" \
Expand Down

5 comments on commit 05f9509

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fthevenet
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 05f9509 Dec 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fthevenet Could not automatically backport 05f95093 to openjdk/jdk21u-dev due to conflicts in the following files:

  • make/autoconf/spec.gmk.in

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk21u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-fthevenet-05f95093

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 05f950934ee720c82e9b62dd8d31e13bab7775da

# Backport the commit
$ git cherry-pick --no-commit 05f950934ee720c82e9b62dd8d31e13bab7775da
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 05f950934ee720c82e9b62dd8d31e13bab7775da'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk21u-dev with the title Backport 05f950934ee720c82e9b62dd8d31e13bab7775da.

@fthevenet
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk22u

@openjdk
Copy link

@openjdk openjdk bot commented on 05f9509 Dec 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fthevenet the backport was successfully created on the branch backport-fthevenet-05f95093 in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 05f95093 from the openjdk/jdk repository.

The commit being backported was authored by Frederic Thevenet on 8 Dec 2023 and was reviewed by Erik Joelsson and Magnus Ihse Bursie.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-fthevenet-05f95093:backport-fthevenet-05f95093
$ git checkout backport-fthevenet-05f95093
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-fthevenet-05f95093

Please sign in to comment.