From 01df8c5bcd601bf73b1c7955b6ddeec3bf9d1bc9 Mon Sep 17 00:00:00 2001 From: "Vladimir.Orlov" Date: Tue, 27 Jun 2017 15:37:11 +0300 Subject: [PATCH] Reverted. the changes needed only for 172 branch. --- .../intellij/build/IdeaCommunityProperties.groovy | 1 - .../jetbrains/intellij/build/ProductProperties.groovy | 7 ------- .../intellij/build/impl/MacDmgBuilder.groovy | 11 ++--------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy index 27822ca90bb9..8b495f85c6fd 100644 --- a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy @@ -31,7 +31,6 @@ class IdeaCommunityProperties extends BaseIdeaProperties { additionalIDEPropertiesFilePaths = ["$home/build/conf/ideaCE.properties".toString()] toolsJarRequired = true buildCrossPlatformDistribution = true - customJreFileName = "jbrex8u112b736.21_x64.tar.gz" productLayout.platformApiModules = CommunityRepositoryModules.PLATFORM_API_MODULES + JAVA_API_MODULES productLayout.platformImplementationModules = CommunityRepositoryModules.PLATFORM_IMPLEMENTATION_MODULES + JAVA_IMPLEMENTATION_MODULES + diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/ProductProperties.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/ProductProperties.groovy index 53f37b0e764d..561de01b418c 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/ProductProperties.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/ProductProperties.groovy @@ -70,13 +70,6 @@ abstract class ProductProperties { */ String customJvmMemoryOptionsX64 = null - /** - * Include jre for OS X from 171.3 release. - * https://youtrack.jetbrains.com/issue/JRE-401 - * As soon as the issue will be fixed the change should be reverted. - */ - String customJreFileName = "jbre8u112b736.21_x64.tar.gz" - /** * An identifier which will be used to form names for directories where configuration and caches will be stored, usually a product name * without spaces with added version ('IntelliJIdea2016.1' for IntelliJ IDEA 2016.1) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy index e3ff0526fc45..9c96ef02212e 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy @@ -51,16 +51,9 @@ class MacDmgBuilder { static void signAndBuildDmg(BuildContext buildContext, MacDistributionCustomizer customizer, MacHostProperties macHostProperties, String macZipPath) { MacDmgBuilder dmgBuilder = createInstance(buildContext, customizer, macHostProperties) - def jreDir = new File(buildContext.paths.projectHome, 'build/jdk') - def jreArchivePath = new File(jreDir, buildContext.productProperties.customJreFileName) - if (!jreArchivePath.exists()) { - buildContext.bundledJreManager.findMacJreArchive() - } - + def jreArchivePath = buildContext.bundledJreManager.findMacJreArchive() if (jreArchivePath != null) { - String jreArchive = jreArchivePath.absolutePath - buildContext.messages.info("jreArchive: $jreArchive") - dmgBuilder.doSignAndBuildDmg(macZipPath, jreArchive) + dmgBuilder.doSignAndBuildDmg(macZipPath, jreArchivePath) } else { buildContext.messages.info("Skipping building Mac OS distribution with bundled JRE because JRE archive is missing")