Fix generating with build script

This commit is contained in:
Fedor Isakov 2022-08-26 15:50:54 +02:00
parent de5fa8e543
commit ec8ab9eb14
3 changed files with 29 additions and 8 deletions

View File

@ -58,14 +58,14 @@
</module>
</echoxml>
<jar destfile="${build.layout}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" duplicate="preserve">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_off" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-models">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.layout}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin-src.jar" duplicate="preserve">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_off">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
@ -1453,14 +1453,14 @@
</module>
</echoxml>
<jar destfile="${build.layout}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" duplicate="preserve">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_off" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar1" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-models1">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.layout}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin-src.jar" duplicate="preserve">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_off">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
@ -2595,14 +2595,14 @@
</module>
</echoxml>
<jar destfile="${build.tmp}/default/jetbrains.mps.coderules-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin.jar" duplicate="preserve">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_off" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar2" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-models2">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/models" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.tmp}/default/jetbrains.mps.coderules-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin-src.jar" duplicate="preserve">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_off">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
@ -3120,6 +3120,7 @@
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source" />
<zipfileset file="${basedir}/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.coderules-languageModels1" prefix="module/languageModels" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.coderules-generator-template1" prefix="module/generator/template" />
@ -5925,7 +5926,7 @@
<target name="cleanSources">
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.build/source_gen" />
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen" />
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_off" />
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.runtime/source_gen" />
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules/source_gen" />
<delete dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ui/source_gen" />

View File

@ -183,6 +183,7 @@
<reference id="1265949165890536425" name="module" index="L2wRA" />
<child id="4356762679305730677" name="jarLocations" index="3yL2VB" />
<child id="3335207478148056905" name="deployedJar" index="3PtcVe" />
<child id="3335207478148060176" name="sourceJar" index="3PtdQn" />
</concept>
<concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
<concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
@ -4048,6 +4049,25 @@
</node>
</node>
</node>
<node concept="3PtdJl" id="6YTH7uEw1Md" role="3PtdQn">
<node concept="2HvfSZ" id="6YTH7uEw1Q7" role="39821P">
<node concept="398BVA" id="6YTH7uEw1Rt" role="2HvfZ0">
<ref role="398BVh" node="46o4wsH3mv_" resolve="mps.macro.coderules_home" />
<node concept="2Ry0Ak" id="6YTH7uEw1SN" role="iGT6I">
<property role="2Ry0Am" value="coderules" />
<node concept="2Ry0Ak" id="6YTH7uEw1YE" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="6YTH7uEw1YJ" role="2Ry0An">
<property role="2Ry0Am" value="jetbrains.mps.coderules.ideaplugin" />
<node concept="2Ry0Ak" id="6YTH7uEw1YO" role="2Ry0An">
<property role="2Ry0Am" value="source" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="L2wRC" id="C1f6iDF7KL" role="39821P">
<ref role="L2wRA" node="C1f6iDDM8L" resolve="jetbrains.mps.devkit.aspect.types" />

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="jetbrains.mps.coderules.ideaplugin" uuid="66887915-4d9e-4e24-bd35-19eb55fb75c2" moduleVersion="0" compileInMPS="false">
<solution name="jetbrains.mps.coderules.ideaplugin" uuid="66887915-4d9e-4e24-bd35-19eb55fb75c2" moduleVersion="0" compileInMPS="false" generatorOutputPath="${module}/source_off">
<models>
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="models" />