From 611a10023581937ce1f3e32e9089261f07427138 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Thu, 9 Aug 2012 14:54:41 +0400
Subject: [PATCH] Always place "since" and "until" attributes in plugin.xml for
 early notification about compatibility problems

---
 idea/src/META-INF/plugin.xml                |  2 ++
 pluginPublisher/TeamCityPluginPublisher.xml | 10 +++++-----
 pluginPublisher/idea-version-tag.xsl        | 19 -------------------
 3 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 pluginPublisher/idea-version-tag.xsl

diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 3dc40e552d9..08a696aa051 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,6 +6,8 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
 
+  <idea-version since-build="ideaIC-120.305" until-build="ideaIC-120.9999" />
+
   <depends optional="true">JUnit</depends>
 
   <project-components>
diff --git a/pluginPublisher/TeamCityPluginPublisher.xml b/pluginPublisher/TeamCityPluginPublisher.xml
index f426bae7ab9..42077bada40 100644
--- a/pluginPublisher/TeamCityPluginPublisher.xml
+++ b/pluginPublisher/TeamCityPluginPublisher.xml
@@ -60,11 +60,11 @@
     <unzip src="${plugin.path}" dest="${basedir}/plugin"/>
     <unzip src="${basedir}/plugin/Kotlin/lib/kotlin-plugin.jar" dest="${basedir}/plugin/jar"/>
     <move file="${basedir}/plugin/jar/META-INF/plugin.xml" tofile="${basedir}/plugin/jar/META-INF/plugin.xml.src"/>
-    <xslt in="${basedir}/plugin/jar/META-INF/plugin.xml.src" out="${basedir}/plugin/jar/META-INF/plugin.xml"
-          style="${basedir}/idea-version-tag.xsl">
-      <param name="idea-since-version" expression="${idea.version}"/>
-      <param name="idea-until-version" expression="IC-117.9999" /> <!-- TODO: Change to valid dynamic value -->
-    </xslt>
+
+    <!-- Replace until version with the version plugin is going to be verified:
+         match: until-build=\"[^\"]*\" -->
+    <replaceregexp file="${basedir}/plugin/jar/META-INF/plugin.xml" match="until-build=\&#34;[^\&#34;]*\&#34;" replace="until-build=&#34;${idea.version}&#34;"/>
+
     <zip destfile="${basedir}/plugin/Kotlin/lib/kotlin-plugin.jar" update="true" basedir="${basedir}/plugin/jar" includes="META-INF/plugin.xml" />
     <delete file="${plugin.path}"/>
     <zip destfile="${plugin.path}" basedir="${basedir}/plugin" includes="Kotlin/**/*"/>
diff --git a/pluginPublisher/idea-version-tag.xsl b/pluginPublisher/idea-version-tag.xsl
deleted file mode 100644
index dd588808ff7..00000000000
--- a/pluginPublisher/idea-version-tag.xsl
+++ /dev/null
@@ -1,19 +0,0 @@
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:output omit-xml-declaration="yes" indent="yes" />
-  <xsl:param name="idea-since-version" />
-  <xsl:param name="idea-until-version" />
-
-
-  <xsl:template match="node()|@*" name="identity">
-    <xsl:copy>
-      <xsl:apply-templates select="node()|@*"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="vendor">
-    <xsl:call-template name="identity"/>
-    <xsl:text>
-
-  </xsl:text><idea-version since-build="{$idea-since-version}" until-build="{$idea-until-version}"/>
-  </xsl:template>
-    </xsl:stylesheet>
\ No newline at end of file