Merge 'jetbrains-master-mirror' into studio-master-dev

9 files changed, 169 insertions, 4 deletions

diff --git a/README.md b/README.md
index 8ffec06..fdbb3b3 100644
--- a/README.md
+++ b/README.md
@@ -48,11 +48,12 @@ make
 
 Install:
 
-* Cygwin x64 (http://www.cygwin.com/)
-  Required packages (binutils, cpio, diffutils, file, gawk, gcc-core, m4, unzip, zip)
+* [Cygwin x64](http://www.cygwin.com/)
+  Required packages (binutils, cpio, diffutils, file, gawk, gcc-core, make, m4, unzip, zip)
 * Windows SDK 7.1 offline installer [GRMSDKX_EN_DVD.iso](https://download.microsoft.com/download/F/1/0/F10113F5-B750-4969-A255-274341AC6BCE/GRMSDKX_EN_DVD.iso)
 Run Setup\SDKSetup 
 * Visual Studio Express 2010 offline installer [VS2010Express1.iso](http://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso)
+  * [Virtual CloneDrive](http://www.elby.ch/products/vcd.html) may help to mount ISO images
 * [DirectX 9.0 SDK](http://www.microsoft.com/en-us/download/details.aspx?id=6812)
 * [Java 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
 
@@ -108,6 +109,9 @@ and put Xcode.app into /Applications/Xcode4
 
 _The latest XCode can be used, but you need to run make with COMPILER_WARNINGS_FATAL=false_
 
+Command Line Tools
+* Download and install Command Line Tools via XCode Preferences / Downloads or from https://developer.apple.com (for example, [Command Line Tools, April 2014](https://developer.apple.com/downloads/download.action?path=Developer_Tools/command_line_tools_os_x_mountain_lion_for_xcode__april_2014/command_line_tools_for_osx_mountain_lion_april_2014.dmg) for OS X Mountain Lion).
+
 Freetype
 * Install [XQuartz](https://dl.bintray.com/xquartz/downloads/XQuartz-2.7.9.dmg) or build Freetype from 
  [sources](https://www.freetype.org/download.html)
@@ -123,11 +127,14 @@ Configure and build jdk
 ```
 export MACOSX_DEPLOYMENT_TARGET=10.8
 cd /path_to_jdk8/
-bash configure --with-xcode-path=/Applications/Xcode4/Xcode4.app --with-freetype=/path_to_freetype
+bash configure --with-xcode-path=/Applications/Xcode4/Xcode4.app --with-freetype=/opt/X11/lib --with-freetype-include=/usr/X11/include/freetype2
 make images
 ```
 or
 ```
 make COMPILER_WARNINGS_FATAL=false images
 ```
-for the latest XCode
\ No newline at end of file
+for the latest XCode
+
+##Contribution
+We will be happy to receive your pull requests. Before you submit one, please sign our Contributor License Agreement (CLA)  https://www.jetbrains.com/agreements/cla/ 
diff --git a/idea/java/.idea/gradle.xml b/idea/java/.idea/gradle.xml
new file mode 100644
index 0000000..a5c3ae1
--- /dev/null
+++ b/idea/java/.idea/gradle.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="1.8" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/idea/java/.idea/misc.xml b/idea/java/.idea/misc.xml
new file mode 100644
index 0000000..c221fde
--- /dev/null
+++ b/idea/java/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="JBSDK" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/idea/java/.idea/modules.xml b/idea/java/.idea/modules.xml
new file mode 100644
index 0000000..2808ed4
--- /dev/null
+++ b/idea/java/.idea/modules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/java.iml" filepath="$PROJECT_DIR$/.idea/modules/java.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/java_main.iml" filepath="$PROJECT_DIR$/.idea/modules/java_main.iml" group="java" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/java_test.iml" filepath="$PROJECT_DIR$/.idea/modules/java_test.iml" group="java" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/idea/java/.idea/modules/java.iml b/idea/java/.idea/modules/java.iml
new file mode 100644
index 0000000..39a2a59
--- /dev/null
+++ b/idea/java/.idea/modules/java.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="java" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../..">
+      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/../../build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/idea/java/.idea/runConfigurations/make_clean.xml b/idea/java/.idea/runConfigurations/make_clean.xml
new file mode 100644
index 0000000..bce98e6
--- /dev/null
+++ b/idea/java/.idea/runConfigurations/make_clean.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="make clean" type="GroovyScriptRunConfiguration" factoryName="Groovy">
+    <module name="java" />
+    <setting name="path" value="file://$PROJECT_DIR$/build.gradle" />
+    <setting name="vmparams" value="" />
+    <setting name="params" value="-q make_clean" />
+    <setting name="workDir" value="file://$PROJECT_DIR$" />
+    <setting name="debug" value="false" />
+    <method>
+      <option name="Make" enabled="false" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/idea/java/.idea/runConfigurations/make_images.xml b/idea/java/.idea/runConfigurations/make_images.xml
new file mode 100644
index 0000000..ec5fbae
--- /dev/null
+++ b/idea/java/.idea/runConfigurations/make_images.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="make images" type="GroovyScriptRunConfiguration" factoryName="Groovy">
+    <module name="java" />
+    <setting name="path" value="file://$PROJECT_DIR$/build.gradle" />
+    <setting name="vmparams" value="" />
+    <setting name="params" value="-q make_images" />
+    <setting name="workDir" value="file://$PROJECT_DIR$" />
+    <setting name="debug" value="false" />
+    <method>
+      <option name="Make" enabled="false" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/idea/java/.idea/vcs.xml b/idea/java/.idea/vcs.xml
new file mode 100644
index 0000000..ff8494b
--- /dev/null
+++ b/idea/java/.idea/vcs.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../../corba" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../../hotspot" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../../jaxp" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../../jaxws" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../../jdk" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../../nashorn" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/idea/java/build.gradle b/idea/java/build.gradle
new file mode 100644
index 0000000..a8a40cb
--- /dev/null
+++ b/idea/java/build.gradle
@@ -0,0 +1,77 @@
+apply plugin: 'java'
+
+import org.gradle.internal.os.OperatingSystem
+
+repositories {
+    mavenCentral()
+}
+
+configurations {
+    antClasspath
+}
+
+def test_jvm = {
+    if (OperatingSystem.current().isMacOsX()) {
+        file('../../build/macosx-x86_64-normal-server-release/images/j2sdk-bundle/jdk1.8.0.jdk/Contents/Home/bin/java').absolutePath
+    } else if (OperatingSystem.current().isLinux()) {
+        file('../../build/linux-x86_64-normal-server-release/images/j2sdk-image/bin/java').absolutePath
+    } else {
+        file('../../build/windows-x86_64-normal-server-release/images/j2sdk-image/bin/java.exe').absolutePath
+    }
+}
+
+dependencies {
+    antClasspath 'ant-contrib:ant-contrib:20020829', 'org.apache.ant:ant-junit:1.8.1'
+    testCompile('junit:junit:4.12'){
+        exclude group: 'org.hamcrest'
+    }
+    testCompile 'org.hamcrest:hamcrest-library:1.3'
+}
+
+
+// add additional jars to the AntBuilder classpath for use within the imported build.
+ClassLoader antClassLoader = org.apache.tools.ant.Project.class.classLoader
+configurations.antClasspath.each { File f ->
+    antClassLoader.addURL(f.toURI().toURL())
+}
+
+ant.importBuild('../../jdk/idea/java/tests/perf_tests.xml') { antTargetName ->
+    'jdk-perf-' + antTargetName
+}
+
+ant.properties.test_jvm = test_jvm()
+
+println ant.properties.test_jvm
+sourceSets.main.java.srcDirs =
+        ["../../jdk/src/share/classes",
+         "../../jdk/src/macosx/classes",
+         "../../jdk/src/windows/classes",
+         "../../jdk/src/solaris/classes"
+        ]
+
+
+sourceSets.test.java.srcDirs = ["../../jdk/idea/java/tests/src"]
+
+def buildDir = project.buildscript.sourceFile.parentFile.parentFile.parentFile
+
+task make_images << {
+    def pb = new ProcessBuilder().command("make", "-C", buildDir.absolutePath,
+            " COMPILER_WARNINGS_FATAL=false", "images")
+    def proc = pb.redirectErrorStream(true).start()
+    proc.inputStream.eachLine {println it}
+    assert proc.waitFor() == 0
+}
+
+task make_clean << {
+    def pb = new ProcessBuilder().command("make", "-C", buildDir.absolutePath,
+            " COMPILER_WARNINGS_FATAL=false", "clean")
+    def proc = pb.redirectErrorStream(true).start()
+    proc.inputStream.eachLine {println it}
+    assert proc.waitFor() == 0
+}
+
+tasks.compileJava.enabled = false
+tasks.compileTestJava.dependsOn.clear()
+classes.dependsOn.clear()
+classes.dependsOn tasks.make_images, tasks.compileTestJava
+tasks.cleanClasses.dependsOn tasks.make_clean