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

Fix a build dependency issue.

This commit is contained in:
Fedor Isakov 2018-07-10 14:33:12 +02:00
parent 71947db946
commit 9f372d1ad6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
baselanguage/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
View File

@ -4,6 +4,7 @@
<languages>
<use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="14" />
<use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
<use id="2e120f68-abfb-4980-bb1c-bc70159b1f95" name="jetbrains.mps.lang.controlflow" version="0" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports>

5
build.xml
View File

@ -1151,6 +1151,7 @@
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
<module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" />
<module ref="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" />
<module ref="ffcd9ef5-e931-4da9-a8d1-eb9bf80d19b4(jetbrains.mps.lang.controlflow.runtime)" />
<module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" />
<module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
@ -4152,7 +4153,7 @@
</javac>
</target>
<target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
<target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.coderules, java.compile.jetbrains.mps.controlflow, java.compile.jetbrains.mps.lang.coderules.runtime, java.compile.jetbrains.mps.lang.coderules.template, java.compile.jetbrains.mps.lang.controlflow.runtime, java.compile.jetbrains.mps.lang.typechecking.runtime, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.reporting, fetchDependencies">
<mkdir dir="${mps.macro.logic_home}/baselanguage/languages/jetbrains.mps.baseLanguageExt/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@ -4183,6 +4184,7 @@
<pathelement path="${build.tmp}/java/out/jetbrains.mps.controlflow" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.runtime" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.coderules.template" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.controlflow.runtime" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.runtime" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking" />
@ -4355,6 +4357,7 @@
<pathelement location="${build.layout}/tests/jetbrains.mps.controlflow.jar" />
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.coderules.runtime.jar" />
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.coderules.template.jar" />
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.controlflow.runtime.jar" />
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.smodel.types.jar" />
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.typechecking.runtime.jar" />
<pathelement location="${build.layout}/tests/jetbrains.mps.logic.jar" />