modules/fxpackager/src/main/java/com/oracle/tools/packager/mac/MacAppStoreBundler.java

Print this page
rev 7440 : RT-37832: [packager] Mac App Store Bundler fails to strip jfxmedia.dylib and strips Info.plist
Summary: Update the JDK Parameters prior to validating the app image bundler.  This will get the right rules in place before they are evaluated by the child app image bundler's validation.


 308         results.addAll(Arrays.asList(
 309                 MAC_APP_STORE_APP_SIGNING_KEY,
 310                 MAC_APP_STORE_ENTITLEMENTS,
 311                 MAC_APP_STORE_PKG_SIGNING_KEY
 312         ));
 313 
 314         return results;
 315     }
 316 
 317     @Override
 318     public boolean validate(Map<String, ? super Object> params) throws UnsupportedPlatformException, ConfigException {
 319         try {
 320             if (params == null) throw new ConfigException(
 321                     I18N.getString("error.parameters-null"),
 322                     I18N.getString("error.parameters-null.advice"));
 323 
 324             // hdiutil is always available so there's no need to test for availability.
 325             //run basic validation to ensure requirements are met
 326 
 327             //run basic validation to ensure requirements are met




 328             //we are not interested in return code, only possible exception
 329             validateAppImageAndBundeler(params);
 330 
 331             // make sure we have settings for signatures
 332             if (MAC_APP_STORE_APP_SIGNING_KEY.fetchFrom(params) == null) {
 333                 throw new ConfigException(
 334                         I18N.getString("error.no-app-signing-key"),
 335                         I18N.getString("error.no-app-signing-key.advice"));
 336             }
 337             if (MAC_APP_STORE_PKG_SIGNING_KEY.fetchFrom(params) == null) {
 338                 throw new ConfigException(
 339                         I18N.getString("error.no-pkg-signing-key"),
 340                         I18N.getString("error.no-pkg-signing-key.advice"));
 341             }
 342 
 343             // things we could check...
 344             // check the icons, make sure it has hidpi icons
 345             // check the category, make sure it fits in the list apple has provided
 346             // validate bundle identifier is reverse dns
 347             //  check for \a+\.\a+\..


 308         results.addAll(Arrays.asList(
 309                 MAC_APP_STORE_APP_SIGNING_KEY,
 310                 MAC_APP_STORE_ENTITLEMENTS,
 311                 MAC_APP_STORE_PKG_SIGNING_KEY
 312         ));
 313 
 314         return results;
 315     }
 316 
 317     @Override
 318     public boolean validate(Map<String, ? super Object> params) throws UnsupportedPlatformException, ConfigException {
 319         try {
 320             if (params == null) throw new ConfigException(
 321                     I18N.getString("error.parameters-null"),
 322                     I18N.getString("error.parameters-null.advice"));
 323 
 324             // hdiutil is always available so there's no need to test for availability.
 325             //run basic validation to ensure requirements are met
 326 
 327             //run basic validation to ensure requirements are met
 328 
 329             //we need to change the jdk/jre stripping to strip gstreamer
 330             params.put(MacAppBundler.MAC_JDK_RULES.getID(), MAC_APP_STORE_JDK_RULES);
 331 
 332             //we are not interested in return code, only possible exception
 333             validateAppImageAndBundeler(params);
 334 
 335             // make sure we have settings for signatures
 336             if (MAC_APP_STORE_APP_SIGNING_KEY.fetchFrom(params) == null) {
 337                 throw new ConfigException(
 338                         I18N.getString("error.no-app-signing-key"),
 339                         I18N.getString("error.no-app-signing-key.advice"));
 340             }
 341             if (MAC_APP_STORE_PKG_SIGNING_KEY.fetchFrom(params) == null) {
 342                 throw new ConfigException(
 343                         I18N.getString("error.no-pkg-signing-key"),
 344                         I18N.getString("error.no-pkg-signing-key.advice"));
 345             }
 346 
 347             // things we could check...
 348             // check the icons, make sure it has hidpi icons
 349             // check the category, make sure it fits in the list apple has provided
 350             // validate bundle identifier is reverse dns
 351             //  check for \a+\.\a+\..