Fix build files to hold the MPS/IntelliJ version

build-ide.xml

@@ -4,7 +4,7 @@
   <property name="build.tmp" location="${build.dir}/tmp/de.citec.json-ide" />
   <property name="build.layout" location="${build.dir}/artifacts/de.citec.json-ide" />
   <property name="path__mps" location="" />
-  <property name="current_version" value="1.0" />
+  <property name="current_version" value="1.0.1" />
   <property name="artifacts.de.citec.json-mps" location="${build.dir}/artifacts/de.citec.json-mps" />
   <property file="${artifacts.de.citec.json-mps}/build.properties" prefix="import.de.citec.json-mps" />
   <property name="de.citec.json-mps.current_version" value="${import.de.citec.json-mps.de.citec.json-mps.current_version}" />

build-plugin-intellij.xml

@@ -7,7 +7,8 @@
   <property name="path__idea" location="" />
   <property name="path__plugins" location="${path__mps}/plugins" />
   <property name="path__plaintextgen" location="" />
-  <property name="current_version" value="1.0" />
+  <property name="current_version" value="1.0.1" />
+  <loadfile property="intellij_version" srcFile="${path__idea}/build.txt" />
   <property name="artifacts.mps" location="${path__mps}" />
   <property name="artifacts.mpsPlugin" location="${path__plugins}" />
   <property name="artifacts.com.dslfoundry.plaintextgen" location="${path__plaintextgen}" />
@@ -43,10 +44,10 @@
 
   <target name="assemble" depends="classes, declare-mps-tasks">
     <mkdir dir="${build.layout}" />
-    <mkdir dir="${build.tmp}/default/de.citec.json-plugin-intellij.zip" />
-    <mkdir dir="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json" />
-    <mkdir dir="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json/META-INF" />
-    <echoxml file="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json/META-INF/plugin.xml">
+    <mkdir dir="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip" />
+    <mkdir dir="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json" />
+    <mkdir dir="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json/META-INF" />
+    <echoxml file="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json/META-INF/plugin.xml">
       <idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
         <id>de.citec.json</id>
         <name>JSON Language</name>
@@ -62,8 +63,8 @@
         </extensions>
       </idea-plugin>
     </echoxml>
-    <mkdir dir="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json/languages" />
-    <mkdir dir="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json/languages/de.citec.json" />
+    <mkdir dir="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json/languages" />
+    <mkdir dir="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json/languages/de.citec.json" />
     <mkdir dir="${build.tmp}/default/de.citec.json.jar" />
     <mkdir dir="${build.tmp}/default/de.citec.json.jar/META-INF" />
     <echoxml file="${build.tmp}/default/de.citec.json.jar/META-INF/module.xml">
@@ -90,7 +91,7 @@
         <sources jar="de.citec.json-src.jar" descriptor="de.citec.json.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json/languages/de.citec.json/de.citec.json.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json/languages/de.citec.json/de.citec.json.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/de.citec.json" />
       <fileset dir="${basedir}/languages/de.citec.json" includes="icons/**, resources/**" />
       <fileset dir="${basedir}/languages/de.citec.json/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -118,7 +119,7 @@
         <sources jar="de.citec.json-src.jar" descriptor="de.citec.json.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json/languages/de.citec.json/de.citec.json-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json/languages/de.citec.json/de.citec.json-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/de.citec.json#3418552502172588353" />
       <fileset dir="${build.tmp}/default/de.citec.json-generator.jar" />
     </jar>
@@ -128,7 +129,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-de.citec.json-models">
       <fileset dir="${basedir}/languages/de.citec.json/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json/languages/de.citec.json/de.citec.json-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json/languages/de.citec.json/de.citec.json-src.jar" duplicate="preserve">
       <fileset dir="${basedir}/languages/de.citec.json/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -171,7 +172,7 @@
         <sources jar="de.citec.json.gen.plaintext-src.jar" descriptor="de.citec.json.gen.plaintext.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json/languages/de.citec.json/de.citec.json.gen.plaintext.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json/languages/de.citec.json/de.citec.json.gen.plaintext.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/de.citec.json.gen.plaintext" />
       <fileset dir="${basedir}/languages/de.citec.json.gen.plaintext" includes="icons/**, resources/**" />
       <fileset dir="${basedir}/languages/de.citec.json.gen.plaintext/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -199,7 +200,7 @@
         <sources jar="de.citec.json.gen.plaintext-src.jar" descriptor="de.citec.json.gen.plaintext.mpl" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json/languages/de.citec.json/de.citec.json.gen.plaintext-generator.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json/languages/de.citec.json/de.citec.json.gen.plaintext-generator.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/de.citec.json.gen.plaintext#4000107710162370652" />
       <fileset dir="${build.tmp}/default/de.citec.json.gen.plaintext-generator.jar" />
     </jar>
@@ -209,7 +210,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/languages-de.citec.json.gen.plaintext-models">
       <fileset dir="${basedir}/languages/de.citec.json.gen.plaintext/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json/languages/de.citec.json/de.citec.json.gen.plaintext-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json/languages/de.citec.json/de.citec.json.gen.plaintext-src.jar" duplicate="preserve">
       <fileset dir="${basedir}/languages/de.citec.json.gen.plaintext/generator/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -237,7 +238,7 @@
         <sources jar="de.citec.json.build-src.jar" descriptor="de.citec.json.build.msd" />
       </module>
     </echoxml>
-    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json/languages/de.citec.json/de.citec.json.build.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json/languages/de.citec.json/de.citec.json.build.jar" duplicate="preserve">
       <fileset dir="${build.tmp}/java/out/de.citec.json.build" />
       <fileset dir="${basedir}/solutions/de.citec.json.build" includes="icons/**, resources/**" />
       <fileset dir="${basedir}/solutions/de.citec.json.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
@@ -246,7 +247,7 @@
     <copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-de.citec.json.build-models">
       <fileset dir="${basedir}/solutions/de.citec.json.build/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
     </copyModels>
-    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij.zip/de.citec.json/languages/de.citec.json/de.citec.json.build-src.jar" duplicate="preserve">
+    <jar destfile="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip/de.citec.json/languages/de.citec.json/de.citec.json.build-src.jar" duplicate="preserve">
       <fileset dir="${basedir}/solutions/de.citec.json.build/source_gen">
         <exclude name="**/trace.info" />
         <exclude name="**/exports" />
@@ -256,10 +257,10 @@
       <zipfileset file="${basedir}/solutions/de.citec.json.build/de.citec.json.build.msd" prefix="module" />
       <zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-de.citec.json.build-models" prefix="module/models" />
     </jar>
-    <zip destfile="${build.layout}/de.citec.json-plugin-intellij.zip">
-      <fileset dir="${build.tmp}/default/de.citec.json-plugin-intellij.zip" />
+    <zip destfile="${build.layout}/de.citec.json-plugin-intellij-${intellij_version}.zip">
+      <fileset dir="${build.tmp}/default/de.citec.json-plugin-intellij-_dl__lbrace_intellij_version_rbrace_.zip" />
     </zip>
-    <echo file="${build.layout}/build.properties">de.citec.json-intellij.current_version=${current_version}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}mpsPlugin.plugin.version=${mpsPlugin.plugin.version}${line.separator}mpsPlugin.date=${mpsPlugin.date}${line.separator}mpsPluginCommon.plugin.version=${mpsPluginCommon.plugin.version}${line.separator}mpsPluginCommon.date=${mpsPluginCommon.date}${line.separator}mpsPluginCore.plugin.version=${mpsPluginCore.plugin.version}${line.separator}mpsPluginCore.date=${mpsPluginCore.date}${line.separator}mpsIdeaVcs.plugin.version=${mpsIdeaVcs.plugin.version}${line.separator}mpsIdeaVcs.date=${mpsIdeaVcs.date}${line.separator}mpsIdeaMigration.plugin.version=${mpsIdeaMigration.plugin.version}${line.separator}mpsIdeaMigration.date=${mpsIdeaMigration.date}</echo>
+    <echo file="${build.layout}/build.properties">de.citec.json-intellij.current_version=${current_version}${line.separator}de.citec.json-intellij.intellij_version=${intellij_version}${line.separator}mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}mpsPlugin.plugin.version=${mpsPlugin.plugin.version}${line.separator}mpsPlugin.date=${mpsPlugin.date}${line.separator}mpsPluginCommon.plugin.version=${mpsPluginCommon.plugin.version}${line.separator}mpsPluginCommon.date=${mpsPluginCommon.date}${line.separator}mpsPluginCore.plugin.version=${mpsPluginCore.plugin.version}${line.separator}mpsPluginCore.date=${mpsPluginCore.date}${line.separator}mpsIdeaVcs.plugin.version=${mpsIdeaVcs.plugin.version}${line.separator}mpsIdeaVcs.date=${mpsIdeaVcs.date}${line.separator}mpsIdeaMigration.plugin.version=${mpsIdeaMigration.plugin.version}${line.separator}mpsIdeaMigration.date=${mpsIdeaMigration.date}</echo>
   </target>
 
   <target name="buildDependents" />