From a1b4d4c1a30776a60a0b15095163c432aaee0894 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Mon, 30 Jan 2012 16:50:47 +0400
Subject: [PATCH] Make version writing a separate build step

---
 .idea/artifacts/KotlinPlugin.xml |  2 +-
 jdk-headers/.idea/misc.xml       |  3 +++
 plugin_pre_build.xml             | 19 ++++++-------------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index dfe1395e284..63e13e27027 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -8,7 +8,7 @@
       </options>
     </properties>
     <properties id="ant-preprocessing">
-      <options enabled="true">
+      <options>
         <file>file://$PROJECT_DIR$/plugin_pre_build.xml</file>
         <target>writeVersionToPluginXml</target>
       </options>
diff --git a/jdk-headers/.idea/misc.xml b/jdk-headers/.idea/misc.xml
index 97320410eec..3b74f3607cd 100644
--- a/jdk-headers/.idea/misc.xml
+++ b/jdk-headers/.idea/misc.xml
@@ -3,6 +3,9 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="ProjectResources">
+    <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
diff --git a/plugin_pre_build.xml b/plugin_pre_build.xml
index cf9be3bd396..bf2a52ba429 100644
--- a/plugin_pre_build.xml
+++ b/plugin_pre_build.xml
@@ -1,24 +1,17 @@
-<project name="Kotlin Plugin Pre-build Step">
+<project name="Write Plugin Version to plugin.xml">
 
-    <property name="artifact.output.path" value="${basedir}/out/artifacts/KotlinPlugin"/>
     <property name="build.number" value="snapshot"/>
 
-    <!-- Sets ${running.locally} to true if the ${build.number} is "snapshot" -->
-    <target name="checkLocal">
-        <condition property="running.locally">
-            <equals arg1="${build.number}" arg2="snapshot"/>
-        </condition>
-    </target>
-
-    <target name="writeVersionToPluginXml" depends="checkLocal" unless="running.locally">
-        <copy file="idea/src/META-INF/plugin.xml" tofile="idea/src/META-INF/plugin.xml-version">
+    <target name="writeVersionToPluginXml">
+        <property name="plugin.xml" value="idea/src/META-INF/plugin.xml"/>
+        <copy file="${plugin.xml}" tofile="${plugin.xml}-version">
             <filterchain>
                 <replacetokens>
                     <token key="snapshot" value="${build.number}"/>
                 </replacetokens>
             </filterchain>
         </copy>
-        <copy file="idea/src/META-INF/plugin.xml-version" tofile="idea/src/META-INF/plugin.xml" overwrite="true"/>
-        <delete file="idea/src/META-INF/plugin.xml-version" quiet="true"/>
+        <copy file="${plugin.xml}-version" tofile="${plugin.xml}" overwrite="true"/>
+        <delete file="${plugin.xml}-version" quiet="true"/>
     </target>
 </project>