Snapshot aea001abfc1b38fec3a821bcd5174cc77dc75787 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: Icdea2a2bd7ad43b4d05967b1f0479db3bda1c93c

6 files changed, 24 insertions, 19 deletions

diff --git a/build/conf/ideaCE.properties b/build/conf/ideaCE.properties
index 81afaed35094..8c86bf315b02 100644
--- a/build/conf/ideaCE.properties
+++ b/build/conf/ideaCE.properties
@@ -1,11 +1,13 @@
 
 #---------------------------------------------------------------------
-# IDE copies library jars to prevent their locking. If copying is not desirable, specify "true"
+# IDEA can copy library .jar files to prevent their locking.
+# By default this behavior is enabled on Windows and disabled on other platforms.
+# Uncomment this property to override.
 #---------------------------------------------------------------------
-idea.jars.nocopy=false
+# idea.jars.nocopy=false
 
 #---------------------------------------------------------------------
-# The VM option value to be used start the JVM in debug mode.
+# The VM option value to be used to start a JVM in debug mode.
 # Some JREs define it in a different way (-XXdebug in Oracle VM)
 #---------------------------------------------------------------------
 idea.xdebug.key=-Xdebug
diff --git a/build/conf/mac/Contents/Info.plist b/build/conf/mac/Contents/Info.plist
index b57f2027c163..0603a2567e3e 100644
--- a/build/conf/mac/Contents/Info.plist
+++ b/build/conf/mac/Contents/Info.plist
@@ -39,7 +39,7 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleGetInfoString</key>
-    <string>@@bundle_name@@ @@version@@, build @@build@@. Copyright @@company_name@@, (c) @@min_year@@-@@max_year@@</string>
+    <string>@@bundle_name@@ @@version@@, build @@build@@. Copyright JetBrains s.r.o., (c) 2000-@@year@@</string>
     <key>CFBundleShortVersionString</key>
     <string>@@version@@</string>
     <key>CFBundleVersion</key>
diff --git a/build/scripts/common_tests.gant b/build/scripts/common_tests.gant
index 466446b0bb92..b0676182a637 100644
--- a/build/scripts/common_tests.gant
+++ b/build/scripts/common_tests.gant
@@ -27,7 +27,7 @@ target(compile: "Compile project") {
   }
 
   loadProject()
-  projectBuilder.useInProcessJavac = true
+  projectBuilder.useInProcessJavac = false
   projectBuilder.targetFolder = out
   projectBuilder.cleanOutput()
   projectBuilder.buildAll()
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 7e8e0647b85e..4ac31f92092b 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -56,6 +56,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "testFramework-java",
     "debugger-openapi",
     "compiler-openapi",
+    "remote-servers-api",
     "dom-openapi",
     "execution-openapi",
     "jsp-openapi",
@@ -64,6 +65,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
   //noinspection GroovyAssignabilityCheck
   List<String> implementationModules = [platformImplementationModules,
     "compiler-impl",
+    "remote-servers-impl",
     "debugger-impl",
     "dom-impl",
     "execution-impl",
@@ -78,6 +80,9 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
     "platform-main",
     "testFramework",
     "tests_bootstrap",
+    "InspectionGadgetsAnalysis",
+    "InspectionGadgetsPlugin",
+    "IntentionPowerPackPlugin",
           ].flatten()
 
   ant.patternset(id: "resources.included") {
@@ -246,12 +251,6 @@ public def layoutCommunityPlugins(String home) {
         module("ant-jps-plugin")
       }
     }
-    layoutPlugin("InspectionGadgets", "InspectionGadgetsPlugin") {
-      jar("InspectionGadgetsAnalysis.jar") {
-        module("InspectionGadgetsAnalysis")
-      }
-    }
-    layoutPlugin("IntentionPowerPack", "IntentionPowerPackPlugin")
     layoutPlugin("ToString", "generate-tostring", "toString")
     layoutPlugin("uiDesigner", "ui-designer", "uiDesigner") {
       dir("jps") {
@@ -695,6 +694,7 @@ def layoutCommunityJps(String home, String target) {
       include(name: "optimizedFileManager.jar")
       include(name: "log4j.jar")
       include(name: "jgoodies-forms.jar")
+      include(name: "ecj*.jar")
     }
     dir("test") {
       jar("jps-build-test.jar") {
@@ -767,6 +767,7 @@ def layout_core_upsource(String home, String target) {
       module("InspectionGadgetsAnalysis")
       module("xml-psi-api")
       module("xml-psi-impl")
+      module("resources") // IdeaPlugin.xml
     }
 
     jar("annotations.jar") {
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index e387e58bab4c..3f8679207ff1 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -166,6 +166,7 @@ libraryLicense(name: "Apache Commons Compress", libraryName: "commons-compress",
 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: "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 Lucene", libraryName: "lucene-core-2.4.1.jar", version: "2.4.1", license: "Apache 2.0", url: "http://lucene.apache.org/java")
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 7a5798bdd4c4..8df99132186e 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -52,18 +52,18 @@ binding.setVariable("isEap", {
   return "true" == p("component.version.eap")
 })
 
-binding.setVariable("mem32", "-server -Xms128m -Xmx512m -XX:MaxPermSize=250m -XX:ReservedCodeCacheSize=64m -XX:+UseCodeCacheFlushing -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50")
-binding.setVariable("mem64", "-Xms128m -Xmx750m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=96m -XX:+UseCodeCacheFlushing -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50")
-binding.setVariable("common_vmoptions", "-ea -Dsun.io.useCanonCaches=false -Djava.net.preferIPv4Stack=true")
+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("common_vmoptions", "-ea -Dsun.io.useCanonCaches=false -Djava.net.preferIPv4Stack=true " +
+                                        "-XX:+UseCodeCacheFlushing -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50")
 
 binding.setVariable("vmOptions", { "$common_vmoptions ${isEap() ? '-XX:+HeapDumpOnOutOfMemoryError' : ''}".trim() })
 binding.setVariable("vmOptions32", { "$mem32 ${vmOptions()}".trim() })
 binding.setVariable("vmOptions64", { "$mem64 ${vmOptions()}".trim() })
 
 binding.setVariable("yjpOptions", { String systemSelector, String platformSuffix = "" ->
-  "-agentlib:yjpagent$platformSuffix=disablej2ee,disablealloc,disabletracing,onlylocal,builtinprobes=none,disableexceptiontelemetry,sessionname=$systemSelector".trim()
+  "-agentlib:yjpagent$platformSuffix=disablej2ee,disablealloc,disabletracing,onlylocal,builtinprobes=none,disableexceptiontelemetry,delay=10000,sessionname=$systemSelector".trim()
 })
-
 binding.setVariable("vmOptions32yjp", { String systemSelector ->
   "${vmOptions32()} ${yjpOptions(systemSelector)}".trim()
 })
@@ -478,8 +478,8 @@ binding.setVariable("winVMOptions", { String target, String system_selector, Str
 })
 
 binding.setVariable("unixVMOptions", { String target, String name ->
-  ant.echo(file: "$target/bin/${name}.vmoptions", message: vmOptions32().replace(' ', '\n'))
-  ant.echo(file: "$target/bin/${name}64.vmoptions", message: vmOptions64().replace(' ', '\n'))
+  ant.echo(file: "$target/bin/${name}.vmoptions", message: "${vmOptions32()} -Dawt.useSystemAAFontSettings=lcd".trim().replace(' ', '\n'))
+  ant.echo(file: "$target/bin/${name}64.vmoptions", message: "${vmOptions64()} -Dawt.useSystemAAFontSettings=lcd".trim().replace(' ', '\n'))
   ant.fixcrlf(srcdir: "$target/bin", includes: "*.vmoptions", eol: "unix")
 })
 
@@ -732,7 +732,8 @@ private void fixIdeaPropertiesEol(List paths, String eol) {
   }
 }
 
-binding.setVariable("buildWinLauncher", { String ch, String inputPath, String outputPath, String appInfo, String launcherProperties, String pathsSelector, List resourcePaths ->
+binding.setVariable("buildWinLauncher", { String ch, String inputPath, String outputPath, String appInfo,
+                                          String launcherProperties, String pathsSelector, List resourcePaths ->
   projectBuilder.stage("winLauncher")
 
   File launcherPropertiesTempFile = null;