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

JDK-8248904: Add support to jpackage for the Mac App Store #2716

Closed
wants to merge 6 commits into from

Conversation

@andyherrick
Copy link

@andyherrick andyherrick commented Feb 24, 2021

Implementation of Mac App Support including three new mac specific CLI options.


Progress

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

Issue

  • JDK-8248904: Add support to jpackage for the Mac App Store

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2716/head:pull/2716
$ git checkout pull/2716

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 24, 2021

👋 Welcome back herrick! 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 openjdk bot commented Feb 24, 2021

@andyherrick 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 Feb 24, 2021
@andyherrick andyherrick changed the title JDK-8248904: Add support for Mac App Store JDK-8248904: Add support to jpackage for the Mac App Store Feb 24, 2021
@andyherrick
Copy link
Author

@andyherrick andyherrick commented Feb 24, 2021

/csr

@openjdk openjdk bot added the csr label Feb 24, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Feb 24, 2021

@andyherrick this pull request will not be integrated until the CSR request JDK-8262082 for issue JDK-8248904 has been approved.

@andyherrick andyherrick marked this pull request as ready for review Mar 8, 2021
@openjdk openjdk bot added the rfr label Mar 8, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 8, 2021

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good with a couple questions. Is JavaApp.icns intended to be an empty file (I see that the file it was renamed from was empty, so probably OK)? The rest are inline below.

@@ -185,7 +185,7 @@ Generic Options:\n\
\ Icons, template files, and other resources of jpackage can be\n\
\ over-ridden by adding replacement resources to this directory.\n\
\ (absolute path or relative to the current directory)\n\
\ --runtime-image <file-path>\n\
\ --runtime-image <file path>\n\
Copy link
Member

@kevinrushforth kevinrushforth Mar 10, 2021

This seems unrelated to this change.

Copy link
Author

@andyherrick andyherrick Mar 10, 2021

yes - it is unrelated, other than I was adding a new help text with the same syntax (--mac-entitlements ) and was looking for consistent way to say "" and found that in all cases except this one we said not so I fixed this one too to make them all consistent.

\ Team or user name portion of Apple signing identities.\n\
\ --mac-app-store\n\
\ Indicates that the jpackage output is intended for the\n\
\ Mac App Store.\n\
Copy link
Member

@kevinrushforth kevinrushforth Mar 10, 2021

Maybe macOS App Store?

Copy link
Author

@andyherrick andyherrick Mar 10, 2021

Although I do see it referenced both ways (even by Apple) I see 10 times as many entries in Google for "Mac App Store" (1.7 billion) vs MacOS App Store (155 million)

@openjdk openjdk bot removed the csr label Mar 15, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Mar 15, 2021

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

8248904: Add support to jpackage for the Mac App Store

Reviewed-by: asemenyuk, almatvee, kizune, kcr

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

  • 0c718ab: 8262277: URLClassLoader.getResource throws undocumented IllegalArgumentException
  • 4f1cda4: 8263387: G1GarbageCollection JFR event gets gc phase, not gc type
  • 5ab5244: 8263514: Minor issue in JavacFileManager.SortFiles.REVERSE
  • 771b146: 8245025: MoveAndUpdateClosure::do_addr calls function with side-effects in an assert
  • 46d78f0: 6539707: (fc) MappedByteBuffer.force() method throws an IOException in a very simple test
  • 189289d: 8262326: MaxMetaspaceSize does not have to be aligned to metaspace commit alignment
  • d825198: 8263556: remove @modules java.base from tests
  • d6b5e18: 8263191: Consolidate ThreadInVMfromJavaNoAsyncException and ThreadBlockInVMWithDeadlockCheck with existing wrappers
  • 80cdf78: 8263544: Unused argument in ConstantPoolCacheEntry::set_field()
  • c0176c4: 8263552: Use String.valueOf() for char-to-String conversions
  • ... and 235 more: https://git.openjdk.java.net/jdk/compare/2c99bad082c672b2f1b4dc7792c213b2e9076f57...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 Mar 15, 2021
@andyherrick
Copy link
Author

@andyherrick andyherrick commented Mar 16, 2021

/integrate

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

@openjdk openjdk bot commented Mar 16, 2021

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

  • dc93138: 8256732: Zero: broken +ZeroTLAB exposes badly initialized memory
  • e33bfb3: 8263450: Simplify LambdaForm.useCount
  • 75ef6f5: 8263427: Shenandoah: Trigger weak-LRB even when heap is stable
  • 4517d72: 8263612: Unused variables in C1 runtime
  • 83a9a02: 8263509: LdapSchemaParser.readNextTag checks array length incorrectly
  • 9c50b8e: 8263587: C2: JVMS not cloned when needs_clone_jvms() is true
  • 68deb24: 8080272: Refactor I/O stream copying to use InputStream.transferTo/readAllBytes and Files.copy
  • a31a23d: 8263595: Remove oop type punning in JavaCallArguments
  • a1f6591: 8263589: Introduce JavaValue::get_oop/set_oop
  • 20297a1: 8263577: C2: reachable nodes shouldn't have dead uses at the end of optimizations
  • ... and 252 more: https://git.openjdk.java.net/jdk/compare/2c99bad082c672b2f1b4dc7792c213b2e9076f57...master

Your commit was automatically rebased without conflicts.

Pushed as commit 11c8c78.

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

@andyherrick andyherrick deleted the JDK-8248904-A branch Mar 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment