summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/build.iml3
-rwxr-xr-xbuild/lib/gant/bin/startGroovy2
-rwxr-xr-xbuild/lib/gant/bin/startGroovy.bat2
-rw-r--r--build/lib/gant/gant_groovy2.1-1.9.10-sources.jarbin0 -> 51451 bytes
-rw-r--r--build/lib/gant/lib/gant_groovy2.0-1.9.8.jarbin300521 -> 0 bytes
-rw-r--r--build/lib/gant/lib/gant_groovy2.1-1.9.10.jarbin0 -> 301357 bytes
-rw-r--r--build/lib/gant/src.zipbin50206 -> 0 bytes
-rw-r--r--build/lib/launcher-generator.jarbin82989 -> 74576 bytes
-rw-r--r--build/order.txt1
-rw-r--r--build/scripts/layouts.gant34
-rw-r--r--build/scripts/libLicenses.gant28
-rw-r--r--build/scripts/utils.gant10
-rwxr-xr-xbuild/update.sh14
-rw-r--r--build/update.xml1
14 files changed, 57 insertions, 38 deletions
diff --git a/build/build.iml b/build/build.iml
index 8c1854cb3e68..db115fb3dc9e 100644
--- a/build/build.iml
+++ b/build/build.iml
@@ -31,6 +31,9 @@
</orderEntry>
<orderEntry type="module" module-name="antlayout" exported="" />
<orderEntry type="module" module-name="util" exported="" />
+ <orderEntry type="module" module-name="ui-designer-jps-plugin" scope="RUNTIME" />
+ <orderEntry type="module" module-name="groovy-jps-plugin" scope="RUNTIME" />
+ <orderEntry type="module" module-name="groovy_rt" scope="RUNTIME" />
</component>
</module>
diff --git a/build/lib/gant/bin/startGroovy b/build/lib/gant/bin/startGroovy
index f9e62511cd2a..9e9ccf35b11b 100755
--- a/build/lib/gant/bin/startGroovy
+++ b/build/lib/gant/bin/startGroovy
@@ -127,7 +127,7 @@ fi
if [ -z "$GROOVY_CONF" ] ; then
GROOVY_CONF="$GROOVY_HOME/conf/groovy-starter.conf"
fi
-STARTER_CLASSPATH="$GROOVY_HOME/lib/groovy-all-2.0.6.jar"
+STARTER_CLASSPATH="$GROOVY_HOME/lib/groovy-all-2.2.1.jar"
# Create the final classpath. Setting a classpath using the -cp or -classpath option means not to use the
# global classpath. Groovy behaves then the same as the java interpreter
diff --git a/build/lib/gant/bin/startGroovy.bat b/build/lib/gant/bin/startGroovy.bat
index e7c34766d90e..d2b1436b0bed 100755
--- a/build/lib/gant/bin/startGroovy.bat
+++ b/build/lib/gant/bin/startGroovy.bat
@@ -203,7 +203,7 @@ set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
-set STARTER_CLASSPATH=%GROOVY_HOME%\%JARSPATH%\groovy-all-2.0.6.jar;%STARTER_CLASSPATH%
+set STARTER_CLASSPATH=%GROOVY_HOME%\%JARSPATH%\groovy-all-2.2.1.jar;%STARTER_CLASSPATH%
if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"
diff --git a/build/lib/gant/gant_groovy2.1-1.9.10-sources.jar b/build/lib/gant/gant_groovy2.1-1.9.10-sources.jar
new file mode 100644
index 000000000000..776f88897d0b
--- /dev/null
+++ b/build/lib/gant/gant_groovy2.1-1.9.10-sources.jar
Binary files differ
diff --git a/build/lib/gant/lib/gant_groovy2.0-1.9.8.jar b/build/lib/gant/lib/gant_groovy2.0-1.9.8.jar
deleted file mode 100644
index 3d0d1ca0a526..000000000000
--- a/build/lib/gant/lib/gant_groovy2.0-1.9.8.jar
+++ /dev/null
Binary files differ
diff --git a/build/lib/gant/lib/gant_groovy2.1-1.9.10.jar b/build/lib/gant/lib/gant_groovy2.1-1.9.10.jar
new file mode 100644
index 000000000000..8f8fc1e009f2
--- /dev/null
+++ b/build/lib/gant/lib/gant_groovy2.1-1.9.10.jar
Binary files differ
diff --git a/build/lib/gant/src.zip b/build/lib/gant/src.zip
deleted file mode 100644
index 147e7406f01e..000000000000
--- a/build/lib/gant/src.zip
+++ /dev/null
Binary files differ
diff --git a/build/lib/launcher-generator.jar b/build/lib/launcher-generator.jar
index b86185b53d49..19951b9300c8 100644
--- a/build/lib/launcher-generator.jar
+++ b/build/lib/launcher-generator.jar
Binary files differ
diff --git a/build/order.txt b/build/order.txt
index 94652b3a097f..f93a7f28e863 100644
--- a/build/order.txt
+++ b/build/order.txt
@@ -9083,7 +9083,6 @@ inspectionDescriptions/ReplaceAssignmentWithOperatorAssignment.html:/plugins/Ins
inspectionDescriptions/IncompatibleMask.html:/plugins/InspectionGadgets/lib/resources_en.jar
inspectionDescriptions/PointlessBitwiseExpression.html:/plugins/InspectionGadgets/lib/resources_en.jar
inspectionDescriptions/ShiftOutOfRange.html:/plugins/InspectionGadgets/lib/resources_en.jar
-inspectionDescriptions/ArchaicSystemPropertyAccess.html:/plugins/InspectionGadgets/lib/resources_en.jar
inspectionDescriptions/ArrayEquals.html:/plugins/InspectionGadgets/lib/resources_en.jar
inspectionDescriptions/AssertWithSideEffects.html:/plugins/InspectionGadgets/lib/resources_en.jar
inspectionDescriptions/ConstantAssertCondition.html:/plugins/InspectionGadgets/lib/resources_en.jar
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 63b102725eee..8b0fbf80ee92 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -47,7 +47,6 @@ String patchAppDescriptor(String targetDirectory) {
def layoutFull(String home, String targetDirectory, String patchedDescriptorDir = null) {
projectBuilder.stage("layout to $targetDirectory")
- //noinspection GroovyAssignabilityCheck
List<String> openapiModules = [platformApiModules,
"compiler-openapi",
"debugger-openapi",
@@ -62,10 +61,8 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
"remote-servers-api",
"remote-servers-java-api",
"testFramework-java",
- "xml-analysis-api",
].flatten()
- //noinspection GroovyAssignabilityCheck
List<String> implementationModules = [platformImplementationModules,
"compiler-impl",
"debugger-impl",
@@ -85,7 +82,6 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
"remote-servers-java-impl",
"testFramework",
"tests_bootstrap",
- "xml-analysis-impl",
].flatten()
ant.patternset(id: "resources.included") {
@@ -114,12 +110,6 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
fileset(dir: "${home}/lib/rt", includesfile: "${home}/lib/rt/required_for_dist.txt")
}
- dir("groovy") {
- dir("lib") {
- fileset(dir:"$home/lib/groovy/lib")
- }
- }
-
dir("libpty") {
fileset(dir: "$home/lib/libpty") {
exclude(name: "readme.txt")
@@ -226,6 +216,8 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
module("common-javaFX-plugin")
}
}
+
+ fileset(dir: "${home}/plugins/javaFX/FxBuilderEmbedder/lib", includes: "embedder.jar");
}
}
@@ -257,7 +249,7 @@ public def layoutCommunityPlugins(String home) {
}
dir("plugins") {
- def simplePlugins = ["commander", "copyright", "properties", "java-i18n", "hg4idea", "github", "ui-designer-core"] //, "tasks-time-tracking"]
+ def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github", "ui-designer-core"] //, "tasks-time-tracking"]
simplePlugins.each {
layoutPlugin it
@@ -276,6 +268,16 @@ public def layoutCommunityPlugins(String home) {
}
}
+ pluginDir("properties") {
+ dir("lib") {
+ jar("properties.jar") {
+ module("properties-psi-api")
+ module("properties-psi-impl")
+ module("properties")
+ }
+ }
+ }
+
layoutPlugin("maven") {
jar("maven-jps-plugin.jar") {
module("maven-jps-plugin")
@@ -327,6 +329,15 @@ public def layoutCommunityPlugins(String home) {
jar("gradle.jar") {
module("gradle")
}
+ jar("gradle-tooling-extension.jar") {
+ module("gradle-tooling-extension")
+ }
+ def gradleToolingVersions = ["1.9", "1.11", "1.12"]
+ gradleToolingVersions.each { ver ->
+ jar("gradle-tooling-extension-v" + ver + ".jar") {
+ module("gradle-tooling-extension-v" + ver)
+ }
+ }
fileset(dir: "$home/plugins/gradle/lib") { include(name: "*.jar") }
}
@@ -640,7 +651,6 @@ def layoutAndroid(String androidHome) {
module("ddmlib")
module("dvlib")
module("draw9patch")
- module("lint-cli")
module("lint-api")
module("lint-checks")
module("ninepatch")
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index d857304e38f8..5b9240f121af 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -165,8 +165,7 @@ libraryLicense(name: "Apache Commons Codec", libraryName: "commons-codec", versi
libraryLicense(name: "Apache Commons Compress", libraryName: "commons-compress", version: "1.0", license: "Apache 2.0", url: "http://commons.apache.org/proper/commons-compress/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
libraryLicense(name: "Apache Commons Discovery", libraryName: "commons-discovery-0.4.jar", version: "0.4", license: "Apache 2.0", url: "http://jakarta.apache.org/commons/discovery/", licenseUrl: "http://commons.apache.org/license.html")
libraryLicense(name: "Apache Commons HTTPClient", libraryName: "http-client-3.1", version: "3.1&nbsp; (with patch by JetBrains)", license: "Apache 2.0", url: "http://hc.apache.org/httpclient-3.x")
-libraryLicense(name: "HttpComponents HttpClient", libraryName: "http-client", version: "4.1.1", license: "Apache 2.0", url: "http://hc.apache.org/httpcomponents-client-ga/index.html")
-libraryLicense(name: "HttpComponents HttpClient", libraryName: "httpclient-4.2.5", version: "4.2.5", license: "Apache 2.0", url: "http://hc.apache.org/httpcomponents-client-ga/index.html")
+libraryLicense(name: "HttpComponents HttpClient", libraryName: "http-client", version: "4.3.1", license: "Apache 2.0", url: "http://hc.apache.org/httpcomponents-client-ga/index.html")
libraryLicense(name: "Apache Commons Net", libraryName: "commons-net", version: "3.1", license: "Apache 2.0", url: "http://commons.apache.org/net/")
libraryLicense(name: "Apache Commons Logging", libraryName: "commons-logging", version: "1.1.1", license: "Apache 2.0", url: "http://commons.apache.org/logging/")
libraryLicense(name: "Apache Commons IO", libraryName: "commons-io-1.4.jar", version: "1.4", license: "Apache 2.0", url: "http://commons.apache.org/io/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt")
@@ -174,6 +173,7 @@ libraryLicense(name: "Apache Lucene", libraryName: "lucene-core-2.4.1.jar", vers
libraryLicense(name: "Apache Sanselan", libraryName: "Sanselan", version: "0.98", license: "Apache 2.0", url: "http://commons.apache.org/sanselan/")
libraryLicense(name: "Automaton", libraryName: "automaton.jar", version: "1.11", license: "BSD", url: "http://www.brics.dk/automaton/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php")
libraryLicense(name: "DTDParser", version: "1.13", license: "LGPL", url: "http://sourceforge.net/projects/dtdparser/", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1")
+libraryLicense(name: "Gant", version: "1.9.8", libraryName: "gant_groovy2.0-1.9.8.jar", license: "Apache 2.0", url: "http://gant.codehaus.org/", licenseUrl: "http://gant.codehaus.org/Licence")
libraryLicense(name: "Ganymed", version: "bundled with SVNKit", libraryName: "svnkit.jar", license: "BSD", url: "http://www.ganymed.ethz.ch/ssh2/", licenseUrl: "http://www.ganymed.ethz.ch/ssh2/LICENSE.txt")
libraryLicense(name: "sqljet", version: "bundled with SVNKit", libraryName: "sqljet.jar", license: "link (commercial license)", url: "http://sqljet.com", licenseUrl: "http://svnkit.com/license.html")
libraryLicense(name: "svnkit-javahl", version: "bundled with SVNKit", libraryName: "svnkit-javahl.jar", license: "link (commercial license)", url: "http://www.svnkit.com/", licenseUrl: "http://svnkit.com/license.html")
@@ -186,8 +186,8 @@ libraryLicense(name: "Antlr", libraryName: "antlr.jar", version: "3.1.3", licens
licenseUrl: "http://www.antlr.org/license.html")
libraryLicense(name: "Guava", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://ant.apache.org/license.html")
libraryLicense(name: "Guava", libraryName: "guava-tools", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://ant.apache.org/license.html")
-libraryLicense(name: "Groovy", version: "1.7.3", license: "Apache 2.0", url: "http://groovy.codehaus.org/")
-libraryLicense(name: "Gson", libraryName: "gson", license: "Apache 2.0", url: "http://code.google.com/p/google-gson/")
+libraryLicense(name: "Groovy", version: "2.2.1", license: "Apache 2.0", url: "http://groovy.codehaus.org/")
+libraryLicense(name: "Gson", version: "2.2.4", libraryName: "gson", license: "Apache 2.0", url: "http://code.google.com/p/google-gson/")
libraryLicense(name: "ini4j", libraryName: "ini4j-0.5.2-patched", version: "0.5.2 (with a patch by JetBrains)", license: "Apache 2.0", url: "http://ini4j.sourceforge.net/", attachedTo: "git4idea")
libraryLicense(name: "ISO RELAX", libraryName: "isorelax.jar", license: "MIT License", url: "http://sourceforge.net/projects/iso-relax/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
libraryLicense(name: "JavaCVS", attachedTo: "javacvs-src", version: "no version number available (with patches by JetBrains)", license: "Sun Public License", url: "http://javacvs.netbeans.org/library/", licenseUrl: "http://www.netbeans.org/about/legal/spl.html")
@@ -204,19 +204,19 @@ libraryLicense(name: "JGoodies Common", libraryName: "jgoodies-common", version:
libraryLicense(name: "JNA", libraryName: "jna", version: "3.4.0", license: "LGPL 2.1", url: "https://jna.dev.java.net/", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1.php")
libraryLicense(name: "JSch", libraryName: "JSch", version: "0.1.50", license: "BSD", url: "http://www.jcraft.com/jsch/", licenseUrl: "http://www.jcraft.com/jsch/LICENSE.txt")
libraryLicense(name: "JUnit", libraryName: "JUnit3", version: "3.8.1", license: "CPL 1.0", url: "http://junit.org/")
-libraryLicense(name: "JUnit", libraryName: "JUnit4", version: "4.8", license: "CPL 1.0", url: "http://junit.org/")
+libraryLicense(name: "JUnit", libraryName: "JUnit4", version: "4.11", license: "CPL 1.0", url: "http://junit.org/")
libraryLicense(name: "Log4j", libraryName: "Log4J", version: "1.2.17", license: "Apache 2.0", url: "http://logging.apache.org/log4j/1.2/index.html", licenseUrl: "http://logging.apache.org/license.html")
libraryLicense(name: "markdownj", libraryName: "markdownj", version: "0.4.2", license: "New BSD", url: "https://code.google.com/p/markdownj/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
libraryLicense(name: "Maven", version: "2.2.1", license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
libraryLicense(name: "plexus-util", version: "2.0.6", license: "Apache 2.0", url: "http://maven.apache.org/", libraryNames:['plexus-utils-2.0.6.jar'], licenseUrl: "http://apache.org/licenses/LICENSE-2.0")
-libraryLicense(name: "aether-api", version: "1.11", libraryNames: ["aether-api-1.11.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
+libraryLicense(name: "aether-api", version: "1.13.1", libraryNames: ["aether-api-1.13.1.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
libraryLicense(name: "aether-api-0.9.0.M2.jar", version: "0.9.0.M2", libraryNames: ["aether-api-0.9.0.M2.jar"], license: "Eclipse Public License v1.0", url: "http://nexus.sonatype.org/", licenseUrl: "http://www.eclipse.org/org/documents/epl-v10.html")
libraryLicense(name: "maven-2.2.1-uber", version: "2.2.1", libraryNames: ["maven-2.2.1-uber.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
-libraryLicense(name: "maven-artifact", version: "3.0.3", libraryNames: ["maven-artifact-3.0.3.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
-libraryLicense(name: "maven-core", version: "3.0.3", libraryNames: ["maven-core-3.0.3.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
+libraryLicense(name: "maven-artifact", version: "3.0.5", libraryNames: ["maven-artifact-3.0.5.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
+libraryLicense(name: "maven-core", version: "3.0.5", libraryNames: ["maven-core-3.0.5.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
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.3", license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
-libraryLicense(name: "Gradle", version: "1.8", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
+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.9", 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: "11.0.2", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://apache.org/licenses/LICENSE-2.0")
@@ -254,8 +254,8 @@ libraryLicense(name: "XML-RPC", libraryName: "XmlRPC", version: "2.0", license:
libraryLicense(name: "XStream", version: "1.4.3", license: "BSD", url: "http://xstream.codehaus.org/", licenseUrl: "http://xstream.codehaus.org/license.html")
libraryLicense(name: "YourKit Java Profiler", libraryName: "yjp-controller-api-redist.jar", version: "8.0.x", license: "link (commercial license)", url: "http://yourkit.com/", licenseUrl: "http://www.yourkit.com/purchase/license.html")
libraryLicense(name: "protobuf", version: "2.5.0", license: "New BSD", url: "http://code.google.com/p/protobuf/", licenseUrl: "http://code.google.com/p/protobuf/source/browse/trunk/COPYING.txt?r=367")
-libraryLicense(name: "Netty", libraryName: "Netty", version: "4.1.0.Alpha1", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
-libraryLicense(name: "Kryo", libraryName: "Kryo", version: "1.04", license: "New BSD License", url: "http://code.google.com/p/kryo/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php")
+libraryLicense(name: "Netty", libraryName: "Netty", version: "5.0.0.Alpha1", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
+libraryLicense(name: "Kryo", libraryName: "Kryo", version: "2.22", license: "New BSD License", url: "https://github.com/EsotericSoftware/kryo", licenseUrl: "https://github.com/EsotericSoftware/kryo/blob/master/license.txt")
libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "1.0.5", license: "Apache 2.0", url: "http://code.google.com/p/snappy-java/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
libraryLicense(name: "Cucumber-Java", libraryName: "cucumber-java", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
libraryLicense(name: "Cucumber-JVM", libraryName: "cucumber-jvm", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")
@@ -276,6 +276,10 @@ libraryLicense(name: "json-smart", libraryName: "json-smart-1.1.1.jar", version:
libraryLicense(name: "fxg-utils", libraryName: "fxg-utils", version: "4.9.1", license: "Apache 2.0", url: "http://flex.apache.org", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
libraryLicense(name: "jayatana", libraryName: "jayatana", version: "1.2.4", license: "MIT License", url: "https://code.google.com/p/java-swing-ayatana/", licenseUrl: "http://opensource.org/licenses/mit-license.php")
libraryLicense(name: "ForkJoin", version: "", license: "Creative Commons Public Domain Dedication", url: "http://gee.cs.oswego.edu/dl/concurrency-interest/index.html", licenseUrl: "http://creativecommons.org/publicdomain/zero/1.0/")
+libraryLicense(name: "ANTLR 4 Runtime", libraryName: "antlr-runtime-4.1.jar", version: "4.1", license: "BSD", url: "http://www.antlr.org", licenseUrl: "http://www.antlr.org/license.html")
+libraryLicense(name: "minlog", libraryName: "minlog-1.2.jar", version: "1.2", license: "BSD", url: "https://github.com/EsotericSoftware/minlog", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
+libraryLicense(name: "ReflectASM", libraryName: "reflectasm-1.0.7.jar", version: "1.0.7", license: "BSD", url: "https://github.com/EsotericSoftware/reflectasm", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause")
+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")
jetbrainsLibrary("JPS")
jetbrainsLibrary("Maven Embedder")
jetbrainsLibrary("tcServiceMessages")
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 07dfd61bdb64..a48f2cea9832 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -750,12 +750,14 @@ binding.setVariable("buildWinLauncher", { String ch, String inputPath, String ou
projectBuilder.stage("winLauncher")
if (pathsSelector != null) {
- ant.replace(file: launcherProperties) {
- replacefilter(token: "__PRODUCT_PATHS_SELECTOR__", value: pathsSelector)
- }
+ def paths = getProperty("paths")
+ def launcherPropertiesTemp = "${paths.sandbox}/launcher.properties"
+ copyAndPatchFile(launcherProperties, launcherPropertiesTemp, ["PRODUCT_PATHS_SELECTOR": pathsSelector])
+ launcherProperties = launcherPropertiesTemp
}
ant.java(classname: "com.pme.launcher.LauncherGeneratorMain", fork: "true") {
+ sysproperty(key: "java.awt.headless", value: "true")
arg(value: inputPath)
arg(value: appInfo)
arg(value: "$ch/native/WinLauncher/WinLauncher/resource.h")
diff --git a/build/update.sh b/build/update.sh
index 7fdd5029aec8..b58f117a8315 100755
--- a/build/update.sh
+++ b/build/update.sh
@@ -24,7 +24,7 @@ echo "Updating $WORK_IDEA_HOME from compiled classes in $DEV_IDEA_HOME"
ANT_HOME="$DEV_IDEA_HOME/lib/ant"
ANT_CLASSPATH="$DEV_IDEA_HOME/build/lib/gant/lib/jps.jar"
java -Xms64m -Xmx512m -Dant.home="$ANT_HOME" -classpath "$ANT_HOME/lib/ant-launcher.jar" org.apache.tools.ant.launch.Launcher \
- -lib "$ANT_CLASSPATH" -f $DEV_IDEA_HOME/build/update.xml $TARGET
+ -lib "$ANT_CLASSPATH" -f "$DEV_IDEA_HOME/build/update.xml" $TARGET
if [ "$?" != "0" ]; then
echo "Update failed; work IDEA build not modified."
@@ -32,17 +32,17 @@ if [ "$?" != "0" ]; then
exit 2
fi
-rm -rf $WORK_IDEA_HOME/lib
-rm -rf $WORK_IDEA_HOME/plugins
+rm -rf "$WORK_IDEA_HOME/lib"
+rm -rf "$WORK_IDEA_HOME/plugins"
-cp -R $DEV_IDEA_HOME/out/deploy/* $WORK_IDEA_HOME
+cp -R "$DEV_IDEA_HOME/out/deploy/"* "$WORK_IDEA_HOME"
OS_TYPE=`uname -s`
if [ "$OS_TYPE" = "Linux" ]; then
cp -a $DEV_IDEA_HOME/bin/linux/*.so $WORK_IDEA_HOME/bin
cp -a $DEV_IDEA_HOME/bin/linux/fsnotifier* $WORK_IDEA_HOME/bin
elif [ "$OS_TYPE" = "Darwin" ]; then
- cp -a $DEV_IDEA_HOME/bin/mac/*.jnilib $WORK_IDEA_HOME/bin
- cp -a $DEV_IDEA_HOME/bin/mac/fsnotifier $WORK_IDEA_HOME/bin
- cp -a $DEV_IDEA_HOME/bin/mac/restarter $WORK_IDEA_HOME/bin
+ cp -a "$DEV_IDEA_HOME/bin/mac/"*.jnilib "$WORK_IDEA_HOME/bin"
+ cp -a "$DEV_IDEA_HOME/bin/mac/fsnotifier" "$WORK_IDEA_HOME/bin"
+ cp -a "$DEV_IDEA_HOME/bin/mac/restarter" "$WORK_IDEA_HOME/bin"
fi
diff --git a/build/update.xml b/build/update.xml
index b3a49ccffe80..e06cfce3ee93 100644
--- a/build/update.xml
+++ b/build/update.xml
@@ -43,6 +43,7 @@
</java>
<java classname="com.intellij.util.io.zip.ReorderJarsMain" fork="true">
+ <jvmarg line="-Djava.awt.headless=true"/>
<arg value="${build}/order.txt"/>
<arg value="@{deploy}"/>
<arg value="@{deploy}"/>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 12:17:12 +0000