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

8236127: Use value of --icon CLI option to set icon for exe installers #3347

Closed

Conversation

@alexeysemenyukoracle
Copy link
Member

@alexeysemenyukoracle alexeysemenyukoracle commented Apr 5, 2021

Use value of --icon jpackage CLI option to set icon for exe installers.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8236127: Use value of --icon CLI option to set icon for exe installers

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3347/head:pull/3347
$ git checkout pull/3347

Update a local copy of the PR:
$ git checkout pull/3347
$ git pull https://git.openjdk.java.net/jdk pull/3347/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3347

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3347.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 5, 2021

👋 Welcome back asemenyuk! 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 openjdk bot added the rfr label Apr 5, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 5, 2021

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

  • core-libs

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 core-libs label Apr 5, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 5, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Apr 6, 2021

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

8236127: Use value of --icon CLI option to set icon for exe installers

Reviewed-by: almatvee, herrick

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

  • eb5c097: 8262389: Use permitted_enctypes if default_tkt_enctypes or default_tgs_enctypes is not present
  • bfb034a: 8264524: jdk/internal/platform/docker/TestDockerMemoryMetrics.java fails due to swapping not working
  • a756d8d: 8264759: x86_32 Minimal VM build failure after JDK-8262355
  • 0f13e22: 8264791: java/util/Random/RandomTestBsi1999.java failed "java.security.SecureRandom nextFloat consecutive"
  • 4bb80f3: 8262898: com/sun/net/httpserver/bugs/8199849/ParamTest.java times out
  • 2f51699: 8264554: X509KeyManagerImpl calls getProtectionParameter with incorrect alias
  • 114e3c3: 8263856: Github Actions for macos/aarch64 cross-build
  • a611c46: 8264048: Fix caching in Jar URL connections when an entry is missing
  • bf26a25: 8264027: Refactor "CLEANUP" region printing
  • eb6330e: 8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt
  • ... and 11 more: https://git.openjdk.java.net/jdk/compare/104e925dfdac0af3b1c6862f9a7d3442484f9241...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 openjdk bot added the ready label Apr 6, 2021
@andyherrick
Copy link

@andyherrick andyherrick commented Apr 6, 2021

One question -
ICON is only a valid option for creating app launcher. If creating an installer using --app-image option it would not be a vlid option.
Does this change imply we should change ValidOptions to change:
options.put(CLIOptions.ICON.getId(), USE.LAUNCHER);
to
options.put(CLIOptions.ICON.getId(), USE.ALL);

@alexeysemenyukoracle
Copy link
Member Author

@alexeysemenyukoracle alexeysemenyukoracle commented Apr 6, 2021

Good point! I'll add corresponding test case and update ValidOptions accordingly.

@alexeysemenyukoracle
Copy link
Member Author

@alexeysemenyukoracle alexeysemenyukoracle commented Apr 8, 2021

/integrate

@openjdk openjdk bot closed this Apr 8, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Apr 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 8, 2021

@alexeysemenyukoracle Since your change was applied there have been 45 commits pushed to the master branch:

  • 81d35e4: 8264063: Outer Safepoint poll load should not reference the head of inner strip mined loop.
  • 04fa1ed: 8264848: [macos] libjvm.dylib linker warning due to macOS version mismatch
  • 214d6e2: 8263506: Make sun.net.httpserver.UnmodifiableHeaders unmodifiable
  • af13c64: 8264711: More runtime TRAPS cleanups
  • 3aec2d9: 8264718: Shenandoah: enable string deduplication during root scanning
  • 255afbe: 8264672: runtime/ParallelLoad/ParallelSuperTest.java timed out
  • ec599da: 8264633: Add missing logging to PlatformRecording#stop
  • e89542f: 8264352: AArch64: Optimize vector "not/andNot" for NEON and SVE
  • 016db40: 8263907: Specification of CellRendererPane::paintComponent(..Rectangle) should clearly mention which method it delegates the call to
  • 78d1164: 8214455: Relocate CDS archived regions to the top of the G1 heap
  • ... and 35 more: https://git.openjdk.java.net/jdk/compare/104e925dfdac0af3b1c6862f9a7d3442484f9241...master

Your commit was automatically rebased without conflicts.

Pushed as commit 5bd6c74.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants