Get full/core versions of IDEA using update_dependencies.xml. Don't u…

…se plugin SDK anymore.
CookerMa · Jan 20, 2012 · f541cce · f541cce
1 parent 8ec8fa4
commit f541cce
Show file tree

Hide file tree

Showing 13 changed files with 96 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ examples/.idea/workspace.xml
 confluence/target
 confluence/target
 out
+ideaSDK
 .idea/dictionaries/yozh.xml
 .idea/codeStyleSettings.xml
 .idea/workspace.xml

diff --git a/.idea/ant.xml b/.idea/ant.xml
diff --git a/.idea/libraries/idea_full.xml b/.idea/libraries/idea_full.xml
diff --git a/.idea/libraries/intellij_core.xml b/.idea/libraries/intellij_core.xml
diff --git a/.idea/runConfigurations/IDEA.xml b/.idea/runConfigurations/IDEA.xml
diff --git a/compiler/backend/backend.iml b/compiler/backend/backend.iml
@@ -5,12 +5,13 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="library" name="asm" level="project" />
     <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
   </component>
 </module>
 
diff --git a/compiler/cli/cli.iml b/compiler/cli/cli.iml
@@ -5,13 +5,14 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="stdlib" />
     <orderEntry type="module" module-name="jet.as.java.psi" />
+    <orderEntry type="library" name="intellij-core" level="project" />
   </component>
 </module>
 
diff --git a/compiler/frontend.java/frontend.java.iml b/compiler/frontend.java/frontend.java.iml
@@ -5,10 +5,11 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="stdlib" />
+    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
   </component>
 </module>
 
diff --git a/compiler/frontend/frontend.iml b/compiler/frontend/frontend.iml
@@ -5,8 +5,9 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="intellij-core" level="project" />
   </component>
 </module>
 
diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml
@@ -5,13 +5,14 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="stdlib" />
     <orderEntry type="module" module-name="cli" />
+    <orderEntry type="library" name="idea-full" level="project" />
   </component>
 </module>
 
diff --git a/grammar/grammar.iml b/grammar/grammar.iml
@@ -5,8 +5,9 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="intellij-core" level="project" />
   </component>
 </module>
 
diff --git a/idea/idea.iml b/idea/idea.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="PLUGIN_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/META-INF/plugin.xml" />
   <component name="EclipseModuleManager">
     <libelement value="jar://$MODULE_DIR$/../lib/asm-util-3.3.1.jar!/" />
@@ -15,14 +15,15 @@
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="IDEA 10.x" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="backend" />
     <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="frontend.java" />
     <orderEntry type="module" module-name="stdlib" />
     <orderEntry type="module" module-name="compiler-tests" />
     <orderEntry type="module" module-name="jet.as.java.psi" />
+    <orderEntry type="library" name="idea-full" level="project" />
   </component>
 </module>
 
diff --git a/update_dependencies.xml b/update_dependencies.xml
@@ -0,0 +1,34 @@
+<project name="Update Dependencies" default="update">
+    <property name="build.zip" value="ideaIC-112.SNAPSHOT.win.zip"/>
+
+    <target name="update">
+        <execute_update/>
+    </target>
+
+    <target name="jb_update">
+        <execute_update teamcity="http://buildserver.labs.intellij.net" teamcity.build="bt662"/>
+    </target>
+
+    <macrodef name="execute_update">
+        <attribute name="teamcity" default="http://teamcity.jetbrains.com"/>
+        <attribute name="teamcity.build" default="bt343"/>
+        <sequential>
+            <property name="core" value="ideaSDK/core"/>
+            <property name="tc" value="@{teamcity}/guestAuth/repository/download/@{teamcity.build}/.lastSuccessful"/>
+            <delete dir="ideaSDK" failonerror="false"/>
+            <mkdir dir="${core}"/>
+            <get src="${tc}/core/intellij-core.jar" dest="${core}"/>
+            <get src="${tc}/core/annotations.jar" dest="${core}"/>
+            <get src="${tc}/core/asm.jar" dest="${core}"/>
+            <get src="${tc}/core/asm-commons.jar" dest="${core}"/>
+            <get src="${tc}/core/cli-10.jar" dest="${core}"/>
+            <get src="${tc}/core/guava-r09.jar" dest="${core}"/>
+            <get src="${tc}/core/picocontainer.jar" dest="${core}"/>
+            <get src="${tc}/core/trove4j.jar" dest="${core}"/>
+
+            <get src="${tc}/${build.zip}" dest="ideaSDK" />
+            <unzip src="ideaSDK/${build.zip}" dest="ideaSDK"/>
+            <delete file="ideaSDK/${build.zip}"/>
+        </sequential>
+    </macrodef>
+</project>