summaryrefslogtreecommitdiff
path: root/build/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'build/scripts')
-rw-r--r--build/scripts/common_tests.gant1
-rw-r--r--build/scripts/layouts.gant15
-rw-r--r--build/scripts/libLicenses.gant4
-rw-r--r--build/scripts/tests.gant1
-rw-r--r--build/scripts/utils.gant19
5 files changed, 35 insertions, 5 deletions
diff --git a/build/scripts/common_tests.gant b/build/scripts/common_tests.gant
index a74f7d43a0b3..eb21bac9d8a4 100644
--- a/build/scripts/common_tests.gant
+++ b/build/scripts/common_tests.gant
@@ -55,6 +55,7 @@ target('run_tests': 'Run java tests') {
pass("idea.test.group")
pass("idea.test.patterns")
pass("idea.fast.only")
+ pass("idea.coverage.enabled.build")
pass("teamcity.build.tempDir")
pass("teamcity.tests.recentlyFailedTests.file")
jvmarg(value: "-Didea.platform.prefix=Idea")
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 626095994a8b..4c04f9d339bb 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -345,6 +345,10 @@ public def layoutCommunityPlugins(String home) {
}
layoutPlugin("gradle") {
+ jar("gradle-jps-plugin.jar") {
+ module("gradle-jps-plugin")
+ }
+
jar("gradle-tooling-extension-api.jar") {
module("gradle-tooling-extension-api")
}
@@ -353,6 +357,13 @@ public def layoutCommunityPlugins(String home) {
module("gradle-tooling-extension-impl")
}
fileset(dir: "$home/plugins/gradle/lib") { include(name: "*.jar") }
+ // add kryo lib
+ fileset(dir: "$home/lib/") {
+ include(name: "kryo-*.jar")
+ include(name: "reflectasm-*.jar")
+ include(name: "objenesis-*.jar")
+ include(name: "minlog-*.jar")
+ }
}
layoutPlugin("git4idea") {
@@ -893,6 +904,7 @@ def layoutJps(String home, String targetDir, String buildNumber, Closure additio
jar("maven-jps-plugin.jar") { module("maven-jps-plugin") }
+ jar("gradle-jps-plugin.jar") { module("gradle-jps-plugin") }
fileset(dir: "$home/plugins/maven/maven3-server-impl/lib/maven3/lib") {include(name: "plexus-utils-*.jar")}
jar("eclipse-jps-plugin.jar") {
@@ -945,8 +957,9 @@ def layout_core(String home, String target) {
module("annotations")
}
- jar("intellij-core-analysis-api.jar") {
+ jar("intellij-core-analysis.jar") {
analysisApiModules.each { module it; }
+ analysisImplModules.each { module it; }
}
fileset(dir: "$home/lib") {
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index eaeb82e1c4b4..d495f952b7a8 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -50,7 +50,8 @@ def String getLibraryName(JpsLibrary lib) {
def name = lib.name
if (name.startsWith("#")) {
if (lib.getRoots(JpsOrderRootType.COMPILED).size() != 1) {
- projectBuilder.warning("Non-single entry module library $name: $lib.classpath");
+ def urls = lib.getRoots(JpsOrderRootType.COMPILED).collect {it.url}
+ projectBuilder.warning("Non-single entry module library $name: $urls");
}
File file = lib.getFiles(JpsOrderRootType.COMPILED)[0]
return file.name
@@ -213,6 +214,7 @@ libraryLicense(name: "maven-core", version: "3.0.5", libraryNames: ["maven-core-
libraryLicense(name: "plexus-component-annotations", version: "1.5.5", libraryNames: ["plexus-component-annotations-1.5.5.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
libraryLicense(name: "Maven3", libraryNames: ["Maven3", "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://maven.apache.org/license.html")
libraryLicense(name: "Gradle", version: "1.12", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
+libraryLicense(name: "gradle-tooling-api-2.0.jar", version: "2.0", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
libraryLicense(name: "GradleJnaPosix", version: "1.0.3", license: "LGPL 2.1", url: "http://www.jruby.org/", licenseUrl: "http://www.gnu.org/licenses/lgpl-2.1.txt")
libraryLicense(name: "Slf4j", version: "1.7.2", license: "MIT License", url: "http://slf4j.org/", licenseUrl: "http://slf4j.org/license.html")
libraryLicense(name: "GradleGuava", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://apache.org/licenses/LICENSE-2.0")
diff --git a/build/scripts/tests.gant b/build/scripts/tests.gant
index d10d72b14112..03b740ccf434 100644
--- a/build/scripts/tests.gant
+++ b/build/scripts/tests.gant
@@ -9,6 +9,7 @@ def isMac = System.getProperty("os.name").toLowerCase().startsWith("mac")
def args = [
"-Xmx1024m",
"-XX:MaxPermSize=630m",
+ "-XX:ReservedCodeCacheSize=96m"
]
if (isMac) args << "-d32";
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index e5eb3eb90c25..f30d8a2c7af2 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -53,12 +53,12 @@ binding.setVariable("isEap", {
return "true" == p("component.version.eap")
})
-binding.setVariable("mem32", "-server -Xms128m -Xmx512m -XX:MaxPermSize=250m -XX:ReservedCodeCacheSize=64m")
-binding.setVariable("mem64", "-Xms128m -Xmx750m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=96m")
+binding.setVariable("mem32", "-server -Xms128m -Xmx512m -XX:MaxPermSize=250m -XX:ReservedCodeCacheSize=150m")
+binding.setVariable("mem64", "-Xms128m -Xmx750m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=225m")
binding.setVariable("common_vmoptions", "-ea -Dsun.io.useCanonCaches=false -Djava.net.preferIPv4Stack=true " +
"-Didea.project.structure.max.errors.to.show=0 " +
"-Djsse.enableSNIExtension=false " +
- "-XX:+UseCodeCacheFlushing -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50")
+ "-XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50")
binding.setVariable("vmOptions", { "$common_vmoptions ${isEap() ? '-XX:+HeapDumpOnOutOfMemoryError' : ''}".trim() })
binding.setVariable("vmOptions32", { "$mem32 ${vmOptions()}".trim() })
@@ -942,3 +942,16 @@ binding.setVariable("analysisApiModules", [
"xml-psi-api",
"xml-structure-view-api",
])
+binding.setVariable("analysisImplModules", [
+ "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",
+])
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 04:46:13 +0000