Fix plugin version number, ensure compatibility with MPS starting from 211
This commit is contained in:
Fedor Isakov
parent
b497a6ba88
commit
bd1753e2ef
|
|
@ -109,7 +109,7 @@ task generateUpdatePluginsXml {
|
|||
def updatesDir = project.projectDir.absolutePath + "/build/artifacts/coderules/updates"
|
||||
mkdir(updatesDir)
|
||||
|
||||
def baseUrl = "https://teamcity.jetbrains.com/guestAuth/repository/download/MPS_20211_Distribution_MpsCodeRules"
|
||||
def baseUrl = "https://teamcity.jetbrains.com/guestAuth/repository/download/MPS_20${buildNumber()[0][1]}_Distribution_MpsCodeRules"
|
||||
def zip = "/jebtrains.mps.coderules-0.9-SNAPSHOT.zip"
|
||||
|
||||
file(updatesDir + "/updatePlugins.xml").withWriter { w ->
|
||||
|
|
@ -117,7 +117,7 @@ task generateUpdatePluginsXml {
|
|||
plugins {
|
||||
plugin( id: "jetbrains.mps.coderules" ,
|
||||
url: baseUrl + "/$System.env.BUILD_NUMBER" + zip ,
|
||||
version: "${buildNumber()[0][1]}.${buildNumber()[0][2]}-b${buildNumber()[0][4]}" )
|
||||
version: "0.9-b${buildNumber()[0][4]}" )
|
||||
{ }
|
||||
}
|
||||
}
|
||||
|
|
@ -132,6 +132,7 @@ ant.importBuild('build.xml') { antTarget ->
|
|||
'coderules-'+antTarget
|
||||
}
|
||||
ant.properties.'ci.build.num' = "${buildNumber().find() ? buildNumber()[0][4] : '9999'}".toString()
|
||||
ant.properties.'ci.mps.release' = "${buildNumber().find() ? buildNumber()[0][1] : '211'}".toString()
|
||||
|
||||
// ensure 'setup' runs before 'fetchDependencies' and 'declare-mps-tasks'
|
||||
'coderules-fetchDependencies' {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
<property name="build.tmp" location="${build.dir}/tmp/coderules" />
|
||||
<property name="build.layout" location="${build.dir}/artifacts/coderules" />
|
||||
<property name="ci.build.num" value="9999" />
|
||||
<property name="ci.mps.release" value="211" />
|
||||
<property name="test.jvmargs" value="-Xss2048k -Xmx2048m" />
|
||||
<property name="mps.macro.coderules_home" location="${basedir}" />
|
||||
<property name="mps_home" location="${basedir}/MPS_HOME" />
|
||||
|
|
@ -1731,6 +1732,7 @@
|
|||
<description>Typechecking with Coderules (experimental)</description>
|
||||
<version>0.9-b${ci.build.num}</version>
|
||||
<vendor url="jetbrains.com/mps">JetBrains s.r.o.</vendor>
|
||||
<idea-version since-build="211.1" />
|
||||
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<mps.LanguageLibrary dir="/languages" />
|
||||
|
|
@ -3169,7 +3171,7 @@
|
|||
<zipfileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules/lib" prefix="jetbrains.mps.coderules/lib" />
|
||||
<fileset dir="${build.tmp}/default/jebtrains.mps.coderules-0.9-SNAPSHOT.zip" />
|
||||
</zip>
|
||||
<echo file="${build.layout}/build.properties">coderules.ci.build.num=${ci.build.num}${line.separator}coderules.test.jvmargs=${test.jvmargs}${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.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
|
||||
<echo file="${build.layout}/build.properties">coderules.ci.build.num=${ci.build.num}${line.separator}coderules.ci.mps.release=${ci.mps.release}${line.separator}coderules.test.jvmargs=${test.jvmargs}${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.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
|
||||
</target>
|
||||
|
||||
<target name="buildDependents" />
|
||||
|
|
|
|||
|
|
@ -15,6 +15,19 @@
|
|||
<import index="2ogt" ref="r:dc6ee11b-0a41-4208-a099-65b1a11fb3ff(jetbrains.mps.build.workflow.preset.java)" />
|
||||
</imports>
|
||||
<registry>
|
||||
<language id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml">
|
||||
<concept id="6666499814681541919" name="jetbrains.mps.core.xml.structure.XmlTextValue" flags="ng" index="2pMdtt">
|
||||
<property id="6666499814681541920" name="text" index="2pMdty" />
|
||||
</concept>
|
||||
<concept id="6666499814681415858" name="jetbrains.mps.core.xml.structure.XmlElement" flags="ng" index="2pNNFK">
|
||||
<property id="6666499814681415862" name="tagName" index="2pNNFO" />
|
||||
<child id="6666499814681415861" name="attributes" index="2pNNFR" />
|
||||
</concept>
|
||||
<concept id="6666499814681447923" name="jetbrains.mps.core.xml.structure.XmlAttribute" flags="ng" index="2pNUuL">
|
||||
<property id="6666499814681447926" name="attrName" index="2pNUuO" />
|
||||
<child id="6666499814681541918" name="value" index="2pMdts" />
|
||||
</concept>
|
||||
</language>
|
||||
<language id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests">
|
||||
<concept id="4560297596904469355" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModuleGroup" flags="ng" index="22LTRF">
|
||||
<reference id="4560297596904469356" name="group" index="22LTRG" />
|
||||
|
|
@ -110,6 +123,7 @@
|
|||
</concept>
|
||||
<concept id="6592112598314498932" name="jetbrains.mps.build.mps.structure.BuildMps_IdeaPlugin" flags="ng" index="m$_wf">
|
||||
<property id="6592112598314498927" name="id" index="m$_wk" />
|
||||
<child id="1359186315025500371" name="xml" index="20twgj" />
|
||||
<child id="7832771629084912518" name="vendor" index="2iVFfd" />
|
||||
<child id="6592112598314498931" name="version" index="m$_w8" />
|
||||
<child id="6592112598314499021" name="name" index="m$_yQ" />
|
||||
|
|
@ -239,6 +253,15 @@
|
|||
<property role="2iUeEt" value="JetBrains s.r.o." />
|
||||
<property role="2iUeEu" value="jetbrains.com/mps" />
|
||||
</node>
|
||||
<node concept="2pNNFK" id="5Hdh9$IhmUh" role="20twgj">
|
||||
<property role="2pNNFO" value="idea-version" />
|
||||
<node concept="2pNUuL" id="5Hdh9$IhmW_" role="2pNNFR">
|
||||
<property role="2pNUuO" value="since-build" />
|
||||
<node concept="2pMdtt" id="5Hdh9$IhnkA" role="2pMdts">
|
||||
<property role="2pMdty" value="211.1" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2G$12M" id="3PhVAH_Wgx6" role="3989C9">
|
||||
<property role="TrG5h" value="build" />
|
||||
|
|
@ -3082,6 +3105,16 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2kB4xC" id="5Hdh9$IhmQ$" role="1l3spd">
|
||||
<property role="TrG5h" value="ci.mps.release" />
|
||||
<node concept="aVJcg" id="5Hdh9$IhmQ_" role="aVJcv">
|
||||
<node concept="NbPM2" id="5Hdh9$IhmQA" role="aVJcq">
|
||||
<node concept="3Mxwew" id="5Hdh9$IhmQB" role="3MwsjC">
|
||||
<property role="3MwjfP" value="211" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2kB4xC" id="3mytCjZmOem" role="1l3spd">
|
||||
<property role="TrG5h" value="test.jvmargs" />
|
||||
<node concept="aVJcg" id="3mytCjZmOnI" role="aVJcv">
|
||||
|
|
|
|||
Loading…
Reference in New Issue