diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk index 15477c1b693..3aadbcb12ed 100644 --- a/make/CompileJavaModules.gmk +++ b/make/CompileJavaModules.gmk @@ -381,7 +381,7 @@ endif ################################################################################ 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 diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java b/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java index 5e005081631..243bcd0cc99 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java +++ b/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/MacDmgBundler.java @@ -38,7 +38,7 @@ public class MacDmgBundler extends MacBaseInstallerBundler { 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 @@ public class MacDmgBundler extends MacBaseInstallerBundler { private File getConfig_VolumeBackground( Map 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 params) { @@ -304,7 +304,7 @@ public class MacDmgBundler extends MacBaseInstallerBundler { 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 diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt b/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt index 82d71070bb7..f6faaae798a 100644 --- a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt +++ b/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/DMGsetup.scpt @@ -11,7 +11,7 @@ tell application "Finder" 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"} diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.png b/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.png deleted file mode 100644 index 2cfefac72e0..00000000000 Binary files a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.png and /dev/null differ diff --git a/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.tiff b/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.tiff new file mode 100644 index 00000000000..c930aff44a7 Binary files /dev/null and b/src/jdk.incubator.jpackage/macosx/classes/jdk/incubator/jpackage/internal/resources/background_dmg.tiff differ