Separate targets for writing compiler version and plugin version to template files

TeamCityBuild.xml

@@ -72,7 +72,17 @@
         </sequential>
     </macrodef>
 
-    <target name="writeVersionToTemplateFiles">
+    <target name="writeCompilerVersionToTemplateFile">
+        <mkdir dir="${version_substitute_dir}"/>
+
+        <substituteVersionInFile
+            target.file="${compiler.version.java}"
+            target.file.bk="${compiler.version.java.bk}"
+            target.file.versioned="${compiler.version.java.versioned}"
+            test.string="public static final String VERSION = &quot;@snapshot@&quot;;"/>
+    </target>
+
+    <target name="writePluginVersionToTemplateFile">
         <mkdir dir="${version_substitute_dir}"/>
 
         <substituteVersionInFile
@@ -81,13 +91,6 @@
             target.file.versioned="${plugin.xml.versioned}"
             test.string="&lt;version&gt;@snapshot@&lt;/version&gt;"
             version="${plugin.xml.version.number}"/>
-
-        <substituteVersionInFile
-                target.file="${compiler.version.java}"
-                target.file.bk="${compiler.version.java.bk}"
-                target.file.versioned="${compiler.version.java.versioned}"
-                test.string="public static final String VERSION = &quot;@snapshot@&quot;;"/>
-
     </target>
 
     <target name="revertTemplateFiles">
@@ -97,7 +100,7 @@
         <delete dir="${version_substitute_dir}" quiet="true"/>
     </target>
 
-    <target name="pre_build" depends="writeVersionToTemplateFiles, cleanupArtifacts"/>
+    <target name="pre_build" depends="writeCompilerVersionToTemplateFile, writePluginVersionToTemplateFile, cleanupArtifacts"/>
 
     <target name="zipArtifacts">
         <macrodef name="zipPlugin">