MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Reverted. the changes needed only for 172 branch.

Browse Source
This commit is contained in:
Vladimir.Orlov
2017-06-27 15:37:11 +03:00
parent a637e03280
commit 01df8c5bcd
3 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
-1
View File
@@ -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 +
platform/build-scripts/groovy/org/jetbrains/intellij/build/ProductProperties.groovy
-7
View File
@@ -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)
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy
+2 -9
View File
@@ -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")