MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

build scripts: extract jps-model modules into separate JAR in all IDEs

Browse Source 
Previously 'jps-model-impl' and 'jps-model-serialization' were extracted into a separate JAR in IDEA only (because we need this for external build process), all other IDEs included these modules into the main productName.jar. This requires hacky code in IDEA build scripts and complicates unification of JARs layout for all IDEs (e.g. extracting common platform JARs).
This commit is contained in:
nik
2017-11-21 16:59:26 +03:00
parent 8fda7577db
commit 8155eeb35e
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
View File

@@ -55,7 +55,6 @@ abstract class BaseIdeaProperties extends ProductProperties {
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("jps-model.jar", ["jps-model-impl", "jps-model-serialization"])
productLayout.additionalPlatformJars.putAll("resources.jar", ["resources", "resources-en"])
productLayout.additionalPlatformJars.
putAll("javac2.jar", ["javac2", "forms-compiler", "forms_rt", "instrumentation-util", "instrumentation-util-8", "javac-ref-scanner-8"])

3
build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
View File

@@ -33,8 +33,7 @@ class IdeaCommunityProperties extends BaseIdeaProperties {
buildCrossPlatformDistribution = true
productLayout.platformApiJarModules = CommunityRepositoryModules.PLATFORM_API_MODULES
//jps modules are packed into a separate JAR to include into build process's classpath so we need to exclude them from the main platform JAR
productLayout.platformImplJarModules = CommunityRepositoryModules.PLATFORM_IMPLEMENTATION_MODULES - ["jps-model-impl", "jps-model-serialization"]
productLayout.platformImplJarModules = CommunityRepositoryModules.PLATFORM_IMPLEMENTATION_MODULES
productLayout.productApiModules = JAVA_API_MODULES
productLayout.productImplementationModules = JAVA_IMPLEMENTATION_MODULES +
["duplicates-analysis", "structuralsearch", "structuralsearch-java", "typeMigration", "platform-main"]

2
platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy
View File

@@ -64,8 +64,6 @@ class CommunityRepositoryModules {
"editor-ui-ex",
"images",
"indexing-impl",
"jps-model-impl",
"jps-model-serialization",
"json",
"lang-impl",
"lvcs-impl",

3
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
View File

@@ -114,6 +114,9 @@ class DistributionJARsBuilder {
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")
if (allProductDependencies.contains("coverage-common") && !productLayout.bundledPluginModules.contains("coverage")) {
withModule("coverage-common", productLayout.mainJarName)
}