natas_hw
/
mps-coderules
mirror of https://github.com/JetBrains/mps-coderules
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure coderules build project is loaded during build of mpscore

This commit is contained in:
Fedor Isakov 2024-07-22 10:33:28 +02:00
parent 55ba7cc814
commit d446e5c35a
4 changed files with 100 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
build.xml
View File

@ -1890,6 +1890,47 @@
<zipfileset file="${basedir}/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.annotation-languageModels" prefix="module/languageModels" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.build.jar" />
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.build.jar/META-INF" />
<echoxml file="${build.tmp}/default/jetbrains.mps.coderules.build.jar/META-INF/module.xml">
<module namespace="jetbrains.mps.coderules.build" type="solution" uuid="bc9cd1e7-827b-4d61-b111-d2c896dcae6f">
<dependencies>
<module ref="cca2431b-e74f-4066-9344-e40022d0908a(jetbrains.mps.build.workflow.preset)" kind="cl" />
</dependencies>
<uses>
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
<language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
<language id="l:427a473d-5177-432c-9905-bcbceb71b996:jetbrains.mps.build.mps.runner" />
<language id="l:9f846aef-4e4a-4a84-828e-7e83fe2697f2:jetbrains.mps.build.mps.testManifest" />
<language id="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" />
<language id="l:d5033cee-f632-44b6-b308-89d4fbde34ff:jetbrains.mps.build.startup" />
<language id="l:698a8d22-a104-47a0-ba8d-10e3ec237f13:jetbrains.mps.build.workflow" />
</uses>
<classpath>
<entry path="." />
</classpath>
<sources jar="jetbrains.mps.coderules.build-src.jar" descriptor="jetbrains.mps.coderules.build.msd" />
</module>
</echoxml>
<jar destfile="${build.layout}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.build.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.build" />
<fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.build" includes="icons/**, resources/**" />
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/jetbrains.mps.coderules.build.jar" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.build-models">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.build/models" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.layout}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.build-src.jar" duplicate="preserve">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.build/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.build-models" prefix="module/models" />
</jar>
<mkdir dir="${build.layout}/jetbrains.mps.coderules/lib" />
<copy todir="${build.layout}/jetbrains.mps.coderules/lib">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.logic.reactor/lib" />
@ -3416,9 +3457,9 @@
<zipfileset file="${basedir}/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.typechecking.annotation-languageModels1" prefix="module/languageModels" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.build.jar" />
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.build.jar/META-INF" />
<echoxml file="${build.tmp}/default/jetbrains.mps.coderules.build.jar/META-INF/module.xml">
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.build.jar1" />
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.build.jar1/META-INF" />
<echoxml file="${build.tmp}/default/jetbrains.mps.coderules.build.jar1/META-INF/module.xml">
<module namespace="jetbrains.mps.coderules.build" type="solution" uuid="bc9cd1e7-827b-4d61-b111-d2c896dcae6f">
<dependencies>
<module ref="cca2431b-e74f-4066-9344-e40022d0908a(jetbrains.mps.build.workflow.preset)" kind="cl" />
@ -3442,9 +3483,9 @@
<fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.build" />
<fileset dir="${basedir}/coderules/solutions/jetbrains.mps.coderules.build" includes="icons/**, resources/**" />
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/jetbrains.mps.coderules.build.jar" />
<fileset dir="${build.tmp}/default/jetbrains.mps.coderules.build.jar1" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.build-models">
<copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.build-models1">
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.build/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.build-src.jar" duplicate="preserve">
@ -3455,7 +3496,7 @@
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules.build/jetbrains.mps.coderules.build.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.build-models" prefix="module/models" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.build-models1" prefix="module/models" />
</jar>
<mkdir dir="${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/lib" />
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.jar3" />

3
coderules/solutions/jetbrains.mps.coderules.build/models/jetbrains.mps.coderules.build.mps
View File

@ -3335,6 +3335,9 @@
<node concept="L2wRC" id="5s5QomKFkZS" role="39821P">
<ref role="L2wRA" node="46o4wsH5PJF" resolve="jetbrains.mps.typechecking.annotation" />
</node>
<node concept="L2wRC" id="5Nh6YP2Rl$a" role="39821P">
<ref role="L2wRA" node="3PhVAH_WgTu" resolve="jetbrains.mps.coderules.build" />
</node>
</node>
<node concept="398223" id="2ABzB2CYUqS" role="39821P">
<node concept="3_J27D" id="2ABzB2CYUqT" role="Nbhlr">

54
samples/mpscore/build.xml
View File

@ -51,6 +51,46 @@
<target name="assemble" depends="classes, declare-mps-tasks">
<mkdir dir="${build.layout}/deploy" />
<mkdir dir="${build.tmp}/default/samples.mpscore.build.jar" />
<mkdir dir="${build.tmp}/default/samples.mpscore.build.jar/META-INF" />
<echoxml file="${build.tmp}/default/samples.mpscore.build.jar/META-INF/module.xml">
<module namespace="samples.mpscore.build" type="solution" uuid="d1dbf8e7-cee5-45f7-8159-4c825af0fe7d">
<dependencies>
<module ref="bc9cd1e7-827b-4d61-b111-d2c896dcae6f(jetbrains.mps.coderules.build)" kind="cl" />
</dependencies>
<uses>
<language id="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" />
<language id="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" />
<language id="l:427a473d-5177-432c-9905-bcbceb71b996:jetbrains.mps.build.mps.runner" />
<language id="l:9f846aef-4e4a-4a84-828e-7e83fe2697f2:jetbrains.mps.build.mps.testManifest" />
<language id="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" />
<language id="l:d5033cee-f632-44b6-b308-89d4fbde34ff:jetbrains.mps.build.startup" />
<language id="l:698a8d22-a104-47a0-ba8d-10e3ec237f13:jetbrains.mps.build.workflow" />
</uses>
<classpath>
<entry path="." />
</classpath>
<sources jar="samples.mpscore.build-src.jar" descriptor="samples.mpscore.build.msd" />
</module>
</echoxml>
<jar destfile="${build.layout}/deploy/samples.mpscore.build.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/samples.mpscore.build" />
<fileset dir="${mps.macro.mpscore_home}/solutions/samples.mpscore.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/samples.mpscore.build.jar" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-samples.mpscore.build-models">
<fileset dir="${mps.macro.mpscore_home}/solutions/samples.mpscore.build/models" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.layout}/deploy/samples.mpscore.build-src.jar" duplicate="preserve">
<fileset dir="${mps.macro.mpscore_home}/solutions/samples.mpscore.build/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${basedir}/solutions/samples.mpscore.build/samples.mpscore.build.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-samples.mpscore.build-models" prefix="module/models" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.behaviorExt.jar" />
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.behaviorExt.jar/META-INF" />
<echoxml file="${build.tmp}/default/jetbrains.mps.lang.behaviorExt.jar/META-INF/module.xml">
@ -5533,9 +5573,9 @@
<fileset dir="${build.tmp}/default/jetbrains.mps.core.types.jar" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.core.types-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.core.types/languages" />
<mkdir dir="${build.tmp}/default/samples.mpscore.build.jar" />
<mkdir dir="${build.tmp}/default/samples.mpscore.build.jar/META-INF" />
<echoxml file="${build.tmp}/default/samples.mpscore.build.jar/META-INF/module.xml">
<mkdir dir="${build.tmp}/default/samples.mpscore.build.jar1" />
<mkdir dir="${build.tmp}/default/samples.mpscore.build.jar1/META-INF" />
<echoxml file="${build.tmp}/default/samples.mpscore.build.jar1/META-INF/module.xml">
<module namespace="samples.mpscore.build" type="solution" uuid="d1dbf8e7-cee5-45f7-8159-4c825af0fe7d">
<dependencies>
<module ref="bc9cd1e7-827b-4d61-b111-d2c896dcae6f(jetbrains.mps.coderules.build)" kind="cl" />
@ -5558,9 +5598,9 @@
<jar destfile="${build.tmp}/default/jetbrains.mps.core.types-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.core.types/languages/samples.mpscore.build.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/samples.mpscore.build" />
<fileset dir="${mps.macro.mpscore_home}/solutions/samples.mpscore.build/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/samples.mpscore.build.jar" />
<fileset dir="${build.tmp}/default/samples.mpscore.build.jar1" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-samples.mpscore.build-models">
<copyModels todir="${build.tmp}/customProcessors/copyModels/solutions-samples.mpscore.build-models1">
<fileset dir="${mps.macro.mpscore_home}/solutions/samples.mpscore.build/models" includes="**/*.mps, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.tmp}/default/jetbrains.mps.core.types-_dl__lbrace_ci.mps.release_rbrace_-0.9-b_dl__lbrace_ci.build.tag_rbrace_.zip/jetbrains.mps.core.types/languages/samples.mpscore.build-src.jar" duplicate="preserve">
@ -5571,7 +5611,7 @@
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${basedir}/solutions/samples.mpscore.build/samples.mpscore.build.msd" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-samples.mpscore.build-models" prefix="module/models" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-samples.mpscore.build-models1" prefix="module/models" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.behaviorExt.jar1" />
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.behaviorExt.jar1/META-INF" />
@ -10846,7 +10886,7 @@
<path location="${mps.macro.mpscore_home}/solutions/samples.mpscore.build/source_gen" />
</src>
<classpath>
<fileset file="${build.tmp}/deps/coderules/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.build.jar" />
<fileset file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.build.jar" />
</classpath>
</javac>
<copy todir="${build.tmp}/java/out/samples.mpscore.build">

3
samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps
View File

@ -367,6 +367,9 @@
<property role="3MwjfP" value="deploy" />
</node>
</node>
<node concept="L2wRC" id="5Nh6YP2S5WA" role="39821P">
<ref role="L2wRA" node="71htTbsEdbI" resolve="samples.mpscore.build" />
</node>
<node concept="28u9K_" id="1aCOVadeVZq" role="39821P">
<property role="28hIV_" value="lang" />
</node>