Build script: make plugin packaging the first in layout
This fixes dependencies, as the build language uses the first layout for a given module defined in the build model Having coderules-ideaplugin folder before the plugin changed the way dependencies generate their build script, while the artifacts stayed with the same structure
This commit is contained in:
Clement de La Bourdonnaye
parent
c96f65ec64
commit
00732a95a5
118
build.xml
118
build.xml
|
|
@ -42,59 +42,6 @@
|
|||
<generator-settings id="m2m-0" strictMode="false" parallelThreads="1" inplaceTransform="false" warnWrongChild="true" createStaticRefs="false" skipUnmodifiedModels="${mps.generator.skipUnmodifiedModels}" />
|
||||
|
||||
<target name="assemble" depends="classes, declare-mps-tasks">
|
||||
<mkdir dir="${build.layout}/coderules-ideaplugin" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar/META-INF" />
|
||||
<echoxml file="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar/META-INF/module.xml">
|
||||
<module namespace="jetbrains.mps.coderules.ideaplugin" type="solution" uuid="66887915-4d9e-4e24-bd35-19eb55fb75c2">
|
||||
<dependencies>
|
||||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
|
||||
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
|
||||
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
|
||||
<module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
|
||||
<module ref="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" kind="cl" />
|
||||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
|
||||
<module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
|
||||
</dependencies>
|
||||
<uses>
|
||||
<language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
|
||||
<language id="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" />
|
||||
<language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
|
||||
<language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
|
||||
<language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
|
||||
<language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
|
||||
</uses>
|
||||
<classpath>
|
||||
<entry path="." />
|
||||
</classpath>
|
||||
<sources jar="jetbrains.mps.coderules.ideaplugin-src.jar" descriptor="jetbrains.mps.coderules.ideaplugin.msd" />
|
||||
</module>
|
||||
</echoxml>
|
||||
<jar destfile="${build.layout}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" duplicate="preserve">
|
||||
<fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.ideaplugin" />
|
||||
<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_gen" 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">
|
||||
<exclude name="**/trace.info" />
|
||||
<exclude name="**/exports" />
|
||||
<exclude name="**/checkpoints" />
|
||||
<exclude name="**/*.mps" />
|
||||
</fileset>
|
||||
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen">
|
||||
<exclude name="**/trace.info" />
|
||||
<exclude name="**/exports" />
|
||||
<exclude name="**/checkpoints" />
|
||||
<exclude name="**/*.mps" />
|
||||
</fileset>
|
||||
<zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-models" prefix="module/models" />
|
||||
</jar>
|
||||
<mkdir dir="${build.layout}/jetbrains.mps.coderules" />
|
||||
<mkdir dir="${build.layout}/jetbrains.mps.coderules/META-INF" />
|
||||
<echoxml file="${build.layout}/jetbrains.mps.coderules/META-INF/plugin.xml">
|
||||
|
|
@ -1549,9 +1496,9 @@
|
|||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.types-models" prefix="module/models" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-languages-jetbrains.mps.lang.types-generator-templates" prefix="module/generator/templates" />
|
||||
</jar>
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar1" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar1/META-INF" />
|
||||
<echoxml file="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar1/META-INF/module.xml">
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar/META-INF" />
|
||||
<echoxml file="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar/META-INF/module.xml">
|
||||
<module namespace="jetbrains.mps.coderules.ideaplugin" type="solution" uuid="66887915-4d9e-4e24-bd35-19eb55fb75c2">
|
||||
<dependencies>
|
||||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
|
||||
|
|
@ -1581,9 +1528,9 @@
|
|||
<fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.ideaplugin" />
|
||||
<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_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
|
||||
<fileset dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar1" />
|
||||
<fileset dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar" />
|
||||
</jar>
|
||||
<copyModels todir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-models1">
|
||||
<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}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.ideaplugin-src.jar" duplicate="preserve">
|
||||
|
|
@ -1601,7 +1548,7 @@
|
|||
</fileset>
|
||||
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen" />
|
||||
<zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-models1" prefix="module/models" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-models" prefix="module/models" />
|
||||
</jar>
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.typechecking.jar" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.typechecking.jar/META-INF" />
|
||||
|
|
@ -2142,6 +2089,59 @@
|
|||
<fileset dir="${build.tmp}/java/out/coderules-ideaplugin" />
|
||||
<fileset dir="${build.tmp}/default/jetbrains.mps.coderules.jar1" />
|
||||
</jar>
|
||||
<mkdir dir="${build.layout}/coderules-ideaplugin" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar1" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar1/META-INF" />
|
||||
<echoxml file="${build.tmp}/default/jetbrains.mps.coderules.ideaplugin.jar1/META-INF/module.xml">
|
||||
<module namespace="jetbrains.mps.coderules.ideaplugin" type="solution" uuid="66887915-4d9e-4e24-bd35-19eb55fb75c2">
|
||||
<dependencies>
|
||||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="rt" />
|
||||
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" kind="rt" />
|
||||
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" kind="rt" />
|
||||
<module ref="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" kind="rt" />
|
||||
<module ref="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" kind="cl" />
|
||||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" kind="cl" />
|
||||
<module ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" kind="cl" />
|
||||
</dependencies>
|
||||
<uses>
|
||||
<language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
|
||||
<language id="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" />
|
||||
<language id="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" />
|
||||
<language id="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" />
|
||||
<language id="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" />
|
||||
<language id="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" />
|
||||
</uses>
|
||||
<classpath>
|
||||
<entry path="." />
|
||||
</classpath>
|
||||
<sources jar="jetbrains.mps.coderules.ideaplugin-src.jar" descriptor="jetbrains.mps.coderules.ideaplugin.msd" />
|
||||
</module>
|
||||
</echoxml>
|
||||
<jar destfile="${build.layout}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin.jar" duplicate="preserve">
|
||||
<fileset dir="${build.tmp}/java/out/jetbrains.mps.coderules.ideaplugin" />
|
||||
<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_gen" 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}/coderules-ideaplugin/jetbrains.mps.coderules.ideaplugin-src.jar" duplicate="preserve">
|
||||
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen">
|
||||
<exclude name="**/trace.info" />
|
||||
<exclude name="**/exports" />
|
||||
<exclude name="**/checkpoints" />
|
||||
<exclude name="**/*.mps" />
|
||||
</fileset>
|
||||
<fileset dir="${mps.macro.coderules_home}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/source_gen">
|
||||
<exclude name="**/trace.info" />
|
||||
<exclude name="**/exports" />
|
||||
<exclude name="**/checkpoints" />
|
||||
<exclude name="**/*.mps" />
|
||||
</fileset>
|
||||
<zipfileset file="${basedir}/coderules/solutions/jetbrains.mps.coderules.ideaplugin/jetbrains.mps.coderules.ideaplugin.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/coderules-solutions-jetbrains.mps.coderules.ideaplugin-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" />
|
||||
<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" />
|
||||
<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/META-INF" />
|
||||
|
|
|
|||
|
|
@ -3694,16 +3694,6 @@
|
|||
</node>
|
||||
<node concept="55IIr" id="1BDNG5xBZgh" role="auvoZ" />
|
||||
<node concept="1l3spV" id="1BDNG5xBZgi" role="1l3spN">
|
||||
<node concept="398223" id="adIlSvwL6D" role="39821P">
|
||||
<node concept="3_J27D" id="adIlSvwL6F" role="Nbhlr">
|
||||
<node concept="3Mxwew" id="adIlSvwLbp" role="3MwsjC">
|
||||
<property role="3MwjfP" value="coderules-ideaplugin" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="L2wRC" id="adIlSvwLbr" role="39821P">
|
||||
<ref role="L2wRA" node="2CPBoDB0MbE" resolve="jetbrains.mps.coderules.ideaplugin" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="m$_wl" id="2ABzB2CYTYG" role="39821P">
|
||||
<ref role="m_rDy" node="7BVjoXzUx67" resolve="jetbrains.mps.coderules" />
|
||||
<node concept="398223" id="adIlSvk78L" role="39821P">
|
||||
|
|
@ -3951,6 +3941,16 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="398223" id="adIlSvwL6D" role="39821P">
|
||||
<node concept="3_J27D" id="adIlSvwL6F" role="Nbhlr">
|
||||
<node concept="3Mxwew" id="adIlSvwLbp" role="3MwsjC">
|
||||
<property role="3MwjfP" value="coderules-ideaplugin" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="L2wRC" id="adIlSvwLbr" role="39821P">
|
||||
<ref role="L2wRA" node="2CPBoDB0MbE" resolve="jetbrains.mps.coderules.ideaplugin" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="3981dG" id="65DJywFjdtY" role="39821P">
|
||||
<node concept="3_J27D" id="65DJywFjdtZ" role="Nbhlr">
|
||||
<node concept="3Mxwew" id="65DJywFjdwr" role="3MwsjC">
|
||||
|
|
|
|||
Loading…
Reference in New Issue