mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
IDEA project configuration: the great module rename
Rename all modules in IntelliJ IDEA sources to ensure that they follow a consistent naming scheme. Update build scripts.
This commit is contained in:
nik
@@ -16,52 +16,52 @@ import java.util.function.Consumer
|
||||
*/
|
||||
abstract class BaseIdeaProperties extends ProductProperties {
|
||||
protected static final List<String> JAVA_API_MODULES = [
|
||||
"compiler-openapi",
|
||||
"debugger-openapi",
|
||||
"dom-openapi",
|
||||
"execution-openapi",
|
||||
"remote-servers-java-api",
|
||||
"testFramework-java",
|
||||
"testFramework.core"
|
||||
"intellij.java.compiler",
|
||||
"intellij.java.debugger",
|
||||
"intellij.xml.dom",
|
||||
"intellij.java.execution",
|
||||
"intellij.java.remoteServers",
|
||||
"intellij.java.testFramework",
|
||||
"intellij.platform.testFramework.core"
|
||||
]
|
||||
protected static final List<String> JAVA_IMPLEMENTATION_MODULES = [
|
||||
"compiler-impl",
|
||||
"debugger-impl",
|
||||
"dom-impl",
|
||||
"execution-impl",
|
||||
"external-system-impl",
|
||||
"idea-ui",
|
||||
"java-structure-view",
|
||||
"manifest",
|
||||
"remote-servers-java-impl",
|
||||
"testFramework",
|
||||
"tests_bootstrap",
|
||||
"ui-designer-core"
|
||||
"intellij.java.compiler.impl",
|
||||
"intellij.java.debugger.impl",
|
||||
"intellij.xml.dom.impl",
|
||||
"intellij.java.execution.impl",
|
||||
"intellij.platform.externalSystem.impl",
|
||||
"intellij.java.ui",
|
||||
"intellij.java.structureView",
|
||||
"intellij.java.manifest",
|
||||
"intellij.java.remoteServers.impl",
|
||||
"intellij.platform.testFramework",
|
||||
"intellij.tools.testsBootstrap",
|
||||
"intellij.uiDesigner"
|
||||
]
|
||||
protected static final List<String> BUNDLED_PLUGIN_MODULES = [
|
||||
"copyright", "properties", "terminal", "editorconfig", "settings-repository", "yaml",
|
||||
"tasks-core", "tasks-java",
|
||||
"maven", "gradle",
|
||||
"git4idea", "remote-servers-git", "remote-servers-git-java", "svn4idea", "hg4idea", "github", "cvs-plugin",
|
||||
"jetgroovy", "junit", "testng", "xpath", "xslt-debugger", "android-plugin", "javaFX-CE",
|
||||
"java-i18n", "ant", "ui-designer", "ByteCodeViewer", "coverage", "java-decompiler-plugin", "devkit", "eclipse",
|
||||
"IntelliLang", "IntelliLang-java", "IntelliLang-xml", "intellilang-jps-plugin", "stream-debugger", "smali"
|
||||
"intellij.copyright", "intellij.properties", "intellij.terminal", "intellij.editorconfig", "intellij.settingsRepository", "intellij.yaml",
|
||||
"intellij.tasks.core", "intellij.tasks.java",
|
||||
"intellij.maven", "intellij.gradle",
|
||||
"intellij.vcs.git", "intellij.platform.remoteServers.git", "intellij.java.remoteServers.git", "intellij.vcs.svn", "intellij.vcs.hg", "intellij.vcs.github", "intellij.vcs.cvs",
|
||||
"intellij.groovy", "intellij.junit", "intellij.testng", "intellij.xpath", "intellij.xslt.debugger", "intellij.android.plugin", "intellij.javaFX.community",
|
||||
"intellij.java.i18n", "intellij.ant", "intellij.java.guiForms.designer", "intellij.java.byteCodeViewer", "intellij.java.coverage", "intellij.java.decompiler", "intellij.devkit", "intellij.eclipse",
|
||||
"intellij.platform.langInjection", "intellij.java.langInjection", "intellij.xml.langInjection", "intellij.java.langInjection.jps", "intellij.java.debugger.streams", "intellij.android.smali"
|
||||
]
|
||||
|
||||
BaseIdeaProperties() {
|
||||
productLayout.mainJarName = "idea.jar"
|
||||
productLayout.searchableOptionsModule = "resources-en"
|
||||
productLayout.searchableOptionsModule = "intellij.java.resources.en"
|
||||
|
||||
productLayout.additionalPlatformJars.put("external-system-rt.jar", "external-system-rt")
|
||||
productLayout.additionalPlatformJars.put("jps-launcher.jar", "jps-launcher")
|
||||
productLayout.additionalPlatformJars.put("jps-builders.jar", "jps-builders")
|
||||
productLayout.additionalPlatformJars.put("jps-builders-6.jar", "jps-builders-6")
|
||||
productLayout.additionalPlatformJars.put("aether-dependency-resolver.jar", "aether-dependency-resolver")
|
||||
productLayout.additionalPlatformJars.put("jshell-protocol.jar", "jshell-protocol")
|
||||
productLayout.additionalPlatformJars.putAll("resources.jar", ["resources", "resources-en"])
|
||||
productLayout.additionalPlatformJars.put("external-system-rt.jar", "intellij.platform.externalSystem.rt")
|
||||
productLayout.additionalPlatformJars.put("jps-launcher.jar", "intellij.platform.jps.build.launcher")
|
||||
productLayout.additionalPlatformJars.put("jps-builders.jar", "intellij.platform.jps.build")
|
||||
productLayout.additionalPlatformJars.put("jps-builders-6.jar", "intellij.platform.jps.build.javac.rt")
|
||||
productLayout.additionalPlatformJars.put("aether-dependency-resolver.jar", "intellij.java.aetherDependencyResolver")
|
||||
productLayout.additionalPlatformJars.put("jshell-protocol.jar", "intellij.java.jshell.protocol")
|
||||
productLayout.additionalPlatformJars.putAll("resources.jar", ["intellij.java.resources", "intellij.java.resources.en"])
|
||||
productLayout.additionalPlatformJars.
|
||||
putAll("javac2.jar", ["javac2", "forms-compiler", "forms_rt", "instrumentation-util", "instrumentation-util-8", "javac-ref-scanner-8"])
|
||||
productLayout.additionalPlatformJars.putAll("annotations-java8.jar", ["annotations-common", "annotations-java8"])
|
||||
putAll("javac2.jar", ["intellij.java.compiler.antTasks", "intellij.java.guiForms.compiler", "intellij.java.guiForms.rt", "intellij.java.compiler.instrumentationUtil", "intellij.java.compiler.instrumentationUtil.java8", "intellij.java.jps.javacRefScanner8"])
|
||||
productLayout.additionalPlatformJars.putAll("annotations-java8.jar", ["intellij.platform.annotations.common", "intellij.platform.annotations"])
|
||||
|
||||
def JAVA_API_JAR = "java-api.jar"
|
||||
def JAVA_IMPL_JAR = "java-impl.jar"
|
||||
@@ -71,22 +71,22 @@ abstract class BaseIdeaProperties extends ProductProperties {
|
||||
productLayout.platformLayoutCustomizer = { PlatformLayout layout ->
|
||||
layout.customize {
|
||||
def JAVA_RESOURCES_JAR = "java_resources_en.jar"
|
||||
withModule("java-analysis-api", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("java-indexing-api", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("java-psi-api", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("openapi", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("jsp-base-openapi", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("jsp-openapi", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("uast-common", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.java.analysis", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.java.indexing", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.java.psi", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.java", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.jsp.base", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.jsp", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.platform.uast", JAVA_API_JAR, JAVA_RESOURCES_JAR)
|
||||
|
||||
withModule("java-analysis-impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("java-indexing-impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("java-psi-impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("java-impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("jsp-spi", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("uast-java", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.java.analysis.impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.java.indexing.impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.java.psi.impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.java.impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.jsp.spi", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR)
|
||||
withModule("intellij.java.uast", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR)
|
||||
|
||||
withModule("java-runtime", "idea_rt.jar", null)
|
||||
withModule("intellij.java.rt", "idea_rt.jar", null)
|
||||
withArtifact("debugger-agent", "rt")
|
||||
withArtifact("debugger-agent-storage", "rt")
|
||||
withProjectLibrary("Eclipse")
|
||||
@@ -99,8 +99,8 @@ abstract class BaseIdeaProperties extends ProductProperties {
|
||||
}
|
||||
} as Consumer<PlatformLayout>
|
||||
|
||||
additionalModulesToCompile = ["jps-standalone-builder"]
|
||||
modulesToCompileTests = ["jps-builders"]
|
||||
additionalModulesToCompile = ["intellij.tools.jps.build.standalone"]
|
||||
modulesToCompileTests = ["intellij.platform.jps.build"]
|
||||
productLayout.buildAllCompatiblePlugins = true
|
||||
productLayout.prepareCustomPluginRepositoryForPublishedPlugins = SystemProperties.getBooleanProperty('intellij.build.prepare.plugin.repository', false)
|
||||
}
|
||||
|
||||
@@ -32,60 +32,60 @@ class CommunityStandaloneJpsBuilder {
|
||||
new LayoutBuilder(buildContext, false).layout(targetDir) {
|
||||
zip("standalone-jps-${buildNumber}.zip") {
|
||||
jar("util.jar") {
|
||||
module("annotations-common")
|
||||
module("annotations")
|
||||
module("util-rt")
|
||||
module("util")
|
||||
module("intellij.platform.annotations.common")
|
||||
module("intellij.platform.annotations.java5")
|
||||
module("intellij.platform.util.rt")
|
||||
module("intellij.platform.util")
|
||||
}
|
||||
|
||||
jar("jps-launcher.jar") {
|
||||
module("jps-launcher")
|
||||
module("intellij.platform.jps.build.launcher")
|
||||
}
|
||||
|
||||
jar("jps-model.jar") {
|
||||
module("jps-model-api")
|
||||
module("jps-model-impl")
|
||||
module("jps-model-serialization")
|
||||
module("intellij.platform.jps.model")
|
||||
module("intellij.platform.jps.model.impl")
|
||||
module("intellij.platform.jps.model.serialization")
|
||||
}
|
||||
jar("jps-builders.jar") {
|
||||
module("forms_rt")
|
||||
module("forms-compiler")
|
||||
module("instrumentation-util")
|
||||
module("instrumentation-util-8")
|
||||
module("javac-ref-scanner-8")
|
||||
module("jps-builders")
|
||||
module("jps-standalone-builder")
|
||||
module("intellij.java.guiForms.rt")
|
||||
module("intellij.java.guiForms.compiler")
|
||||
module("intellij.java.compiler.instrumentationUtil")
|
||||
module("intellij.java.compiler.instrumentationUtil.java8")
|
||||
module("intellij.java.jps.javacRefScanner8")
|
||||
module("intellij.platform.jps.build")
|
||||
module("intellij.tools.jps.build.standalone")
|
||||
}
|
||||
jar("idea_rt.jar") {
|
||||
module("java-runtime")
|
||||
module("intellij.java.rt")
|
||||
}
|
||||
jar("jps-builders-6.jar") {
|
||||
module("jps-builders-6")
|
||||
module("intellij.platform.jps.build.javac.rt")
|
||||
}
|
||||
//layout of groovy jars must be consistent with GroovyBuilder.getGroovyRtRoots method
|
||||
jar("groovy-jps-plugin.jar") {
|
||||
module("groovy-jps-plugin")
|
||||
module("intellij.groovy.jps")
|
||||
}
|
||||
jar("groovy_rt.jar") {
|
||||
module("groovy_rt")
|
||||
module("intellij.groovy.rt")
|
||||
}
|
||||
jar("groovy-rt-constants.jar") {
|
||||
module("groovy-rt-constants")
|
||||
module("intellij.groovy.constants.rt")
|
||||
}
|
||||
jar("ui-designer-jps-plugin.jar") { module("ui-designer-jps-plugin") }
|
||||
jar("ui-designer-jps-plugin.jar") { module("intellij.java.guiForms.jps") }
|
||||
|
||||
|
||||
jar("maven-jps-plugin.jar") { module("maven-jps-plugin") }
|
||||
jar("aether-dependency-resolver.jar") { module("aether-dependency-resolver") }
|
||||
jar("gradle-jps-plugin.jar") { module("gradle-jps-plugin") }
|
||||
moduleLibrary("maven-jps-plugin", "plexus-utils-2.0.6.jar")
|
||||
jar("maven-jps-plugin.jar") { module("intellij.maven.jps") }
|
||||
jar("aether-dependency-resolver.jar") { module("intellij.java.aetherDependencyResolver") }
|
||||
jar("gradle-jps-plugin.jar") { module("intellij.gradle.jps") }
|
||||
moduleLibrary("intellij.maven.jps", "plexus-utils-2.0.6.jar")
|
||||
|
||||
jar("eclipse-jps-plugin.jar") {
|
||||
module("common-eclipse-util")
|
||||
module("eclipse-jps-plugin")
|
||||
module("intellij.eclipse.common")
|
||||
module("intellij.eclipse.jps")
|
||||
}
|
||||
jar("devkit-jps-plugin.jar") { module("devkit-jps-plugin") }
|
||||
jar("intellilang-jps-plugin.jar") { module("intellilang-jps-plugin") }
|
||||
jar("devkit-jps-plugin.jar") { module("intellij.devkit.jps") }
|
||||
jar("intellilang-jps-plugin.jar") { module("intellij.java.langInjection.jps") }
|
||||
|
||||
[
|
||||
"JDOM", "jna", "OroMatcher", "Trove4j", "ASM", "NanoXML", "protobuf", "cli-parser", "Log4J", "jgoodies-forms", "Eclipse",
|
||||
@@ -93,17 +93,17 @@ class CommunityStandaloneJpsBuilder {
|
||||
].each {
|
||||
projectLibrary(it)
|
||||
}
|
||||
moduleLibrary("aether-dependency-resolver", "aether-1.1.0-all.jar")
|
||||
moduleLibrary("aether-dependency-resolver", "maven-aether-provider-3.3.9-all.jar")
|
||||
moduleLibrary("intellij.java.aetherDependencyResolver", "aether-1.1.0-all.jar")
|
||||
moduleLibrary("intellij.java.aetherDependencyResolver", "maven-aether-provider-3.3.9-all.jar")
|
||||
|
||||
moduleLibrary("jps-builders-6", "optimizedFileManager.jar")
|
||||
jar("ant-jps-plugin.jar") { module("ant-jps-plugin") }
|
||||
moduleLibrary("intellij.platform.jps.build.javac.rt", "optimizedFileManager.jar")
|
||||
jar("ant-jps-plugin.jar") { module("intellij.ant.jps") }
|
||||
include(additionalJars)
|
||||
}
|
||||
jar("jps-build-test-${buildNumber}.jar") {
|
||||
moduleTests("jps-builders")
|
||||
moduleTests("jps-model-tests")
|
||||
moduleTests("jps-serialization-tests")
|
||||
moduleTests("intellij.platform.jps.build")
|
||||
moduleTests("intellij.platform.jps.model.tests")
|
||||
moduleTests("intellij.platform.jps.model.serialization.tests")
|
||||
}
|
||||
}
|
||||
buildContext.notifyArtifactBuilt(targetDir)
|
||||
|
||||
@@ -29,7 +29,7 @@ class IdeaCommunityBuilder {
|
||||
}
|
||||
|
||||
void compileModules() {
|
||||
BuildTasks.create(buildContext).compileProjectAndTests(["jps-builders"])
|
||||
BuildTasks.create(buildContext).compileProjectAndTests(["intellij.platform.jps.build"])
|
||||
}
|
||||
|
||||
void buildIntelliJCore() {
|
||||
|
||||
@@ -28,17 +28,17 @@ class IdeaCommunityProperties extends BaseIdeaProperties {
|
||||
baseFileName = "idea"
|
||||
platformPrefix = "Idea"
|
||||
productCode = "IC"
|
||||
applicationInfoModule = "community-resources"
|
||||
applicationInfoModule = "intellij.ideaCommunity.resources"
|
||||
additionalIDEPropertiesFilePaths = ["$home/build/conf/ideaCE.properties".toString()]
|
||||
toolsJarRequired = true
|
||||
buildCrossPlatformDistribution = true
|
||||
|
||||
productLayout.productApiModules = JAVA_API_MODULES
|
||||
productLayout.productImplementationModules = JAVA_IMPLEMENTATION_MODULES +
|
||||
["duplicates-analysis", "structuralsearch", "structuralsearch-java", "typeMigration", "platform-main"]
|
||||
productLayout.additionalPlatformJars.put("resources.jar", "community-resources")
|
||||
["intellij.platform.duplicates.analysis", "intellij.platform.structuralSearch", "intellij.java.structuralSearch", "intellij.java.typeMigration", "intellij.platform.main"]
|
||||
productLayout.additionalPlatformJars.put("resources.jar", "intellij.ideaCommunity.resources")
|
||||
productLayout.bundledPluginModules = BUNDLED_PLUGIN_MODULES
|
||||
productLayout.mainModules = ["community-main"]
|
||||
productLayout.mainModules = ["intellij.ideaCommunity.main"]
|
||||
productLayout.compatiblePluginsToIgnore = PythonCommunityPluginModules.PYCHARM_ONLY_PLUGIN_MODULES
|
||||
productLayout.allNonTrivialPlugins = CommunityRepositoryModules.COMMUNITY_REPOSITORY_PLUGINS + [
|
||||
CommunityRepositoryModules.androidPlugin([:]),
|
||||
|
||||
@@ -23,39 +23,39 @@ import org.jetbrains.intellij.build.impl.LayoutBuilder
|
||||
*/
|
||||
class IntelliJCoreArtifactsBuilder {
|
||||
private static final List<String> ANALYSIS_API_MODULES = [
|
||||
"analysis-api",
|
||||
"boot",
|
||||
"core-api",
|
||||
"duplicates-analysis",
|
||||
"editor-ui-api",
|
||||
"editor-ui-ex",
|
||||
"extensions",
|
||||
"indexing-api",
|
||||
"java-analysis-api",
|
||||
"java-indexing-api",
|
||||
"java-psi-api",
|
||||
"java-structure-view",
|
||||
"jps-model-api",
|
||||
"jps-model-serialization",
|
||||
"projectModel-api",
|
||||
"util",
|
||||
"util-rt",
|
||||
"xml-analysis-api",
|
||||
"xml-psi-api",
|
||||
"xml-structure-view-api",
|
||||
"intellij.platform.analysis",
|
||||
"intellij.platform.boot",
|
||||
"intellij.platform.core",
|
||||
"intellij.platform.duplicates.analysis",
|
||||
"intellij.platform.editor",
|
||||
"intellij.platform.editor.ex",
|
||||
"intellij.platform.extensions",
|
||||
"intellij.platform.indexing",
|
||||
"intellij.java.analysis",
|
||||
"intellij.java.indexing",
|
||||
"intellij.java.psi",
|
||||
"intellij.java.structureView",
|
||||
"intellij.platform.jps.model",
|
||||
"intellij.platform.jps.model.serialization",
|
||||
"intellij.platform.projectModel",
|
||||
"intellij.platform.util",
|
||||
"intellij.platform.util.rt",
|
||||
"intellij.xml.analysis",
|
||||
"intellij.xml.psi",
|
||||
"intellij.xml.structureView",
|
||||
]
|
||||
private static final List<String> ANALYSIS_IMPL_MODULES = [
|
||||
"analysis-impl",
|
||||
"core-impl",
|
||||
"indexing-impl",
|
||||
"java-analysis-impl",
|
||||
"java-indexing-impl",
|
||||
"java-psi-impl",
|
||||
"projectModel-impl",
|
||||
"structure-view-impl",
|
||||
"xml-analysis-impl",
|
||||
"xml-psi-impl",
|
||||
"xml-structure-view-impl",
|
||||
"intellij.platform.analysis.impl",
|
||||
"intellij.platform.core.impl",
|
||||
"intellij.platform.indexing.impl",
|
||||
"intellij.java.analysis.impl",
|
||||
"intellij.java.indexing.impl",
|
||||
"intellij.java.psi.impl",
|
||||
"intellij.platform.projectModel.impl",
|
||||
"intellij.platform.structureView.impl",
|
||||
"intellij.xml.analysis.impl",
|
||||
"intellij.xml.psi.impl",
|
||||
"intellij.xml.structureView.impl",
|
||||
]
|
||||
private final BuildContext buildContext
|
||||
|
||||
@@ -76,18 +76,18 @@ class IntelliJCoreArtifactsBuilder {
|
||||
List<String> analysisModules = ANALYSIS_API_MODULES + ANALYSIS_IMPL_MODULES
|
||||
new LayoutBuilder(buildContext, false).layout(coreArtifactDir) {
|
||||
jar("intellij-core.jar") {
|
||||
module("util-rt")
|
||||
module("util")
|
||||
module("core-api")
|
||||
module("core-impl")
|
||||
module("extensions")
|
||||
module("java-psi-api")
|
||||
module("java-psi-impl")
|
||||
module("intellij.platform.util.rt")
|
||||
module("intellij.platform.util")
|
||||
module("intellij.platform.core")
|
||||
module("intellij.platform.core.impl")
|
||||
module("intellij.platform.extensions")
|
||||
module("intellij.java.psi")
|
||||
module("intellij.java.psi.impl")
|
||||
}
|
||||
|
||||
jar("annotations.jar") {
|
||||
module("annotations-common")
|
||||
module("annotations")
|
||||
module("intellij.platform.annotations.common")
|
||||
module("intellij.platform.annotations.java5")
|
||||
}
|
||||
|
||||
jar("intellij-core-analysis.jar") {
|
||||
|
||||
@@ -25,5 +25,5 @@ target("default": "Run tests") {
|
||||
String home = IdeaProjectLoader.guessHome(this)
|
||||
String outputDir = "$home/out/tests"
|
||||
def context = CompilationContextImpl.create(home, home, outputDir)
|
||||
TestingTasks.create(context).runTests([], "community-main", null)
|
||||
TestingTasks.create(context).runTests([], "intellij.ideaCommunity.main", null)
|
||||
}
|
||||
|
||||
+18
-18
@@ -86,7 +86,7 @@ class CommunityLibraryLicenses {
|
||||
new LibraryLicense(name: "classworlds", libraryName: "classworlds-1.1.jar", version: "1.1", license: "codehaus",
|
||||
url: "https://github.com/codehaus/classworlds",
|
||||
licenseUrl: "https://github.com/codehaus/classworlds/blob/master/classworlds/LICENSE.txt"),
|
||||
new LibraryLicense(name: "coverage.py", attachedTo: "python-helpers", version: "3.7.1", license: "Apache 2.0",
|
||||
new LibraryLicense(name: "coverage.py", attachedTo: "intellij.python.helpers", version: "3.7.1", license: "Apache 2.0",
|
||||
url: "http://coverage.readthedocs.org/"),
|
||||
new LibraryLicense(name: "Cucumber-Core", libraryName: "cucumber-core", version: "1.2.4", license: "MIT License",
|
||||
url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html"),
|
||||
@@ -97,10 +97,10 @@ class CommunityLibraryLicenses {
|
||||
new LibraryLicense(name: "data-binding", libraryName: "data-binding.jar", license: "Apache 2.0", url: "http://source.android.com/"),
|
||||
new LibraryLicense(name: "Diffutils", libraryName: "Diffutils", version: "1.2.1", license: "The Apache Software License, Version 2.0",
|
||||
url: "https://code.google.com/archive/p/java-diff-utils/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
|
||||
new LibraryLicense(name: "docutils", attachedTo: "python-helpers", version: "0.8", license: "BSD", url: "http://docutils.sourceforge.net/"),
|
||||
new LibraryLicense(name: "Dart Analysis Server", attachedTo: "Dart", license: "Eclipse Public License v1.0",
|
||||
new LibraryLicense(name: "docutils", attachedTo: "intellij.python.helpers", version: "0.8", license: "BSD", url: "http://docutils.sourceforge.net/"),
|
||||
new LibraryLicense(name: "Dart Analysis Server", attachedTo: "intellij.dart", license: "Eclipse Public License v1.0",
|
||||
licenseUrl: "http://www.eclipse.org/legal/epl-v10.html", url: "https://github.com/dart-lang/eclipse3"),
|
||||
new LibraryLicense(name: "Dart VM Service drivers", attachedTo: "Dart", license: "BSD",
|
||||
new LibraryLicense(name: "Dart VM Service drivers", attachedTo: "intellij.dart", license: "BSD",
|
||||
licenseUrl: "https://github.com/dart-lang/vm_service_drivers/blob/master/LICENSE",
|
||||
url: "https://github.com/dart-lang/vm_service_drivers"),
|
||||
new LibraryLicense(name: "DTDParser", version: "1.13", license: "LGPL", url: "http://sourceforge.net/projects/dtdparser/",
|
||||
@@ -110,13 +110,13 @@ class CommunityLibraryLicenses {
|
||||
new LibraryLicense(name: "EditorConfig Java Core", libraryName: "editorconfig-core-java.jar", version: "1.0", license: "Apache 2.0",
|
||||
url: "https://github.com/editorconfig/editorconfig-core-java/",
|
||||
licenseUrl: "https://github.com/editorconfig/editorconfig-core-java/blob/master/LICENSE"),
|
||||
new LibraryLicense(name: "epydoc", attachedTo: "python-helpers", version: "3.0.1", license: "MIT", url: "http://epydoc.sourceforge.net/"),
|
||||
new LibraryLicense(name: "epydoc", attachedTo: "intellij.python.helpers", version: "3.0.1", license: "MIT", url: "http://epydoc.sourceforge.net/"),
|
||||
new LibraryLicense(name: "Fest", libraryName: "fest", version: "", license: "Apache 2.0",
|
||||
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://code.google.com/p/fest/"),
|
||||
new LibraryLicense(name: "fest-swing", libraryName: "fest-swing", version: "", license: "Apache 2.0",
|
||||
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://github.com/JetBrains/intellij-deps-swing-testing"),
|
||||
new LibraryLicense(name: "FiraCode", attachedTo: "platform-resources", version: "1.200", license: "OFL", url: "https://github.com/tonsky/FiraCode/blob/master/LICENSE"),
|
||||
new LibraryLicense(name: "FreeMarker", attachedTo: "coverage", version: "2.3.15", license: "BSD", url: "http://freemarker.sourceforge.net/"),
|
||||
new LibraryLicense(name: "FiraCode", attachedTo: "intellij.platform.resources", version: "1.200", license: "OFL", url: "https://github.com/tonsky/FiraCode/blob/master/LICENSE"),
|
||||
new LibraryLicense(name: "FreeMarker", attachedTo: "intellij.java.coverage", version: "2.3.15", license: "BSD", url: "http://freemarker.sourceforge.net/"),
|
||||
new LibraryLicense(name: "FreeMarker", libraryName: "freemarker-2.3.20", version: "2.3.20", license: "BSD",
|
||||
url: "http://freemarker.sourceforge.net/"),
|
||||
new LibraryLicense(name: "fxg-utils", libraryName: "fxg-utils", version: "4.9.1", license: "Apache 2.0", url: "http://flex.apache.org",
|
||||
@@ -147,7 +147,7 @@ class CommunityLibraryLicenses {
|
||||
url: "http://xerces.apache.org/xml-commons/components/external"),
|
||||
new LibraryLicense(name: "ImageIO", libraryName: "imageio-tiff", version: "3.2.1", license: "BSD",
|
||||
url: "https://github.com/haraldk/TwelveMonkeys", licenseUrl: "https://github.com/haraldk/TwelveMonkeys#license"),
|
||||
new LibraryLicense(name: "Inconsolata", attachedTo: "platform-resources", version: "001.010", license: "OFL", url: "https://github.com/google/fonts/blob/master/ofl/inconsolata/OFL.txt"),
|
||||
new LibraryLicense(name: "Inconsolata", attachedTo: "intellij.platform.resources", version: "001.010", license: "OFL", url: "https://github.com/google/fonts/blob/master/ofl/inconsolata/OFL.txt"),
|
||||
new LibraryLicense(name: "ini4j (JetBrains's fork)", libraryName: "ini4j", version: "0.5.5-1", license: "Apache 2.0",
|
||||
url: "https://github.com/JetBrains/intellij-deps-ini4j"),
|
||||
new LibraryLicense(name: "ISO RELAX", libraryName: "isorelax.jar", license: "MIT License",
|
||||
@@ -157,7 +157,7 @@ class CommunityLibraryLicenses {
|
||||
new LibraryLicense(name: "Java-WebSocket", libraryName: "java_websocket.jar", version: "1.4.0 Trunk", license: "MIT",
|
||||
url: "https://github.com/TooTallNate/Java-WebSocket",
|
||||
licenseUrl: "https://github.com/TooTallNate/Java-WebSocket/blob/master/LICENSE"),
|
||||
new LibraryLicense(name: "JavaCVS", attachedTo: "javacvs-src", version: "no version number available (with patches by JetBrains)",
|
||||
new LibraryLicense(name: "JavaCVS", attachedTo: "intellij.vcs.cvs.javacvs", version: "no version number available (with patches by JetBrains)",
|
||||
license: "Sun Public License", url: "https://versioncontrol.netbeans.org/javacvs/library/",
|
||||
licenseUrl: "https://netbeans.org/about/legal/license.html"),
|
||||
new LibraryLicense(name: "JavaHelp", version: "2.0_02", license: "included as license/javahelp_license.html in IntelliJ IDEA distribution",
|
||||
@@ -226,7 +226,7 @@ class CommunityLibraryLicenses {
|
||||
licenseUrl: "https://github.com/lz4/lz4-java/blob/master/LICENSE.txt"),
|
||||
new LibraryLicense(name: "markdown4j", libraryName: "markdown4j-2.2", version: "2.2", license: "New BSD",
|
||||
url: "https://code.google.com/p/markdown4j/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause"),
|
||||
new LibraryLicense(name: "markdownj", attachedTo: "tasks-core", version: "", license: "BSD", url: "https://github.com/myabc/markdownj",
|
||||
new LibraryLicense(name: "markdownj", attachedTo: "intellij.tasks.core", version: "", license: "BSD", url: "https://github.com/myabc/markdownj",
|
||||
licenseUrl: "http://www.opensource.org/licenses/bsd-license.php"),
|
||||
new LibraryLicense(name: "markdownj", libraryName: "markdownj", version: "0.4.2", license: "New BSD",
|
||||
url: "https://github.com/myabc/markdownj", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause"),
|
||||
@@ -244,7 +244,7 @@ class CommunityLibraryLicenses {
|
||||
libraryName: "Maven3", additionalLibraryNames: ["maven-dependency-tree-1.2.jar", "archetype-catalog-2.2.jar", "archetype-common-2.2.jar"],
|
||||
version: "3.0.5", license: "Apache 2.0", url: "http://maven.apache.org/",
|
||||
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
|
||||
new LibraryLicense(name: "mercurial_prompthooks", attachedTo: "hg4idea", version: "",
|
||||
new LibraryLicense(name: "mercurial_prompthooks", attachedTo: "intellij.vcs.hg", version: "",
|
||||
license: "GPLv2 (used as hg extension called from hg executable)",
|
||||
url: "https://github.com/willemv/mercurial_prompthooks",
|
||||
licenseUrl: "https://github.com/willemv/mercurial_prompthooks/blob/master/LICENSE.txt"),
|
||||
@@ -265,7 +265,7 @@ class CommunityLibraryLicenses {
|
||||
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
|
||||
new LibraryLicense(name: "Objenesis", libraryName: "objenesis-1.2.jar", version: "1.2", license: "Apache 2.0", url: "http://objenesis.org/",
|
||||
licenseUrl: "http://apache.org/licenses/LICENSE-2.0"),
|
||||
new LibraryLicense(name: "pycodestyle.py", attachedTo: "python-helpers", version: "2.3.1", license: "MIT", url: "http://pycodestyle.readthedocs.io/"),
|
||||
new LibraryLicense(name: "pycodestyle.py", attachedTo: "intellij.python.helpers", version: "2.3.1", license: "MIT", url: "http://pycodestyle.readthedocs.io/"),
|
||||
new LibraryLicense(name: "PicoContainer", libraryName: "picocontainer", version: "1.2", license: "BSD",
|
||||
url: "https://github.com/codehaus/picocontainer", licenseUrl: "https://opensource.org/licenses/bsd-license.php"),
|
||||
new LibraryLicense(name: "plexus-archiver", libraryName: "plexus-archiver-2.4.4.jar", version: "2.4.4", license: "Apache 2.0",
|
||||
@@ -282,7 +282,7 @@ class CommunityLibraryLicenses {
|
||||
libraryName: 'maven-aether-provider-3.3.9-all.jar', licenseUrl: "http://apache.org/licenses/LICENSE-2.0"),
|
||||
new LibraryLicense(name: "Plexus Utils", libraryName: "plexus-utils-1.5.5.jar", version: "1.5.5", license: "Apache 2.0",
|
||||
url: "http://plexus.codehaus.org/plexus-utils"),
|
||||
new LibraryLicense(name: "pockets", attachedTo: "python-helpers", version: "0.3.2", license: "BSD", url: "http://pockets.readthedocs.org/"),
|
||||
new LibraryLicense(name: "pockets", attachedTo: "intellij.python.helpers", version: "0.3.2", license: "BSD", url: "http://pockets.readthedocs.org/"),
|
||||
new LibraryLicense(name: "protobuf", version: "2.5.0", license: "New BSD", url: "http://code.google.com/p/protobuf/",
|
||||
licenseUrl: "https://github.com/google/protobuf/blob/master/LICENSE"),
|
||||
new LibraryLicense(name: "Proxy Vole", libraryName: "proxy-vole", version: "1.0.3", license: "Apache 2.0",
|
||||
@@ -297,17 +297,17 @@ class CommunityLibraryLicenses {
|
||||
url: "http://java.net/projects/rngom/", licenseUrl: "http://www.opensource.org/licenses/mit-license.php"),
|
||||
new LibraryLicense(name: "Rhino JavaScript Engine", libraryName: "rhino-js-1_7R4", version: "1.7R4", license: "MPL 1.1",
|
||||
url: "http://www.mozilla.org/rhino/", licenseUrl: "http://www.mozilla.org/MPL/MPL-1.1.html"),
|
||||
new LibraryLicense(name: "RMI Stubs", attachedTo: "xslt-debugger-engine", license: "Apache 2.0",
|
||||
new LibraryLicense(name: "RMI Stubs", attachedTo: "intellij.xslt.debugger.engine", license: "Apache 2.0",
|
||||
url: "https://confluence.jetbrains.com/display/CONTEST/XSLT-Debugger",
|
||||
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
|
||||
new LibraryLicense(name: "Roboto", attachedTo: "platform-resources", version: "1.100141", license: "Apache 2.0", url: "https://github.com/google/roboto/blob/master/LICENSE"),
|
||||
new LibraryLicense(name: "Roboto", attachedTo: "intellij.platform.resources", version: "1.100141", license: "Apache 2.0", url: "https://github.com/google/roboto/blob/master/LICENSE"),
|
||||
new LibraryLicense(name: "Saxon-6.5.5", version: "6.5.5", license: "Mozilla Public License", url: "http://saxon.sourceforge.net/",
|
||||
licenseUrl: "http://www.mozilla.org/MPL/"),
|
||||
new LibraryLicense(name: "Saxon-9HE", version: "9", license: "Mozilla Public License", url: "http://saxon.sourceforge.net/",
|
||||
licenseUrl: "http://www.mozilla.org/MPL/"),
|
||||
new LibraryLicense(name: "SceneBuilderKit", version: "8.2.0", license: "BSD", url: "http://gluonhq.com/open-source/scene-builder/",
|
||||
licenseUrl: "http://www.oracle.com/technetwork/licenses/bsd-license-1835287.html"),
|
||||
new LibraryLicense(name: "six.py", attachedTo: "python-helpers", version: "1.9.0", license: "MIT", url: "http://pythonhosted.org/six/"),
|
||||
new LibraryLicense(name: "six.py", attachedTo: "intellij.python.helpers", version: "1.9.0", license: "MIT", url: "http://pythonhosted.org/six/"),
|
||||
new LibraryLicense(name: "Slf4j", version: "1.7.10", license: "MIT License", url: "http://slf4j.org/",
|
||||
licenseUrl: "http://slf4j.org/license.html"),
|
||||
new LibraryLicense(name: "SnakeYAML", libraryName: "snakeyaml", version: "1.17", license: "Apache 2.0",
|
||||
@@ -325,11 +325,11 @@ class CommunityLibraryLicenses {
|
||||
new LibraryLicense(name: "Sonatype Nexus: Indexer", libraryName: "nexus-indexer-3.0.4.jar", version: "3.0.4",
|
||||
license: "Eclipse Public License v1.0", url: "http://nexus.sonatype.org/",
|
||||
licenseUrl: "http://www.eclipse.org/org/documents/epl-v10.html"),
|
||||
new LibraryLicense(name: "SourceCodePro", attachedTo: "platform-resources", version: "2.010", license: "OFL", url: "https://github.com/adobe-fonts/source-code-pro/blob/master/LICENSE.txt"),
|
||||
new LibraryLicense(name: "SourceCodePro", attachedTo: "intellij.platform.resources", version: "2.010", license: "OFL", url: "https://github.com/adobe-fonts/source-code-pro/blob/master/LICENSE.txt"),
|
||||
new LibraryLicense(name: "Spantable", libraryName: "spantable.jar", version: "patched", license: "LGPL 2.1",
|
||||
licenseUrl: "http://www.gnu.org/licenses/lgpl.html",
|
||||
url: "https://android.googlesource.com/platform/prebuilts/tools/+/master/common/spantable/"),
|
||||
new LibraryLicense(name: "sphinxcontrib-napoleon", attachedTo: "python-helpers", version: "0.3.11", license: "BSD",
|
||||
new LibraryLicense(name: "sphinxcontrib-napoleon", attachedTo: "intellij.python.helpers", version: "0.3.11", license: "BSD",
|
||||
url: "http://sphinxcontrib-napoleon.readthedocs.org/"),
|
||||
new LibraryLicense(name: "StreamEx", version: "0.6.2", libraryName: "StreamEx", license: "Apache 2.0",
|
||||
url: "https://github.com/amaembo/streamex", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0"),
|
||||
|
||||
+207
-207
@@ -13,146 +13,146 @@ import static org.jetbrains.intellij.build.impl.PluginLayout.plugin
|
||||
@CompileStatic
|
||||
class CommunityRepositoryModules {
|
||||
static List<String> PLATFORM_API_MODULES = [
|
||||
"analysis-api",
|
||||
"built-in-server-api",
|
||||
"core-api",
|
||||
"diff-api",
|
||||
"dvcs-api",
|
||||
"editor-ui-api",
|
||||
"external-system-api",
|
||||
"indexing-api",
|
||||
"jps-model-api",
|
||||
"lang-api",
|
||||
"lvcs-api",
|
||||
"platform-api",
|
||||
"projectModel-api",
|
||||
"remote-servers-agent-rt",
|
||||
"remote-servers-api",
|
||||
"tasks-platform-api",
|
||||
"usageView",
|
||||
"vcs-api-core",
|
||||
"vcs-api",
|
||||
"vcs-log-api",
|
||||
"vcs-log-graph-api",
|
||||
"xdebugger-api",
|
||||
"xml-analysis-api",
|
||||
"xml-openapi",
|
||||
"xml-psi-api",
|
||||
"xml-structure-view-api",
|
||||
"intellij.platform.analysis",
|
||||
"intellij.platform.builtInServer",
|
||||
"intellij.platform.core",
|
||||
"intellij.platform.diff",
|
||||
"intellij.platform.vcs.dvcs",
|
||||
"intellij.platform.editor",
|
||||
"intellij.platform.externalSystem",
|
||||
"intellij.platform.indexing",
|
||||
"intellij.platform.jps.model",
|
||||
"intellij.platform.lang",
|
||||
"intellij.platform.lvcs",
|
||||
"intellij.platform.ide",
|
||||
"intellij.platform.projectModel",
|
||||
"intellij.platform.remoteServers.agent.rt",
|
||||
"intellij.platform.remoteServers",
|
||||
"intellij.platform.tasks",
|
||||
"intellij.platform.usageView",
|
||||
"intellij.platform.vcs.core",
|
||||
"intellij.platform.vcs",
|
||||
"intellij.platform.vcs.log",
|
||||
"intellij.platform.vcs.log.graph",
|
||||
"intellij.platform.debugger",
|
||||
"intellij.xml.analysis",
|
||||
"intellij.xml",
|
||||
"intellij.xml.psi",
|
||||
"intellij.xml.structureView",
|
||||
]
|
||||
|
||||
static List<String> PLATFORM_IMPLEMENTATION_MODULES = [
|
||||
"analysis-impl",
|
||||
"built-in-server",
|
||||
"core-impl",
|
||||
"credential-store",
|
||||
"diff-impl",
|
||||
"dvcs-impl",
|
||||
"editor-ui-ex",
|
||||
"images",
|
||||
"indexing-impl",
|
||||
"json",
|
||||
"lang-impl",
|
||||
"lvcs-impl",
|
||||
"platform-impl",
|
||||
"projectModel-impl",
|
||||
"protocol-reader-runtime",
|
||||
"RegExpSupport",
|
||||
"relaxng",
|
||||
"remote-servers-impl",
|
||||
"script-debugger-backend",
|
||||
"script-debugger-ui",
|
||||
"smRunner",
|
||||
"spellchecker",
|
||||
"structure-view-impl",
|
||||
"tasks-platform-impl",
|
||||
"testRunner",
|
||||
"vcs-impl",
|
||||
"vcs-log-graph",
|
||||
"vcs-log-impl",
|
||||
"xdebugger-impl",
|
||||
"xml-analysis-impl",
|
||||
"xml-psi-impl",
|
||||
"xml-structure-view-impl",
|
||||
"xml",
|
||||
"configuration-store-impl",
|
||||
"intellij.platform.analysis.impl",
|
||||
"intellij.platform.builtInServer.impl",
|
||||
"intellij.platform.core.impl",
|
||||
"intellij.platform.credentialStore",
|
||||
"intellij.platform.diff.impl",
|
||||
"intellij.platform.vcs.dvcs.impl",
|
||||
"intellij.platform.editor.ex",
|
||||
"intellij.platform.images",
|
||||
"intellij.platform.indexing.impl",
|
||||
"intellij.json",
|
||||
"intellij.platform.lang.impl",
|
||||
"intellij.platform.lvcs.impl",
|
||||
"intellij.platform.ide.impl",
|
||||
"intellij.platform.projectModel.impl",
|
||||
"intellij.platform.scriptDebugger.protocolReaderRuntime",
|
||||
"intellij.regexp",
|
||||
"intellij.relaxng",
|
||||
"intellij.platform.remoteServers.impl",
|
||||
"intellij.platform.scriptDebugger.backend",
|
||||
"intellij.platform.scriptDebugger.ui",
|
||||
"intellij.platform.smRunner",
|
||||
"intellij.spellchecker",
|
||||
"intellij.platform.structureView.impl",
|
||||
"intellij.platform.tasks.impl",
|
||||
"intellij.platform.testRunner",
|
||||
"intellij.platform.vcs.impl",
|
||||
"intellij.platform.vcs.log.graph.impl",
|
||||
"intellij.platform.vcs.log.impl",
|
||||
"intellij.platform.debugger.impl",
|
||||
"intellij.xml.analysis.impl",
|
||||
"intellij.xml.psi.impl",
|
||||
"intellij.xml.structureView.impl",
|
||||
"intellij.xml.impl",
|
||||
"intellij.platform.configurationStore.impl",
|
||||
]
|
||||
|
||||
/**
|
||||
* Specifies non-trivial layout for all plugins which sources are located in 'community' and 'contrib' repositories
|
||||
*/
|
||||
static List<PluginLayout> COMMUNITY_REPOSITORY_PLUGINS = [
|
||||
plugin("ant") {
|
||||
plugin("intellij.ant") {
|
||||
mainJarName = "antIntegration.jar"
|
||||
withModule("ant-jps-plugin")
|
||||
withModule("intellij.ant.jps")
|
||||
},
|
||||
plugin("ui-designer") {
|
||||
plugin("intellij.java.guiForms.designer") {
|
||||
directoryName = "uiDesigner"
|
||||
mainJarName = "uiDesigner.jar"
|
||||
withJpsModule("ui-designer-jps-plugin")
|
||||
withModule("intellij.java.guiForms.jps", "jps/ui-designer-jps-plugin.jar")
|
||||
},
|
||||
plugin("properties") {
|
||||
withModule("properties-psi-api", "properties.jar")
|
||||
withModule("properties-psi-impl", "properties.jar")
|
||||
plugin("intellij.properties") {
|
||||
withModule("intellij.properties.psi", "properties.jar")
|
||||
withModule("intellij.properties.psi.impl", "properties.jar")
|
||||
},
|
||||
plugin("git4idea") {
|
||||
withModule("git4idea-rt", "git4idea-rt.jar", null)
|
||||
withOptionalModule("remote-servers-git")
|
||||
withOptionalModule("remote-servers-git-java", "remote-servers-git.jar")
|
||||
plugin("intellij.vcs.git") {
|
||||
withModule("intellij.vcs.git.rt", "git4idea-rt.jar", null)
|
||||
withOptionalModule("intellij.platform.remoteServers.git")
|
||||
withOptionalModule("intellij.java.remoteServers.git", "remote-servers-git.jar")
|
||||
},
|
||||
plugin("cvs-plugin") {
|
||||
plugin("intellij.vcs.cvs") {
|
||||
directoryName = "cvsIntegration"
|
||||
mainJarName = "cvsIntegration.jar"
|
||||
withModule("javacvs-src")
|
||||
withModule("smartcvs-src")
|
||||
withModule("cvs-core", "cvs_util.jar")
|
||||
withModule("intellij.vcs.cvs.javacvs")
|
||||
withModule("intellij.vcs.cvs.smartcvs")
|
||||
withModule("intellij.vcs.cvs.core", "cvs_util.jar")
|
||||
},
|
||||
plugin("xpath") {
|
||||
withModule("xslt-rt", "rt/xslt-rt.jar")
|
||||
plugin("intellij.xpath") {
|
||||
withModule("intellij.xslt.debugger.rt", "rt/xslt-rt.jar")
|
||||
},
|
||||
plugin("IntelliLang") {
|
||||
withOptionalModule("IntelliLang-java", "IntelliLang.jar")
|
||||
withOptionalModule("IntelliLang-xml", "IntelliLang.jar")
|
||||
withOptionalModule("intellilang-jps-plugin", "intellilang-jps-plugin.jar")
|
||||
plugin("intellij.platform.langInjection") {
|
||||
withOptionalModule("intellij.java.langInjection", "IntelliLang.jar")
|
||||
withOptionalModule("intellij.xml.langInjection", "IntelliLang.jar")
|
||||
withOptionalModule("intellij.java.langInjection.jps", "intellilang-jps-plugin.jar")
|
||||
doNotCreateSeparateJarForLocalizableResources()
|
||||
},
|
||||
plugin("tasks-core") {
|
||||
plugin("intellij.tasks.core") {
|
||||
directoryName = "tasks"
|
||||
withModule("tasks-api")
|
||||
withModule("jira")
|
||||
withOptionalModule("tasks-java")
|
||||
withModule("intellij.tasks")
|
||||
withModule("intellij.tasks.jira")
|
||||
withOptionalModule("intellij.tasks.java")
|
||||
doNotCreateSeparateJarForLocalizableResources()
|
||||
},
|
||||
plugin("xslt-debugger") {
|
||||
withModule("xslt-debugger-engine")
|
||||
withModule("xslt-debugger-engine-impl", "rt/xslt-debugger-engine-impl.jar")
|
||||
withModuleLibrary("Saxon-6.5.5", "xslt-debugger-engine-impl", "rt")
|
||||
withModuleLibrary("Saxon-9HE", "xslt-debugger-engine-impl", "rt")
|
||||
withModuleLibrary("Xalan-2.7.1", "xslt-debugger-engine-impl", "rt")
|
||||
plugin("intellij.xslt.debugger") {
|
||||
withModule("intellij.xslt.debugger.engine")
|
||||
withModule("intellij.xslt.debugger.engine.impl", "rt/xslt-debugger-engine-impl.jar")
|
||||
withModuleLibrary("Saxon-6.5.5", "intellij.xslt.debugger.engine.impl", "rt")
|
||||
withModuleLibrary("Saxon-9HE", "intellij.xslt.debugger.engine.impl", "rt")
|
||||
withModuleLibrary("Xalan-2.7.1", "intellij.xslt.debugger.engine.impl", "rt")
|
||||
//todo[nik] unmark 'lib' directory as source root instead
|
||||
excludeFromModule("xslt-debugger-engine-impl", "rmi-stubs.jar")
|
||||
excludeFromModule("xslt-debugger-engine-impl", "saxon.jar")
|
||||
excludeFromModule("xslt-debugger-engine-impl", "saxon9he.jar")
|
||||
excludeFromModule("xslt-debugger-engine-impl", "serializer.jar")
|
||||
excludeFromModule("xslt-debugger-engine-impl", "xalan.jar")
|
||||
excludeFromModule("intellij.xslt.debugger.engine.impl", "rmi-stubs.jar")
|
||||
excludeFromModule("intellij.xslt.debugger.engine.impl", "saxon.jar")
|
||||
excludeFromModule("intellij.xslt.debugger.engine.impl", "saxon9he.jar")
|
||||
excludeFromModule("intellij.xslt.debugger.engine.impl", "serializer.jar")
|
||||
excludeFromModule("intellij.xslt.debugger.engine.impl", "xalan.jar")
|
||||
},
|
||||
plugin("maven") {
|
||||
withModule("maven-jps-plugin")
|
||||
withModule("maven-server-api")
|
||||
withModule("maven2-server-impl")
|
||||
withModule("maven3-server-common")
|
||||
withModule("maven30-server-impl")
|
||||
withModule("maven3-server-impl")
|
||||
withModule("maven-artifact-resolver-m2", "artifact-resolver-m2.jar")
|
||||
withModule("maven-artifact-resolver-common", "artifact-resolver-m2.jar")
|
||||
withModule("maven-artifact-resolver-m3", "artifact-resolver-m3.jar")
|
||||
withModule("maven-artifact-resolver-common", "artifact-resolver-m3.jar")
|
||||
withModule("maven-artifact-resolver-m31", "artifact-resolver-m31.jar")
|
||||
withModule("maven-artifact-resolver-common", "artifact-resolver-m31.jar")
|
||||
plugin("intellij.maven") {
|
||||
withModule("intellij.maven.jps")
|
||||
withModule("intellij.maven.server")
|
||||
withModule("intellij.maven.server.m2.impl")
|
||||
withModule("intellij.maven.server.m3.common")
|
||||
withModule("intellij.maven.server.m30.impl")
|
||||
withModule("intellij.maven.server.m3.impl")
|
||||
withModule("intellij.maven.artifactResolver.m2", "artifact-resolver-m2.jar")
|
||||
withModule("intellij.maven.artifactResolver.common", "artifact-resolver-m2.jar")
|
||||
withModule("intellij.maven.artifactResolver.m3", "artifact-resolver-m3.jar")
|
||||
withModule("intellij.maven.artifactResolver.common", "artifact-resolver-m3.jar")
|
||||
withModule("intellij.maven.artifactResolver.m31", "artifact-resolver-m31.jar")
|
||||
withModule("intellij.maven.artifactResolver.common", "artifact-resolver-m31.jar")
|
||||
withResource("maven3-server-impl/lib/maven3", "lib/maven3")
|
||||
withResource("maven3-server-common/lib", "lib/maven3-server-lib")
|
||||
withResource("maven2-server-impl/lib/maven2", "lib/maven2")
|
||||
withModuleLibrary("JAXB", "maven2-server-impl", "maven2-server-lib")
|
||||
withModuleLibrary("JAXB", "intellij.maven.server.m2.impl", "maven2-server-lib")
|
||||
[
|
||||
"activation-1.1.jar",
|
||||
"archetype-common-2.0-alpha-4-SNAPSHOT.jar",
|
||||
@@ -163,116 +163,116 @@ class CommunityRepositoryModules {
|
||||
"plexus-utils-1.5.5.jar"
|
||||
].each {withResource("maven2-server-impl/lib/$it", "lib/maven2-server-lib")}
|
||||
doNotCopyModuleLibrariesAutomatically([
|
||||
"maven2-server-impl", "maven3-server-common", "maven3-server-impl", "maven30-server-impl",
|
||||
"maven-artifact-resolver-common", "maven-artifact-resolver-m2", "maven-artifact-resolver-m3", "maven-artifact-resolver-m31"
|
||||
"intellij.maven.server.m2.impl", "intellij.maven.server.m3.common", "intellij.maven.server.m3.impl", "intellij.maven.server.m30.impl",
|
||||
"intellij.maven.artifactResolver.common", "intellij.maven.artifactResolver.m2", "intellij.maven.artifactResolver.m3", "intellij.maven.artifactResolver.m31"
|
||||
])
|
||||
},
|
||||
plugin("gradle") {
|
||||
withModule("gradle-jps-plugin")
|
||||
withModule("gradle-tooling-extension-api")
|
||||
withModule("gradle-tooling-extension-impl")
|
||||
plugin("intellij.gradle") {
|
||||
withModule("intellij.gradle.jps")
|
||||
withModule("intellij.gradle.toolingExtension")
|
||||
withModule("intellij.gradle.toolingExtension.impl")
|
||||
withProjectLibrary("Kryo")
|
||||
withProjectLibrary("Gradle")
|
||||
},
|
||||
plugin("junit") {
|
||||
plugin("intellij.junit") {
|
||||
mainJarName = "idea-junit.jar"
|
||||
withModule("junit_rt", "junit-rt.jar")
|
||||
withModule("junit5_rt", "junit5-rt.jar")
|
||||
withModule("intellij.junit.rt", "junit-rt.jar")
|
||||
withModule("intellij.junit.v5.rt", "junit5-rt.jar")
|
||||
},
|
||||
plugin("ByteCodeViewer") {
|
||||
plugin("intellij.java.byteCodeViewer") {
|
||||
mainJarName = "byteCodeViewer.jar"
|
||||
},
|
||||
plugin("testng") {
|
||||
plugin("intellij.testng") {
|
||||
mainJarName = "testng-plugin.jar"
|
||||
withModule("testng_rt", mainJarName)
|
||||
withModule("intellij.testng.rt", mainJarName)
|
||||
withProjectLibrary("TestNG")
|
||||
},
|
||||
plugin("devkit") {
|
||||
withModule("devkit-jps-plugin")
|
||||
plugin("intellij.devkit") {
|
||||
withModule("intellij.devkit.jps")
|
||||
},
|
||||
plugin("eclipse") {
|
||||
withModule("eclipse-jps-plugin", "eclipse-jps-plugin.jar", null)
|
||||
withModule("common-eclipse-util")
|
||||
plugin("intellij.eclipse") {
|
||||
withModule("intellij.eclipse.jps", "eclipse-jps-plugin.jar", null)
|
||||
withModule("intellij.eclipse.common")
|
||||
},
|
||||
plugin("coverage") {
|
||||
withModule("coverage-common", mainJarName)
|
||||
withModule("coverage_rt")
|
||||
plugin("intellij.java.coverage") {
|
||||
withModule("intellij.platform.coverage", mainJarName)
|
||||
withModule("intellij.java.coverage.rt")
|
||||
withProjectLibrary("JaCoCo") //todo[nik] convert to module library
|
||||
},
|
||||
plugin("error-prone") {
|
||||
withModule("error-prone-jps-plugin", "jps/error-prone-jps-plugin.jar")
|
||||
plugin("intellij.errorProne") {
|
||||
withModule("intellij.errorProne.jps", "jps/error-prone-jps-plugin.jar")
|
||||
},
|
||||
plugin("java-decompiler-plugin") {
|
||||
plugin("intellij.java.decompiler") {
|
||||
directoryName = "java-decompiler"
|
||||
mainJarName = "java-decompiler.jar"
|
||||
withModule("java-decompiler-engine", mainJarName)
|
||||
withModule("intellij.java.decompiler.engine", mainJarName)
|
||||
doNotCreateSeparateJarForLocalizableResources()
|
||||
},
|
||||
javaFXPlugin("javaFX-CE"),
|
||||
plugin("terminal") {
|
||||
javaFXPlugin("intellij.javaFX.community"),
|
||||
plugin("intellij.terminal") {
|
||||
withResource("resources/.zshrc", "")
|
||||
withResource("resources/jediterm-bash.in", "")
|
||||
withResource("resources/fish/config.fish", "fish")
|
||||
},
|
||||
PythonCommunityPluginModules.pythonCommunityPluginLayout(),
|
||||
// required for android plugin
|
||||
plugin("smali") {
|
||||
withModule("smali")
|
||||
plugin("intellij.android.smali") {
|
||||
withModule("intellij.android.smali")
|
||||
}
|
||||
]
|
||||
|
||||
static PluginLayout androidPlugin(Map<String, String> additionalModulesToJars) {
|
||||
// the following is copied from https://android.googlesource.com/platform/tools/idea/+/studio-master-dev/build/groovy/org/jetbrains/intellij/build/AndroidStudioProperties.groovy
|
||||
plugin("android-plugin") {
|
||||
plugin("intellij.android.plugin") {
|
||||
directoryName = "android"
|
||||
mainJarName = "android.jar"
|
||||
withModule("android-common", "android-common.jar", false)
|
||||
withModule("build-common", "build-common.jar", false)
|
||||
withModule("android-rt", "android-rt.jar", false)
|
||||
withModule("intellij.android.common", "android-common.jar", false)
|
||||
withModule("intellij.android.buildCommon", "build-common.jar", false)
|
||||
withModule("intellij.android.rt", "android-rt.jar", false)
|
||||
|
||||
withModule("android", "android.jar", false)
|
||||
withModule("artwork")
|
||||
withModule("observable", "android.jar")
|
||||
withModule("observable-ui", "android.jar")
|
||||
withModule("flags", "android.jar")
|
||||
withModule("designer", "android.jar")
|
||||
withModule("sdk-updates", "android.jar")
|
||||
withModule("wizard", "android.jar")
|
||||
withModule("wizard-model", "android.jar")
|
||||
withModule("profilers-android", "android.jar")
|
||||
withModule("perfd-host", "android-profilers.jar")
|
||||
withModule("profilers", "android-profilers.jar")
|
||||
withModule("profilers-ui", "android-profilers.jar")
|
||||
withModule("adt-ui", "adt-ui.jar")
|
||||
withModule("adt-ui-model", "adt-ui.jar")
|
||||
withModule("repository")
|
||||
withModule("sherpa-ui", "constraint-layout.jar")
|
||||
withModule("sdklib", "sdklib.jar")
|
||||
withModule("sdk-common", "sdk-common.jar")
|
||||
withModule("layoutlib-api", "layoutlib-api.jar")
|
||||
withModule("layoutlib", "layoutlib-loader.jar")
|
||||
withModule("manifest-merger", "manifest-merger.jar")
|
||||
withModule("chunkio", "pixelprobe.jar")
|
||||
withModule("pixelprobe", "pixelprobe.jar")
|
||||
withModule("intellij.android", "android.jar", false)
|
||||
withModule("intellij.android.artwork")
|
||||
withModule("intellij.android.observable", "android.jar")
|
||||
withModule("intellij.android.observable.ui", "android.jar")
|
||||
withModule("intellij.android.flags", "android.jar")
|
||||
withModule("intellij.android.designer", "android.jar")
|
||||
withModule("intellij.android.sdkUpdates", "android.jar")
|
||||
withModule("intellij.android.wizard", "android.jar")
|
||||
withModule("intellij.android.wizard.model", "android.jar")
|
||||
withModule("intellij.android.profilersAndroid", "android.jar")
|
||||
withModule("intellij.android.perfdHost", "android-profilers.jar")
|
||||
withModule("intellij.android.profilers", "android-profilers.jar")
|
||||
withModule("intellij.android.profilers.ui", "android-profilers.jar")
|
||||
withModule("intellij.android.adt.ui", "adt-ui.jar")
|
||||
withModule("intellij.android.adt.ui.model", "adt-ui.jar")
|
||||
withModule("android.sdktools.repository")
|
||||
withModule("intellij.android.sherpaUi", "constraint-layout.jar")
|
||||
withModule("android.sdktools.sdklib", "sdklib.jar")
|
||||
withModule("android.sdktools.sdk-common", "sdk-common.jar")
|
||||
withModule("android.sdktools.layoutlib-api", "layoutlib-api.jar")
|
||||
withModule("android.sdktools.layoutlib", "layoutlib-loader.jar")
|
||||
withModule("android.sdktools.manifest-merger", "manifest-merger.jar")
|
||||
withModule("android.sdktools.chunkio", "pixelprobe.jar")
|
||||
withModule("android.sdktools.pixelprobe", "pixelprobe.jar")
|
||||
|
||||
withModule("binary-resources", "sdk-tools.jar")
|
||||
withModule("analyzer", "sdk-tools.jar")
|
||||
withModule("ddmlib", "sdk-tools.jar")
|
||||
withModule("dvlib", "sdk-tools.jar")
|
||||
withModule("draw9patch", "sdk-tools.jar")
|
||||
withModule("instant-run-client", "sdk-tools.jar")
|
||||
withModule("instant-run-common", "sdk-tools.jar")
|
||||
withModule("lint-api", "sdk-tools.jar")
|
||||
withModule("lint-checks", "sdk-tools.jar")
|
||||
withModule("ninepatch", "sdk-tools.jar")
|
||||
withModule("perflib", "sdk-tools.jar")
|
||||
withModule("builder-model", "sdk-tools.jar")
|
||||
withModule("builder-test-api", "sdk-tools.jar")
|
||||
withModule("android-annotations", "sdk-tools.jar")
|
||||
withModule("layoutinspector", "sdk-tools.jar")
|
||||
withModule("android.sdktools.binary-resources", "sdk-tools.jar")
|
||||
withModule("intellij.android.analyzer", "sdk-tools.jar")
|
||||
withModule("android.sdktools.ddmlib", "sdk-tools.jar")
|
||||
withModule("android.sdktools.dvlib", "sdk-tools.jar")
|
||||
withModule("android.sdktools.draw9patch", "sdk-tools.jar")
|
||||
withModule("android.sdktools.instant-run-client", "sdk-tools.jar")
|
||||
withModule("android.sdktools.instant-run-common", "sdk-tools.jar")
|
||||
withModule("android.sdktools.lint-api", "sdk-tools.jar")
|
||||
withModule("android.sdktools.lint-checks", "sdk-tools.jar")
|
||||
withModule("android.sdktools.ninepatch", "sdk-tools.jar")
|
||||
withModule("android.sdktools.perflib", "sdk-tools.jar")
|
||||
withModule("android.sdktools.builder-model", "sdk-tools.jar")
|
||||
withModule("android.sdktools.builder-test-api", "sdk-tools.jar")
|
||||
withModule("android.sdktools.android-annotations", "sdk-tools.jar")
|
||||
withModule("intellij.android.layoutInspector", "sdk-tools.jar")
|
||||
|
||||
withJpsModule("android-gradle-jps")
|
||||
withJpsModule("android-jps-plugin")
|
||||
withModule("intellij.android.gradle.jps", "jps/android-gradle-jps.jar")
|
||||
withModule("intellij.android.jps", "jps/android-jps-plugin.jar")
|
||||
|
||||
withProjectLibrary("freemarker-2.3.20") //todo[nik] move to module libraries
|
||||
withProjectLibrary("jgraphx-3.4.0.1") //todo[nik] move to module libraries
|
||||
@@ -280,26 +280,26 @@ class CommunityRepositoryModules {
|
||||
withProjectLibrary("lombok-ast") //todo[nik] move to module libraries
|
||||
withProjectLibrary("layoutlib") //todo[nik] move to module libraries
|
||||
|
||||
withResourceFromModule("android","lib/antlr4-runtime-4.5.3.jar", "lib")
|
||||
withResourceFromModule("android","lib/asm-5.0.3.jar", "lib")
|
||||
withResourceFromModule("android","lib/asm-analysis-5.0.3.jar", "lib")
|
||||
withResourceFromModule("android","lib/asm-tree-5.0.3.jar", "lib")
|
||||
withResourceFromModule("android","lib/commons-io-2.4.jar", "lib")
|
||||
withResourceFromModule("android","lib/commons-compress-1.8.1.jar", "lib")
|
||||
withResourceFromModule("android","lib/javawriter-2.2.1.jar", "lib")
|
||||
withResourceFromModule("android","lib/juniversalchardet-1.0.3.jar", "lib")
|
||||
withResourceFromModule("intellij.android","lib/antlr4-runtime-4.5.3.jar", "lib")
|
||||
withResourceFromModule("intellij.android","lib/asm-5.0.3.jar", "lib")
|
||||
withResourceFromModule("intellij.android","lib/asm-analysis-5.0.3.jar", "lib")
|
||||
withResourceFromModule("intellij.android","lib/asm-tree-5.0.3.jar", "lib")
|
||||
withResourceFromModule("intellij.android","lib/commons-io-2.4.jar", "lib")
|
||||
withResourceFromModule("intellij.android","lib/commons-compress-1.8.1.jar", "lib")
|
||||
withResourceFromModule("intellij.android","lib/javawriter-2.2.1.jar", "lib")
|
||||
withResourceFromModule("intellij.android","lib/juniversalchardet-1.0.3.jar", "lib")
|
||||
|
||||
withResourceFromModule("android","lib/androidWidgets", "lib/androidWidgets")
|
||||
withResourceFromModule("artwork","resources/device-art-resources", "lib/device-art-resources")
|
||||
withResourceFromModule("android","lib/sampleData", "lib/sampleData")
|
||||
withResourceFromModule("intellij.android","lib/androidWidgets", "lib/androidWidgets")
|
||||
withResourceFromModule("intellij.android.artwork","resources/device-art-resources", "lib/device-art-resources")
|
||||
withResourceFromModule("intellij.android","lib/sampleData", "lib/sampleData")
|
||||
withResourceArchive("../android/annotations", "lib/androidAnnotations.jar")
|
||||
|
||||
// here go some differences from original Android Studio layout
|
||||
withResourceFromModule("layoutlib-resources", ".", "lib/layoutlib") // todo replace this with runtime downloading
|
||||
withResourceFromModule("sdklib", "../templates", "lib/templates")
|
||||
withResourceFromModule("android.sdktools.layoutlib-resources", ".", "lib/layoutlib") // todo replace this with runtime downloading
|
||||
withResourceFromModule("android.sdktools.sdklib", "../templates", "lib/templates")
|
||||
|
||||
// we put it to plugin instead of ide in original Android Studio layout
|
||||
withModule("common", "android-base-common.jar")
|
||||
withModule("android.sdktools.common", "android-base-common.jar")
|
||||
|
||||
withProjectLibrary("studio-profiler-grpc-1.0-jarjar")
|
||||
withProjectLibrary("archive-patcher")
|
||||
@@ -317,23 +317,23 @@ class CommunityRepositoryModules {
|
||||
plugin(mainModuleName) {
|
||||
directoryName = "javaFX"
|
||||
mainJarName = "javaFX.jar"
|
||||
withModule("javaFX", mainJarName)
|
||||
withModule("javaFX-jps-plugin")
|
||||
withModule("common-javaFX-plugin")
|
||||
withModule("intellij.javaFX", mainJarName)
|
||||
withModule("intellij.javaFX.jps")
|
||||
withModule("intellij.javaFX.common")
|
||||
withProjectLibrary("SceneBuilderKit") //todo[nik] move to module libraries
|
||||
}
|
||||
}
|
||||
|
||||
static PluginLayout groovyPlugin(List<String> additionalModules) {
|
||||
plugin("jetgroovy") {
|
||||
plugin("intellij.groovy") {
|
||||
directoryName = "Groovy"
|
||||
mainJarName = "Groovy.jar"
|
||||
withModule("groovy-psi", mainJarName)
|
||||
withModule("structuralsearch-groovy", mainJarName)
|
||||
excludeFromModule("groovy-psi", "standardDsls/**")
|
||||
withModule("groovy-jps-plugin")
|
||||
withModule("groovy_rt")
|
||||
withModule("groovy-rt-constants")
|
||||
withModule("intellij.groovy.psi", mainJarName)
|
||||
withModule("intellij.groovy.structuralSearch", mainJarName)
|
||||
excludeFromModule("intellij.groovy.psi", "standardDsls/**")
|
||||
withModule("intellij.groovy.jps")
|
||||
withModule("intellij.groovy.rt")
|
||||
withModule("intellij.groovy.constants.rt")
|
||||
withResource("groovy-psi/resources/standardDsls", "lib/standardDsls")
|
||||
withResource("hotswap/gragent.jar", "lib/agent")
|
||||
withResource("groovy-psi/resources/conf", "lib")
|
||||
|
||||
+1
-1
@@ -99,7 +99,7 @@ class ProductModulesLayout {
|
||||
/**
|
||||
* Name of the module containing search/searchableOptions.xml file.
|
||||
*/
|
||||
String searchableOptionsModule = "platform-resources"
|
||||
String searchableOptionsModule = "intellij.platform.resources"
|
||||
|
||||
/**
|
||||
* If {@code true} a special xml descriptor in custom plugin repository format will be generated for {@link #pluginModulesToPublish} plugins.
|
||||
|
||||
+1
-1
@@ -275,7 +275,7 @@ class BuildContextImpl extends BuildContext {
|
||||
|
||||
private boolean isJavaSupportedInProduct() {
|
||||
def productLayout = productProperties.productLayout
|
||||
return DistributionJARsBuilder.getIncludedPlatformModules(productLayout).contains("execution-impl")
|
||||
return DistributionJARsBuilder.getIncludedPlatformModules(productLayout).contains("intellij.java.execution.impl")
|
||||
}
|
||||
|
||||
@CompileDynamic
|
||||
|
||||
+3
-3
@@ -110,7 +110,7 @@ class BuildTasksImpl extends BuildTasks {
|
||||
}
|
||||
|
||||
private void runApplicationStarter(String tempDir, List<String> modules, List<String> arguments) {
|
||||
def javaRuntimeClasses = "${buildContext.getModuleOutputPath(buildContext.findModule("java-runtime"))}"
|
||||
def javaRuntimeClasses = "${buildContext.getModuleOutputPath(buildContext.findModule("intellij.java.rt"))}"
|
||||
if (!new File(javaRuntimeClasses).exists()) {
|
||||
buildContext.messages.error("Cannot run application starter ${arguments}, 'java-runtime' module isn't compiled ($javaRuntimeClasses doesn't exist)")
|
||||
}
|
||||
@@ -127,7 +127,7 @@ class BuildTasksImpl extends BuildTasks {
|
||||
|
||||
buildContext.ant.java(classname: "com.intellij.rt.execution.CommandLineWrapper", fork: true, failonerror: true) {
|
||||
jvmarg(line: "-ea -Xmx500m")
|
||||
jvmarg(value: "-Xbootclasspath/a:${buildContext.getModuleOutputPath(buildContext.findModule("boot"))}")
|
||||
jvmarg(value: "-Xbootclasspath/a:${buildContext.getModuleOutputPath(buildContext.findModule("intellij.platform.boot"))}")
|
||||
sysproperty(key: "java.awt.headless", value: true)
|
||||
sysproperty(key: "idea.home.path", value: buildContext.paths.projectHome)
|
||||
sysproperty(key: "idea.system.path", value: systemPath)
|
||||
@@ -542,7 +542,7 @@ idea.fatal.error.notification=disabled
|
||||
void buildUpdaterJar() {
|
||||
new LayoutBuilder(buildContext, false).layout(buildContext.paths.artifacts) {
|
||||
jar("updater.jar") {
|
||||
module("updater")
|
||||
module("intellij.platform.updater")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+21
-21
@@ -100,23 +100,23 @@ class DistributionJARsBuilder {
|
||||
productLayout.moduleExcludes.entrySet().each {
|
||||
layout.moduleExcludes.putAll(it.key, it.value)
|
||||
}
|
||||
withModule("util")
|
||||
withModule("util-rt", "util.jar")
|
||||
withModule("annotations")
|
||||
withModule("annotations-common", "annotations.jar")
|
||||
withModule("extensions")
|
||||
withModule("bootstrap")
|
||||
withModule("forms_rt")
|
||||
withModule("icons")
|
||||
withModule("boot")
|
||||
withModule("platform-resources", "resources.jar")
|
||||
withModule("colorSchemes", "resources.jar")
|
||||
withModule("platform-resources-en", productLayout.mainJarName)
|
||||
withModule("jps-model-serialization", "jps-model.jar")
|
||||
withModule("jps-model-impl", "jps-model.jar")
|
||||
withModule("intellij.platform.util")
|
||||
withModule("intellij.platform.util.rt", "util.jar")
|
||||
withModule("intellij.platform.annotations.java5")
|
||||
withModule("intellij.platform.annotations.common", "annotations.jar")
|
||||
withModule("intellij.platform.extensions")
|
||||
withModule("intellij.platform.bootstrap")
|
||||
withModule("intellij.java.guiForms.rt")
|
||||
withModule("intellij.platform.icons")
|
||||
withModule("intellij.platform.boot")
|
||||
withModule("intellij.platform.resources", "resources.jar")
|
||||
withModule("intellij.platform.colorSchemes", "resources.jar")
|
||||
withModule("intellij.platform.resources.en", productLayout.mainJarName)
|
||||
withModule("intellij.platform.jps.model.serialization", "jps-model.jar")
|
||||
withModule("intellij.platform.jps.model.impl", "jps-model.jar")
|
||||
|
||||
if (allProductDependencies.contains("coverage-common") && !productLayout.bundledPluginModules.contains("coverage")) {
|
||||
withModule("coverage-common", productLayout.mainJarName)
|
||||
if (allProductDependencies.contains("intellij.platform.coverage") && !productLayout.bundledPluginModules.contains("intellij.java.coverage")) {
|
||||
withModule("intellij.platform.coverage", productLayout.mainJarName)
|
||||
}
|
||||
|
||||
projectLibrariesUsedByPlugins.each {
|
||||
@@ -149,7 +149,7 @@ class DistributionJARsBuilder {
|
||||
* @return module names which are required to run necessary tools from build scripts
|
||||
*/
|
||||
static List<String> getToolModules() {
|
||||
["java-runtime", "platform-main", /*required to build searchable options index*/ "updater"]
|
||||
["intellij.java.rt", "intellij.platform.main", /*required to build searchable options index*/ "intellij.platform.updater"]
|
||||
}
|
||||
|
||||
static List<String> getPlatformApiModules(ProductModulesLayout productLayout) {
|
||||
@@ -200,7 +200,7 @@ class DistributionJARsBuilder {
|
||||
arg(value: targetDirectory)
|
||||
arg(value: ignoredJarsFile.parent)
|
||||
classpath {
|
||||
buildContext.getModuleRuntimeClasspath(buildContext.findRequiredModule("util"), false).each {
|
||||
buildContext.getModuleRuntimeClasspath(buildContext.findRequiredModule("intellij.platform.util"), false).each {
|
||||
pathelement(location: it)
|
||||
}
|
||||
}
|
||||
@@ -221,7 +221,7 @@ class DistributionJARsBuilder {
|
||||
if (productProperties.scrambleMainJar) {
|
||||
createLayoutBuilder().layout("$buildContext.paths.buildOutputRoot/internal") {
|
||||
jar("internalUtilities.jar") {
|
||||
module("internalUtilities")
|
||||
module("intellij.tools.internalUtilities")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -252,7 +252,7 @@ class DistributionJARsBuilder {
|
||||
|
||||
if (buildContext.productProperties.reassignAltClickToMultipleCarets) {
|
||||
def patchedKeyMapDir = createKeyMapWithAltClickReassignedToMultipleCarets()
|
||||
layoutBuilder.patchModuleOutput("platform-resources", FileUtil.toSystemIndependentName(patchedKeyMapDir.absolutePath))
|
||||
layoutBuilder.patchModuleOutput("intellij.platform.resources", FileUtil.toSystemIndependentName(patchedKeyMapDir.absolutePath))
|
||||
}
|
||||
|
||||
buildByLayout(layoutBuilder, platform, buildContext.paths.distAll, platform.moduleJars, [])
|
||||
@@ -602,7 +602,7 @@ class DistributionJARsBuilder {
|
||||
}
|
||||
|
||||
private File createKeyMapWithAltClickReassignedToMultipleCarets() {
|
||||
def sourceFile = new File("${buildContext.getModuleOutputPath(buildContext.findModule("platform-resources"))}/keymaps/\$default.xml")
|
||||
def sourceFile = new File("${buildContext.getModuleOutputPath(buildContext.findModule("intellij.platform.resources"))}/keymaps/\$default.xml")
|
||||
String defaultKeymapContent = sourceFile.text
|
||||
defaultKeymapContent = defaultKeymapContent.replace("<mouse-shortcut keystroke=\"alt button1\"/>", "")
|
||||
defaultKeymapContent = defaultKeymapContent.replace("<mouse-shortcut keystroke=\"alt shift button1\"/>",
|
||||
|
||||
+5
-5
@@ -54,11 +54,11 @@ class TestingTasksImpl extends TestingTasks {
|
||||
JUnitRunConfigurationProperties.findRunConfiguration(context.paths.projectHome, name, context.messages)
|
||||
}
|
||||
if (runConfigurations != null) {
|
||||
compilationTasks.compileModules(["tests_bootstrap"], ["platform-build-scripts"] + runConfigurations.collect { it.moduleName })
|
||||
compilationTasks.compileModules(["intellij.tools.testsBootstrap"], ["intellij.platform.buildScripts"] + runConfigurations.collect { it.moduleName })
|
||||
compilationTasks.buildProjectArtifacts(runConfigurations.collectMany {it.requiredArtifacts})
|
||||
}
|
||||
else if (options.mainModule != null) {
|
||||
compilationTasks.compileModules(["tests_bootstrap"], [options.mainModule, "platform-build-scripts"])
|
||||
compilationTasks.compileModules(["intellij.tools.testsBootstrap"], [options.mainModule, "intellij.platform.buildScripts"])
|
||||
}
|
||||
else {
|
||||
compilationTasks.compileAllModulesAndTests()
|
||||
@@ -168,7 +168,7 @@ class TestingTasksImpl extends TestingTasks {
|
||||
private void runTestsProcess(String mainModule, String testGroups, String testPatterns,
|
||||
List<String> additionalJvmOptions, Map<String, String> additionalSystemProperties, Map<String, String> envVariables, boolean remoteDebugging) {
|
||||
List<String> testsClasspath = context.getModuleRuntimeClasspath(context.findRequiredModule(mainModule), true)
|
||||
List<String> bootstrapClasspath = context.getModuleRuntimeClasspath(context.findRequiredModule("tests_bootstrap"), false)
|
||||
List<String> bootstrapClasspath = context.getModuleRuntimeClasspath(context.findRequiredModule("intellij.tools.testsBootstrap"), false)
|
||||
def classpathFile = new File("$context.paths.temp/junit.classpath")
|
||||
FileUtilRt.createParentDirs(classpathFile)
|
||||
classpathFile.text = testsClasspath.findAll({ new File(it).exists() }).join('\n')
|
||||
@@ -178,7 +178,7 @@ class TestingTasksImpl extends TestingTasks {
|
||||
List<String> jvmArgs = [
|
||||
"-ea",
|
||||
"-server",
|
||||
"-Xbootclasspath/a:${context.getModuleOutputPath(context.findRequiredModule("boot"))}".toString(),
|
||||
"-Xbootclasspath/a:${context.getModuleOutputPath(context.findRequiredModule("intellij.platform.boot"))}".toString(),
|
||||
"-XX:+HeapDumpOnOutOfMemoryError",
|
||||
"-XX:HeapDumpPath=$hprofSnapshotFilePath".toString(),
|
||||
"-XX:ReservedCodeCacheSize=300m",
|
||||
@@ -320,7 +320,7 @@ class TestingTasksImpl extends TestingTasks {
|
||||
}
|
||||
if (!underTeamCity) {
|
||||
classpath {
|
||||
pathelement(location: context.getModuleTestsOutputPath(context.findRequiredModule("platform-build-scripts")))
|
||||
pathelement(location: context.getModuleTestsOutputPath(context.findRequiredModule("intellij.platform.buildScripts")))
|
||||
}
|
||||
formatter(classname: "org.jetbrains.intellij.build.JUnitLiveTestProgressFormatter", usefile: false)
|
||||
}
|
||||
|
||||
+1
-1
@@ -197,7 +197,7 @@ IDS_VM_OPTIONS=$vmOptions
|
||||
def communityHome = "$buildContext.paths.communityHome"
|
||||
String inputPath = "$communityHome/bin/WinLauncher/WinLauncher${arch.fileSuffix}.exe"
|
||||
def outputPath = "$winDistPath/bin/$exeFileName"
|
||||
def resourceModules = [buildContext.findApplicationInfoModule(), buildContext.findModule("icons")]
|
||||
def resourceModules = [buildContext.findApplicationInfoModule(), buildContext.findModule("intellij.platform.icons")]
|
||||
buildContext.ant.java(classname: "com.pme.launcher.LauncherGeneratorMain", fork: "true", failonerror: "true") {
|
||||
sysproperty(key: "java.awt.headless", value: "true")
|
||||
arg(value: inputPath)
|
||||
|
||||
+15
-15
@@ -11,25 +11,25 @@ import org.jetbrains.intellij.build.impl.PluginLayout
|
||||
*/
|
||||
class PythonCommunityPluginModules {
|
||||
static List<String> COMMUNITY_MODULES = [
|
||||
"IntelliLang-python",
|
||||
"ipnb",
|
||||
"python-openapi",
|
||||
"python-community-plugin-core",
|
||||
"python-community-plugin-java",
|
||||
"python-community-configure",
|
||||
"python-community-plugin-minor",
|
||||
"python-psi-api",
|
||||
"python-pydev",
|
||||
"python-community",
|
||||
"intellij.python.langInjection",
|
||||
"intellij.python.ipnb",
|
||||
"intellij.python.community",
|
||||
"intellij.python.community.plugin",
|
||||
"intellij.python.community.plugin.java",
|
||||
"intellij.python.configure",
|
||||
"intellij.python.community.plugin.minor",
|
||||
"intellij.python.psi",
|
||||
"intellij.python.pydev",
|
||||
"intellij.python.community.impl",
|
||||
]
|
||||
public static String PYTHON_COMMUNITY_PLUGIN_MODULE = "python-community-plugin-resources"
|
||||
public static String PYTHON_COMMUNITY_PLUGIN_MODULE = "intellij.python.community.plugin.resources"
|
||||
static final List<String> PYCHARM_ONLY_PLUGIN_MODULES = [
|
||||
"IntelliLang-python",
|
||||
"ipnb",
|
||||
"intellij.python.langInjection",
|
||||
"intellij.python.ipnb",
|
||||
]
|
||||
|
||||
static PluginLayout pythonCommunityPluginLayout(@DelegatesTo(PluginLayout.PluginLayoutSpec) Closure body = {}) {
|
||||
pythonPlugin(PYTHON_COMMUNITY_PLUGIN_MODULE, "python-ce", "python-community-plugin-build-patches",
|
||||
pythonPlugin(PYTHON_COMMUNITY_PLUGIN_MODULE, "python-ce", "intellij.python.community.plugin.buildPatches",
|
||||
COMMUNITY_MODULES) {
|
||||
withProjectLibrary("markdown4j-2.2") // Required for ipnb
|
||||
PYCHARM_ONLY_PLUGIN_MODULES.each { module ->
|
||||
@@ -50,7 +50,7 @@ class PythonCommunityPluginModules {
|
||||
withModule(module, mainJarName, null)
|
||||
}
|
||||
withModule(buildPatchesModule, mainJarName, null)
|
||||
withResourceFromModule("python-helpers", "", "helpers")
|
||||
withResourceFromModule("intellij.python.helpers", "", "helpers")
|
||||
withCustomVersion { BuildContext context ->
|
||||
// TODO: Make the Python plugin follow the conventional scheme for plugin versioning, build the plugin together with the IDE
|
||||
def pluginBuildNumber = getPluginBuildNumber()
|
||||
|
||||
+1
-1
@@ -127,7 +127,7 @@ abstract class ImageResourcesTestBase {
|
||||
@JvmStatic
|
||||
fun collectNonRegeneratedIconClasses(root: TestRoot): List<Array<Any?>> {
|
||||
val model = loadProjectModel(root)
|
||||
val util = model.project.modules.find { it.name == "util" } ?: throw IllegalStateException("Can't load module 'util'")
|
||||
val util = model.project.modules.find { it.name == "intellij.platform.util" } ?: throw IllegalStateException("Can't load module 'util'")
|
||||
val modules = collectModules(root, model)
|
||||
|
||||
val checker = MyIconClassFileChecker(File(PathManager.getHomePath()), util)
|
||||
|
||||
+2
-2
@@ -14,9 +14,9 @@ import org.junit.rules.ErrorCollector
|
||||
|
||||
class LibraryLicensesTester(private val project: JpsProject, private val licenses: List<LibraryLicense>) {
|
||||
fun reportMissingLicenses(collector: ErrorCollector) {
|
||||
val nonPublicModules = setOf("buildScripts", "build", "buildSrc", "testGuiFramework")
|
||||
val nonPublicModules = setOf("intellij.ideaUltimate.build", "intellij.ideaCommunity.build", "buildSrc", "intellij.platform.testGuiFramework")
|
||||
val libraries = HashMap<JpsLibrary, JpsModule>()
|
||||
project.modules.filter { it.name !in nonPublicModules && !it.name.contains("guitests") }.forEach { module ->
|
||||
project.modules.filter { it.name !in nonPublicModules && !it.name.contains("guiTests") }.forEach { module ->
|
||||
JpsJavaExtensionService.dependencies(module).includedIn(JpsJavaClasspathKind.PRODUCTION_RUNTIME).libraries.forEach {
|
||||
libraries[it] = module
|
||||
}
|
||||
|
||||
+5
-5
@@ -24,16 +24,16 @@ class PyCharmCommunityProperties extends PyCharmPropertiesBase {
|
||||
PyCharmCommunityProperties(String communityHome) {
|
||||
productCode = "PC"
|
||||
platformPrefix = "PyCharmCore"
|
||||
applicationInfoModule = "python-community-ide-resources"
|
||||
applicationInfoModule = "intellij.pycharmCommunity.resources"
|
||||
brandingResourcePaths = ["$communityHome/python/resources"]
|
||||
|
||||
productLayout.platformApiModules = CommunityRepositoryModules.PLATFORM_API_MODULES + ["dom-openapi"]
|
||||
productLayout.platformApiModules = CommunityRepositoryModules.PLATFORM_API_MODULES + ["intellij.xml.dom"]
|
||||
productLayout.platformImplementationModules = CommunityRepositoryModules.PLATFORM_IMPLEMENTATION_MODULES + [
|
||||
"dom-impl", "python-community", "python-community-ide-resources",
|
||||
"python-community-ide", "python-community-configure", "python-openapi", "python-psi-api", "platform-main"
|
||||
"intellij.xml.dom.impl", "intellij.python.community.impl", "intellij.pycharmCommunity.resources",
|
||||
"intellij.pycharmCommunity", "intellij.python.configure", "intellij.python.community", "intellij.python.psi", "intellij.platform.main"
|
||||
]
|
||||
productLayout.bundledPluginModules = new File("$communityHome/python/build/plugin-list.txt").readLines()
|
||||
productLayout.mainModules = ["main_pycharm_ce"]
|
||||
productLayout.mainModules = ["intellij.pycharmCommunity.main"]
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+5
-5
@@ -25,14 +25,14 @@ abstract class PyCharmPropertiesBase extends ProductProperties {
|
||||
baseFileName = "pycharm"
|
||||
reassignAltClickToMultipleCarets = true
|
||||
productLayout.mainJarName = "pycharm.jar"
|
||||
productLayout.additionalPlatformJars.put("pycharm-pydev.jar", "python-pydev")
|
||||
productLayout.additionalPlatformJars.put("pycharm-pydev.jar", "intellij.python.pydev")
|
||||
}
|
||||
|
||||
@Override
|
||||
void copyAdditionalFiles(BuildContext context, String targetDirectory) {
|
||||
def tasks = BuildTasks.create(context)
|
||||
tasks.zipSourcesOfModules(["python-pydev"], "$targetDirectory/lib/src/pycharm-pydev-src.zip")
|
||||
tasks.zipSourcesOfModules(["python-openapi", "python-psi-api"], "$targetDirectory/lib/src/pycharm-openapi-src.zip")
|
||||
tasks.zipSourcesOfModules(["intellij.python.pydev"], "$targetDirectory/lib/src/pycharm-pydev-src.zip")
|
||||
tasks.zipSourcesOfModules(["intellij.python.community", "intellij.python.psi"], "$targetDirectory/lib/src/pycharm-openapi-src.zip")
|
||||
|
||||
context.ant.copy(todir: "$targetDirectory/helpers") {
|
||||
fileset(dir: "$context.paths.communityHome/python/helpers")
|
||||
@@ -63,8 +63,8 @@ abstract class PyCharmPropertiesBase extends ProductProperties {
|
||||
class PyPrebuiltIndicesGenerator implements ResourcesGenerator {
|
||||
@Override
|
||||
File generateResources(BuildContext context) {
|
||||
CompilationTasks.create(context).compileModules(["python-community-tools"])
|
||||
List<String> buildClasspath = context.getModuleRuntimeClasspath(context.findModule("python-community-tools"), false)
|
||||
CompilationTasks.create(context).compileModules(["intellij.python.tools"])
|
||||
List<String> buildClasspath = context.getModuleRuntimeClasspath(context.findModule("intellij.python.tools"), false)
|
||||
|
||||
def zipPath = "$context.paths.temp/zips"
|
||||
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ class PythonCommunityPluginProperties extends PythonPluginPropertiesBase {
|
||||
super()
|
||||
productCode = "PC"
|
||||
platformPrefix = "PyCharmCore"
|
||||
applicationInfoModule = "python-community-ide-resources"
|
||||
applicationInfoModule = "intellij.pycharmCommunity.resources"
|
||||
productLayout.pluginModulesToPublish = [PythonCommunityPluginModules.PYTHON_COMMUNITY_PLUGIN_MODULE]
|
||||
|
||||
productLayout.allNonTrivialPlugins = CommunityRepositoryModules.COMMUNITY_REPOSITORY_PLUGINS + [
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
cvs-plugin
|
||||
svn4idea
|
||||
git4idea
|
||||
remote-servers-git
|
||||
hg4idea
|
||||
tasks-core
|
||||
github
|
||||
terminal
|
||||
python-terminal
|
||||
IntelliLang
|
||||
IntelliLang-xml
|
||||
IntelliLang-python
|
||||
rest
|
||||
python-rest
|
||||
ipnb
|
||||
editorconfig
|
||||
settings-repository
|
||||
yaml
|
||||
properties
|
||||
intellij.vcs.cvs
|
||||
intellij.vcs.svn
|
||||
intellij.vcs.git
|
||||
intellij.platform.remoteServers.git
|
||||
intellij.vcs.hg
|
||||
intellij.tasks.core
|
||||
intellij.vcs.github
|
||||
intellij.terminal
|
||||
intellij.python.terminal
|
||||
intellij.platform.langInjection
|
||||
intellij.xml.langInjection
|
||||
intellij.python.langInjection
|
||||
intellij.reStructuredText
|
||||
intellij.python.reStructuredText
|
||||
intellij.python.ipnb
|
||||
intellij.editorconfig
|
||||
intellij.settingsRepository
|
||||
intellij.yaml
|
||||
intellij.properties
|
||||
+5
-5
@@ -15,14 +15,14 @@ class PyCharmEduProperties extends PyCharmPropertiesBase {
|
||||
pythonCommunityPath = new File(home, "community/python").exists() ? "$home/community/python" : "$home/python"
|
||||
productCode = "PE"
|
||||
platformPrefix = "PyCharmEdu"
|
||||
applicationInfoModule = "educational-python"
|
||||
applicationInfoModule = "intellij.pycharmEdu"
|
||||
brandingResourcePaths = ["$pythonCommunityPath/educational-python/resources"]
|
||||
|
||||
productLayout.mainModules = ["main_pycharm_edu"]
|
||||
productLayout.platformApiModules = CommunityRepositoryModules.PLATFORM_API_MODULES + ["dom-openapi"]
|
||||
productLayout.mainModules = ["intellij.pycharmEdu.main"]
|
||||
productLayout.platformApiModules = CommunityRepositoryModules.PLATFORM_API_MODULES + ["intellij.xml.dom"]
|
||||
productLayout.platformImplementationModules = CommunityRepositoryModules.PLATFORM_IMPLEMENTATION_MODULES + [
|
||||
"dom-impl", "python-community", "python-community-ide-resources",
|
||||
"python-community-ide", "python-community-configure", "educational-python", "python-openapi", "python-psi-api", "platform-main"
|
||||
"intellij.xml.dom.impl", "intellij.python.community.impl", "intellij.pycharmCommunity.resources",
|
||||
"intellij.pycharmCommunity", "intellij.python.configure", "intellij.pycharmEdu", "intellij.python.community", "intellij.python.psi", "intellij.platform.main"
|
||||
]
|
||||
productLayout.bundledPluginModules = new File("$pythonCommunityPath/educational-python/build/plugin-list.txt").readLines()
|
||||
additionalIDEPropertiesFilePaths = ["$home/community/python/educational-python/build/pycharm-edu.properties".toString()]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
svn4idea
|
||||
git4idea
|
||||
remote-servers-git
|
||||
github
|
||||
hg4idea
|
||||
ipnb
|
||||
intellij.vcs.svn
|
||||
intellij.vcs.git
|
||||
intellij.platform.remoteServers.git
|
||||
intellij.vcs.github
|
||||
intellij.vcs.hg
|
||||
intellij.python.ipnb
|
||||
Reference in New Issue
Block a user