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

Fix build dependencies.

This commit is contained in:
Fedor Isakov 2018-06-21 11:52:35 +02:00
parent 6080b5dc5e
commit b048701093
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.xml
View File

@ -984,6 +984,7 @@
<module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
<module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
@ -2356,6 +2357,7 @@
<module ref="86441d7a-e194-42da-81a5-2161ec62a379(MPS.Workbench)" />
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
<module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
@ -3796,7 +3798,7 @@
</javac>
</target>
<target name="java.compile.jetbrains.mps.controlflow.ui" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
<target name="java.compile.jetbrains.mps.controlflow.ui" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.coderules.ui, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
<mkdir dir="${mps.macro.logic_home}/controlflow/solutions/jetbrains.mps.controlflow.ui/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.controlflow.ui" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.controlflow.ui" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@ -3824,6 +3826,7 @@
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.coderules.ui" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.controlflow" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />

26
typechecking/solutions/jetbrains.mps.typechecking.build/models/jetbrains.mps.typechecking.build.mps
View File

@ -929,6 +929,12 @@
<ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
</node>
</node>
<node concept="1SiIV0" id="2acLaGi2utJ" role="3bR37C">
<node concept="3bR9La" id="2acLaGi2utK" role="1SiIV1">
<property role="3bR36h" value="true" />
<ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
</node>
</node>
</node>
<node concept="1E1JtD" id="7BVjoXzUx6U" role="2G$12L">
<property role="BnDLt" value="true" />
@ -1994,7 +2000,7 @@
</node>
<node concept="1SiIV0" id="78H58oewGWX" role="3bR37C">
<node concept="3bR9La" id="78H58oewGWY" role="1SiIV1">
<property role="3bR36h" value="false" />
<property role="3bR36h" value="true" />
<ref role="3bR37D" node="NKt6yn9_8p" resolve="jetbrains.mps.coderules" />
</node>
</node>
@ -2016,6 +2022,24 @@
<ref role="3bR37D" node="78H58oeeGcw" resolve="jetbrains.mps.controlflow" />
</node>
</node>
<node concept="1SiIV0" id="2acLaGi2uwp" role="3bR37C">
<node concept="3bR9La" id="2acLaGi2uwq" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
</node>
</node>
<node concept="1SiIV0" id="2acLaGi2uwr" role="3bR37C">
<node concept="3bR9La" id="2acLaGi2uws" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
</node>
</node>
<node concept="1SiIV0" id="2acLaGi2uwt" role="3bR37C">
<node concept="3bR9La" id="2acLaGi2uwu" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="6Yb9hAqy9L2" resolve="jetbrains.mps.coderules.ui" />
</node>
</node>
</node>
<node concept="1E1JtD" id="78H58oeeJaR" role="2G$12L">
<property role="BnDLt" value="true" />