< prev index next >

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java

Print this page

        

*** 49,69 **** "jdk.jpackage.internal.resources.MacResources"); // This could be generalized more to be for any type of Image Bundler public static final BundlerParamInfo<MacAppBundler> APP_BUNDLER = new StandardBundlerParam<>( - I18N.getString("param.app-bundler.name"), - I18N.getString("param.app-bundle.description"), "mac.app.bundler", MacAppBundler.class, params -> new MacAppBundler(), (s, p) -> null); ! public final BundlerParamInfo<File> APP_IMAGE_BUILD_ROOT = new StandardBundlerParam<>( - I18N.getString("param.app-image-build-root.name"), - I18N.getString("param.app-image-build-root.description"), "mac.app.imageRoot", File.class, params -> { File imageDir = IMAGES_ROOT.fetchFrom(params); if (!imageDir.exists()) imageDir.mkdirs(); --- 49,65 ---- "jdk.jpackage.internal.resources.MacResources"); // This could be generalized more to be for any type of Image Bundler public static final BundlerParamInfo<MacAppBundler> APP_BUNDLER = new StandardBundlerParam<>( "mac.app.bundler", MacAppBundler.class, params -> new MacAppBundler(), (s, p) -> null); ! public final BundlerParamInfo<File> APP_IMAGE_TEMP_ROOT = new StandardBundlerParam<>( "mac.app.imageRoot", File.class, params -> { File imageDir = IMAGES_ROOT.fetchFrom(params); if (!imageDir.exists()) imageDir.mkdirs();
*** 76,105 **** }, (s, p) -> new File(s)); public static final BundlerParamInfo<String> SIGNING_KEY_USER = new StandardBundlerParam<>( - I18N.getString("param.signing-key-name.name"), - I18N.getString("param.signing-key-name.description"), Arguments.CLIOptions.MAC_SIGNING_KEY_NAME.getId(), String.class, params -> "", null); public static final BundlerParamInfo<String> SIGNING_KEYCHAIN = new StandardBundlerParam<>( - I18N.getString("param.signing-keychain.name"), - I18N.getString("param.signing-keychain.description"), Arguments.CLIOptions.MAC_SIGNING_KEYCHAIN.getId(), String.class, params -> "", null); public static final BundlerParamInfo<String> INSTALLER_NAME = new StandardBundlerParam<> ( - I18N.getString("param.installer-name.name"), - I18N.getString("param.installer-name.description"), "mac.installerName", String.class, params -> { String nm = APP_NAME.fetchFrom(params); if (nm == null) return null; --- 72,95 ----
*** 149,159 **** boolean pkg) throws PackagerException { File predefinedImage = StandardBundlerParam.getPredefinedAppImage(p); if (predefinedImage != null) { return predefinedImage; } ! File appImageRoot = APP_IMAGE_BUILD_ROOT.fetchFrom(p); if (pkg) { // create pkg in dmg return new MacPkgBundler().bundle(p, appImageRoot); } else { return APP_BUNDLER.fetchFrom(p).doBundle(p, appImageRoot, true); --- 139,149 ---- boolean pkg) throws PackagerException { File predefinedImage = StandardBundlerParam.getPredefinedAppImage(p); if (predefinedImage != null) { return predefinedImage; } ! File appImageRoot = APP_IMAGE_TEMP_ROOT.fetchFrom(p); if (pkg) { // create pkg in dmg return new MacPkgBundler().bundle(p, appImageRoot); } else { return APP_BUNDLER.fetchFrom(p).doBundle(p, appImageRoot, true);
*** 166,176 **** results.addAll(MacAppBundler.getAppBundleParameters()); results.addAll(Arrays.asList( APP_BUNDLER, CONFIG_ROOT, ! APP_IMAGE_BUILD_ROOT, PREDEFINED_APP_IMAGE )); return results; } --- 156,166 ---- results.addAll(MacAppBundler.getAppBundleParameters()); results.addAll(Arrays.asList( APP_BUNDLER, CONFIG_ROOT, ! APP_IMAGE_TEMP_ROOT, PREDEFINED_APP_IMAGE )); return results; }
< prev index next >