OpenJDK / jdk / jdk
changeset 57381:88dcda42b67a
8234284: [dmg] Change DMG background image to TIFF
Reviewed-by: herrick, asemenyuk, erikj
| author | almatvee |
|---|---|
| date | Wed, 11 Dec 2019 16:07:04 -0500 |
| parents | 5b2f50117374 |
| children | e279627a68e4 |
| files | make/CompileJavaModules.gmk src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.png src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.tiff |
| diffstat | 5 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk Wed Dec 11 15:01:11 2019 -0500 +++ b/make/CompileJavaModules.gmk Wed Dec 11 16:07:04 2019 -0500 @@ -381,7 +381,7 @@ ################################################################################ jdk.incubator.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst .postrm .postinst .list .sh \ - .desktop .copyright .control .plist .template .icns .scpt .entitlements .wxs .wxl .wxi .ico .bmp + .desktop .copyright .control .plist .template .icns .scpt .entitlements .wxs .wxl .wxi .ico .bmp .tiff jdk.incubator.jpackage_CLEAN += .properties
--- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java Wed Dec 11 15:01:11 2019 -0500 +++ b/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java Wed Dec 11 16:07:04 2019 -0500 @@ -38,7 +38,7 @@ private static final ResourceBundle I18N = ResourceBundle.getBundle( "jdk.incubator.jpackage.internal.resources.MacResources"); - static final String DEFAULT_BACKGROUND_IMAGE="background_dmg.png"; + static final String DEFAULT_BACKGROUND_IMAGE="background_dmg.tiff"; static final String DEFAULT_DMG_SETUP_SCRIPT="DMGsetup.scpt"; static final String TEMPLATE_BUNDLE_ICON = "java.icns"; @@ -112,7 +112,7 @@ private File getConfig_VolumeBackground( Map<String, ? super Object> params) { return new File(CONFIG_ROOT.fetchFrom(params), - APP_NAME.fetchFrom(params) + "-background.png"); + APP_NAME.fetchFrom(params) + "-background.tiff"); } private File getConfig_VolumeIcon(Map<String, ? super Object> params) { @@ -304,7 +304,7 @@ File bgdir = new File(mountedRoot, ".background"); bgdir.mkdirs(); IOUtils.copyFile(getConfig_VolumeBackground(params), - new File(bgdir, "background.png")); + new File(bgdir, "background.tiff")); // Indicate that we want a custom icon // NB: attributes of the root directory are ignored
--- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt Wed Dec 11 15:01:11 2019 -0500 +++ b/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt Wed Dec 11 16:07:04 2019 -0500 @@ -11,7 +11,7 @@ set theViewOptions to the icon view options of container window set arrangement of theViewOptions to not arranged set icon size of theViewOptions to 128 - set background picture of theViewOptions to file ".background:background.png" + set background picture of theViewOptions to file ".background:background.tiff" -- Create alias for install location make new alias file at container window to DEPLOY_INSTALL_LOCATION with properties {name:"DEPLOY_INSTALL_NAME"}