diff --git a/build/conf/ideaCE/mac/images/communitydmg.png b/build/conf/ideaCE/mac/images/communitydmg.png deleted file mode 100644 index bb8e6e30b2be..000000000000 Binary files a/build/conf/ideaCE/mac/images/communitydmg.png and /dev/null differ diff --git a/build/conf/ideaCE/mac/images/dmg_background.tiff b/build/conf/ideaCE/mac/images/dmg_background.tiff new file mode 100644 index 000000000000..d9b5f3547ba7 Binary files /dev/null and b/build/conf/ideaCE/mac/images/dmg_background.tiff differ diff --git a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy index 9b8dbe98036e..6f6c8e9b2bce 100644 --- a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy @@ -110,7 +110,7 @@ class IdeaCommunityProperties extends BaseIdeaProperties { associateIpr = true enableYourkitAgentInEAP = false bundleIdentifier = "com.jetbrains.intellij.ce" - dmgImagePath = "$projectHome/build/conf/ideaCE/mac/images/communitydmg.png" + dmgImagePath = "$projectHome/build/conf/ideaCE/mac/images/dmg_background.tiff" icnsPathForEAP = "$projectHome/build/conf/ideaCE/mac/images/communityEAP.icns" } diff --git a/platform/build-scripts/tools/mac/scripts/makedmg.pl b/platform/build-scripts/tools/mac/scripts/makedmg.pl index 4c4f1c34f7c0..7bb9b4c62478 100644 --- a/platform/build-scripts/tools/mac/scripts/makedmg.pl +++ b/platform/build-scripts/tools/mac/scripts/makedmg.pl @@ -13,7 +13,7 @@ $mountName = $ARGV[2]; &makeEntries(".DS_Store", Iloc_xy => [ 610, 170 ]), &makeEntries(".fseventsd", Iloc_xy => [ 660, 170 ]), &makeEntries(".Trashes", Iloc_xy => [ 710, 170 ]), - &makeEntries(" ", Iloc_xy => [ 335, 120 ]), + &makeEntries("Applications", Iloc_xy => [ 340, 167 ]), &makeEntries(".", BKGD_alias => NewAliasMinimal("/Volumes/$mountName/.background/$bg_pic"), ICVO => 1, @@ -23,6 +23,6 @@ $mountName = $ARGV[2]; icvo => pack('A4 n A4 A4 n*', "icv4", 100, "none", "botm", 0, 0, 0, 0, 0, 1, 0, 100, 1), icvt => 12 ), - &makeEntries("$name.app", Iloc_xy => [ 110, 120 ]) + &makeEntries("$name.app", Iloc_xy => [ 110, 167 ]) ); diff --git a/platform/build-scripts/tools/mac/scripts/makedmg.sh b/platform/build-scripts/tools/mac/scripts/makedmg.sh index 3b91e1811aa0..daba1841e2f8 100644 --- a/platform/build-scripts/tools/mac/scripts/makedmg.sh +++ b/platform/build-scripts/tools/mac/scripts/makedmg.sh @@ -28,7 +28,7 @@ chmod a+x ${EXPLODED}/"$BUILD_NAME"/Contents/bin/fs* mkdir ${EXPLODED}/.background mv ${BG_PIC} ${EXPLODED}/.background -ln -s /Applications ${EXPLODED}/" " +ln -s /Applications ${EXPLODED}/"Applications" # allocate space for .DS_Store dd if=/dev/zero of=${EXPLODED}/DSStorePlaceHolder bs=1024 count=512 stat ${EXPLODED}/DSStorePlaceHolder diff --git a/python/build/DMG_background.png b/python/build/DMG_background.png deleted file mode 100644 index 42e30d6f388c..000000000000 Binary files a/python/build/DMG_background.png and /dev/null differ diff --git a/python/build/dmg_background.tiff b/python/build/dmg_background.tiff new file mode 100644 index 000000000000..99aad12b538a Binary files /dev/null and b/python/build/dmg_background.tiff differ diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy index 016f61618d71..44cff90c555f 100644 --- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy +++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy @@ -97,7 +97,7 @@ class PyCharmCommunityProperties extends PyCharmPropertiesBase { { icnsPath = "$projectHome/python/resources/PyCharmCore.icns" bundleIdentifier = "com.jetbrains.pycharm" - dmgImagePath = "$projectHome/python/build/DMG_background.png" + dmgImagePath = "$projectHome/python/build/dmg_background.tiff" } @Override diff --git a/python/build/icon-robots.txt b/python/build/icon-robots.txt index c9f07ebebd3f..9fe09fcffa70 100644 --- a/python/build/icon-robots.txt +++ b/python/build/icon-robots.txt @@ -1 +1 @@ -skip: DMG_background.png \ No newline at end of file +skip: dmg_background.tiff \ No newline at end of file diff --git a/python/educational-python/build/DMG_background.png b/python/educational-python/build/DMG_background.png deleted file mode 100644 index 42e30d6f388c..000000000000 Binary files a/python/educational-python/build/DMG_background.png and /dev/null differ diff --git a/python/educational-python/build/dmg_background.tiff b/python/educational-python/build/dmg_background.tiff new file mode 100644 index 000000000000..99aad12b538a Binary files /dev/null and b/python/educational-python/build/dmg_background.tiff differ diff --git a/python/educational-python/build/groovy/org/jetbrains/intellij/build/pycharm/edu/PyCharmEduProperties.groovy b/python/educational-python/build/groovy/org/jetbrains/intellij/build/pycharm/edu/PyCharmEduProperties.groovy index b8740389f345..cbbf47d83751 100644 --- a/python/educational-python/build/groovy/org/jetbrains/intellij/build/pycharm/edu/PyCharmEduProperties.groovy +++ b/python/educational-python/build/groovy/org/jetbrains/intellij/build/pycharm/edu/PyCharmEduProperties.groovy @@ -112,7 +112,7 @@ class PyCharmEduProperties extends PyCharmPropertiesBase { { icnsPath = "$pythonCommunityPath/educational-python/resources/PyCharmEdu.icns" bundleIdentifier = "com.jetbrains.pycharm" - dmgImagePath = "$pythonCommunityPath/educational-python/build/DMG_background.png" + dmgImagePath = "$pythonCommunityPath/educational-python/build/dmg_background.tiff" } @Override diff --git a/python/educational-python/build/icon-robots.txt b/python/educational-python/build/icon-robots.txt index c9f07ebebd3f..9fe09fcffa70 100644 --- a/python/educational-python/build/icon-robots.txt +++ b/python/educational-python/build/icon-robots.txt @@ -1 +1 @@ -skip: DMG_background.png \ No newline at end of file +skip: dmg_background.tiff \ No newline at end of file