From f63f1fdc267da5fb15a2e4bb03c376394051b275 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Tue, 12 Nov 2019 19:15:01 +0300 Subject: [PATCH] IDEA-CR-54965 introduce JetBrainsProductProperties GitOrigin-RevId: 320d60fc4afaa4826b1871cc512e0bfc5e38fce0 --- .../intellij/build/BaseIdeaProperties.groovy | 2 +- .../build/JetBrainsProductProperties.groovy | 15 +++++++++++++++ .../intellij/build/ProductProperties.groovy | 2 +- .../build/pycharm/PyCharmPropertiesBase.groovy | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 platform/build-scripts/groovy/org/jetbrains/intellij/build/JetBrainsProductProperties.groovy diff --git a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy index 25541b751c46..4f69069f6242 100644 --- a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy @@ -8,7 +8,7 @@ import java.util.function.Consumer /** * Base class for all editions of IntelliJ IDEA */ -abstract class BaseIdeaProperties extends ProductProperties { +abstract class BaseIdeaProperties extends JetBrainsProductProperties { public static final List JAVA_IDE_API_MODULES = [ "intellij.xml.dom", "intellij.java.testFramework", diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/JetBrainsProductProperties.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/JetBrainsProductProperties.groovy new file mode 100644 index 000000000000..324d21151e61 --- /dev/null +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/JetBrainsProductProperties.groovy @@ -0,0 +1,15 @@ +// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +package org.jetbrains.intellij.build + +import groovy.transform.CompileStatic + +/** + * Describes distribution of an in-house IntelliJ-based IDE hosted in IntelliJ repository. + * + */ +@CompileStatic +abstract class JetBrainsProductProperties extends ProductProperties { + { + scrambleMainJar = true + } +} \ No newline at end of file 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 79a8c7e43b8a..2463395ce947 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/ProductProperties.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/ProductProperties.groovy @@ -87,7 +87,7 @@ abstract class ProductProperties { /** * If {@code true} the main product JAR file will be scrambled using {@link ProprietaryBuildTools#scrambleTool} */ - boolean scrambleMainJar = true + boolean scrambleMainJar = false /** * If {@code false} names of private fields won't be scrambled (to avoid problems with serialization). This field is ignored if diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy index 864e66aa7594..82a7dae90337 100644 --- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy +++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy @@ -23,7 +23,7 @@ import static org.jetbrains.intellij.build.pycharm.PyCharmBuildOptions.GENERATE_ /** * @author nik */ -abstract class PyCharmPropertiesBase extends ProductProperties { +abstract class PyCharmPropertiesBase extends JetBrainsProductProperties { protected String dependenciesPath PyCharmPropertiesBase() {