Introduce snapshot history. Activation sink to record all snapshots and allow to refer to snapshot taken at particular instant. This is used in the Store sink in order to correctly represent logical assignments and unions. Snapshot history is reused by the next stage program.
This commit is contained in:
Fedor Isakov
parent
651fb9ac66
commit
3ce85cac5e
134
build.xml
134
build.xml
|
|
@ -125,23 +125,11 @@
|
|||
</module>
|
||||
</echoxml>
|
||||
<jar destfile="${build.layout}/tests/jetbrains.mps.logic.reactor.jar" duplicate="preserve">
|
||||
<fileset dir="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor" includes="icons/**, resources/**" />
|
||||
<fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
|
||||
<fileset dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar" />
|
||||
</jar>
|
||||
<copyModels todir="${build.tmp}/customProcessors/copyModels/logic-solutions-jetbrains.mps.logic.reactor-models">
|
||||
<fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
|
||||
</copyModels>
|
||||
<jar destfile="${build.layout}/tests/jetbrains.mps.logic.reactor-src.jar" duplicate="preserve">
|
||||
<fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/source_gen">
|
||||
<exclude name="**/trace.info" />
|
||||
<exclude name="**/exports" />
|
||||
<exclude name="**/checkpoints" />
|
||||
<exclude name="**/*.mps" />
|
||||
</fileset>
|
||||
<zipfileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/logic-solutions-jetbrains.mps.logic.reactor-models" prefix="module/models" />
|
||||
</jar>
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.logic.runtime.jar" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.logic.runtime.jar/META-INF" />
|
||||
|
|
@ -951,23 +939,11 @@
|
|||
</module>
|
||||
</echoxml>
|
||||
<jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.logic.reactor.jar" duplicate="preserve">
|
||||
<fileset dir="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<fileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor" includes="icons/**, resources/**" />
|
||||
<fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
|
||||
<fileset dir="${build.tmp}/default/jetbrains.mps.logic.reactor.jar1" />
|
||||
</jar>
|
||||
<copyModels todir="${build.tmp}/customProcessors/copyModels/logic-solutions-jetbrains.mps.logic.reactor-models1">
|
||||
<fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
|
||||
</copyModels>
|
||||
<jar destfile="${build.tmp}/default/typechecking-0.1.zip/typechecking/languages/jetbrains.mps.logic.reactor-src.jar" duplicate="preserve">
|
||||
<fileset dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/source_gen">
|
||||
<exclude name="**/trace.info" />
|
||||
<exclude name="**/exports" />
|
||||
<exclude name="**/checkpoints" />
|
||||
<exclude name="**/*.mps" />
|
||||
</fileset>
|
||||
<zipfileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/jetbrains.mps.logic.reactor.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/logic-solutions-jetbrains.mps.logic.reactor-models1" prefix="module/models" />
|
||||
</jar>
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.logic.runtime.jar1" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.logic.runtime.jar1/META-INF" />
|
||||
|
|
@ -1372,7 +1348,7 @@
|
|||
<delete dir="${build.layout}" />
|
||||
</target>
|
||||
|
||||
<target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typechecking.test, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
|
||||
<target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typechecking.test, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.ui, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.typechecking.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.typechecking.sample.test" />
|
||||
|
||||
<target name="processResources" />
|
||||
|
||||
|
|
@ -1507,7 +1483,7 @@
|
|||
|
||||
<target name="module-tests" depends="assemble, test.testconfig" />
|
||||
|
||||
<target name="java.compile.jetbrains.mps.logic" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.logic" depends="java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.logic" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -1516,18 +1492,17 @@
|
|||
<path location="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/source_gen" />
|
||||
</src>
|
||||
<classpath>
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
|
||||
|
|
@ -1558,7 +1533,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.logic#6626732309150416985" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.logic#6626732309150416985" depends="java.compile.jetbrains.mps.logic, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/generator/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.logic#6626732309150416985" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -1584,7 +1559,6 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
|
|
@ -1607,7 +1581,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.logic.runtime" depends="java.compile.jetbrains.mps.logic.reactor, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.logic.runtime" depends="fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/runtime/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -1616,18 +1590,17 @@
|
|||
<path location="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/runtime/source_gen" />
|
||||
</src>
|
||||
<classpath>
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
|
|
@ -1643,41 +1616,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.logic.reactor" depends="fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.reactor" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
<compilerarg value="-Xlint:none" />
|
||||
<src>
|
||||
<path location="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" />
|
||||
</src>
|
||||
<classpath>
|
||||
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/collection-0.7.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-api-0.9.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/conreactor-core-0.9.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.logic.test" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.logic.test" depends="java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.logic.test" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.logic.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -1687,18 +1626,17 @@
|
|||
<pathelement path="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/test_gen/" />
|
||||
</src>
|
||||
<classpath>
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
|
|
@ -1718,7 +1656,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -1746,7 +1684,6 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
|
|
@ -1782,7 +1719,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933" depends="java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933" depends="java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/generator/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2#4578927328670739933" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -1811,7 +1748,6 @@
|
|||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
|
|
@ -1844,7 +1780,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2.runtime" depends="java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -1865,7 +1801,6 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
|
|
@ -1889,7 +1824,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2.template" depends="java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2.template" depends="java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -1898,18 +1833,17 @@
|
|||
<path location="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
|
||||
</src>
|
||||
<classpath>
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-closures.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-collections.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.1.2.jar" />
|
||||
<fileset file="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.1.2.jar" />
|
||||
|
|
@ -2038,7 +1972,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.ui, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, java.compile.jetbrains.mps.typechecking.ui, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -2067,7 +2001,6 @@
|
|||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-icons.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
|
||||
|
|
@ -2110,7 +2043,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.typechecking" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.typechecking" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -2132,7 +2065,6 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
|
||||
|
|
@ -2163,7 +2095,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.typechecking.ui" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.typechecking.ui" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.typechecking, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.ui/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.ui" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -2185,7 +2117,6 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
|
||||
|
|
@ -2210,7 +2141,9 @@
|
|||
<fileset file="${artifacts.mps}/lib/ecj-4.6.2.jar" />
|
||||
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
|
@ -2264,7 +2197,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typechecking/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">
|
||||
|
|
@ -2286,7 +2219,6 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
|
||||
|
|
@ -2328,7 +2260,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.baseLanguageExt.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.baseLanguageExt.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.test, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt.test" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -2355,7 +2287,6 @@
|
|||
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.test" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-test.jar" />
|
||||
|
|
@ -2606,7 +2537,6 @@
|
|||
<target name="cleanSources">
|
||||
<delete dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/source_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/generator/source_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.reactor/source_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/logic/languages/jetbrains.mps.logic/runtime/source_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.typechecking.annotation/source_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.smodel.types/source_gen" />
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<solution name="jetbrains.mps.logic.reactor" uuid="bbf5c548-7111-4a53-a117-cdefc664cf34" moduleVersion="0" pluginKind="PLUGIN_OTHER" compileInMPS="true">
|
||||
<models>
|
||||
<modelRoot contentPath="${module}" type="default">
|
||||
<sourceRoot location="models" />
|
||||
</modelRoot>
|
||||
<modelRoot contentPath="${module}" type="java_classes">
|
||||
<sourceRoot location="lib/conreactor-api-0.9.jar" />
|
||||
<sourceRoot location="lib/conreactor-core-0.9.jar" />
|
||||
<sourceRoot location="lib/collection-0.7.jar" />
|
||||
</modelRoot>
|
||||
</models>
|
||||
<stubModelEntries>
|
||||
|
|
|
|||
|
|
@ -343,7 +343,7 @@
|
|||
<property role="BnDLt" value="true" />
|
||||
<property role="TrG5h" value="jetbrains.mps.logic.reactor" />
|
||||
<property role="3LESm3" value="bbf5c548-7111-4a53-a117-cdefc664cf34" />
|
||||
<property role="2GAjPV" value="false" />
|
||||
<property role="2GAjPV" value="true" />
|
||||
<node concept="55IIr" id="7BVjoXzUxoU" role="3LF7KH">
|
||||
<node concept="2Ry0Ak" id="7BVjoXzUxpK" role="iGT6I">
|
||||
<property role="2Ry0Am" value="logic" />
|
||||
|
|
@ -1284,6 +1284,12 @@
|
|||
<ref role="3bR37D" node="65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="3wxtToDLSLl" role="3bR37C">
|
||||
<node concept="3bR9La" id="3wxtToDLSLm" role="1SiIV1">
|
||||
<property role="3bR36h" value="false" />
|
||||
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1E1JtD" id="46o4wsH5PJF" role="2G$12L">
|
||||
<property role="BnDLt" value="true" />
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue