Delete empty generators. Fix the import errors.

This commit is contained in:
Fedor Isakov 2017-06-12 16:45:00 +02:00
parent ee0b98f9db
commit 663c58d880
10 changed files with 28 additions and 307 deletions

167
build.xml
View File

@ -641,45 +641,10 @@
<fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt-generator.jar" />
<mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt-generator.jar/META-INF" />
<echoxml file="${build.tmp}/default/jetbrains.mps.baseLanguageExt-generator.jar/META-INF/module.xml">
<module namespace="jetbrains.mps.baseLanguageExt#8436953480441303409" type="generator" uuid="3128d3e3-76dc-4d6d-b958-99599e4307fa">
<dependencies>
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
<module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
<module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
</dependencies>
<classpath>
<entry path="." />
</classpath>
<sources jar="jetbrains.mps.baseLanguageExt-src.jar" descriptor="jetbrains.mps.baseLanguageExt.mpl" />
</module>
</echoxml>
<jar destfile="${build.layout}/tests/jetbrains.mps.baseLanguageExt-generator.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt#8436953480441303409" />
<fileset dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt-generator.jar" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.baseLanguageExt-generator-template">
<fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
</copyModels>
<copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.baseLanguageExt-models">
<fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.layout}/tests/jetbrains.mps.baseLanguageExt-src.jar" duplicate="preserve">
<fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/generator/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
@ -687,7 +652,6 @@
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${basedir}/typechecking/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.baseLanguageExt-generator-template" prefix="module/generator/template" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.baseLanguageExt-models" prefix="module/models" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.test.jar" />
@ -840,45 +804,10 @@
<fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.typechecking.annotation/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
<fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.annotation.jar" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.annotation-generator.jar" />
<mkdir dir="${build.tmp}/default/jetbrains.mps.typechecking.annotation-generator.jar/META-INF" />
<echoxml file="${build.tmp}/default/jetbrains.mps.typechecking.annotation-generator.jar/META-INF/module.xml">
<module namespace="jetbrains.mps.typechecking.annotation#8686569986502648408" type="generator" uuid="a3a7e08f-128a-4c99-9838-c4b2a4582540">
<dependencies>
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" />
<module ref="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" />
<module ref="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" />
<module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
<module ref="d44dab97-aaac-44cb-9745-8a14db674c03(jetbrains.mps.baseLanguage.tuples.runtime)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" />
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
</dependencies>
<classpath>
<entry path="." />
</classpath>
<sources jar="jetbrains.mps.typechecking.annotation-src.jar" descriptor="jetbrains.mps.typechecking.annotation.mpl" />
</module>
</echoxml>
<jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.annotation-generator.jar" duplicate="preserve">
<fileset dir="${build.tmp}/java/out/jetbrains.mps.typechecking.annotation#8686569986502648408" />
<fileset dir="${build.tmp}/default/jetbrains.mps.typechecking.annotation-generator.jar" />
</jar>
<copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.typechecking.annotation-generator-template">
<fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.typechecking.annotation/generator/template" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
</copyModels>
<copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.typechecking.annotation-languageModels">
<fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.typechecking.annotation/languageModels" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
</copyModels>
<jar destfile="${build.layout}/tests/jetbrains.mps.typechecking.annotation-src.jar" duplicate="preserve">
<fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.typechecking.annotation/generator/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
<exclude name="**/checkpoints" />
<exclude name="**/*.mps" />
</fileset>
<fileset dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.typechecking.annotation/source_gen">
<exclude name="**/trace.info" />
<exclude name="**/exports" />
@ -886,7 +815,6 @@
<exclude name="**/*.mps" />
</fileset>
<zipfileset file="${basedir}/typechecking/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl" prefix="module" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.typechecking.annotation-generator-template" prefix="module/generator/template" />
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-languages-jetbrains.mps.typechecking.annotation-languageModels" prefix="module/languageModels" />
</jar>
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.smodel.types.jar" />
@ -1543,7 +1471,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.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typesystem2.test, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.typechecking.annotation#8686569986502648408, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.baseLanguageExt#8436953480441303409, java.compile.jetbrains.mps.lang.typesystem2.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.lang.typesystem2.sample.test, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.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.reactor, java.compile.jetbrains.mps.logic.test, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.smodel.types, java.compile.jetbrains.mps.lang.smodel.types#7345257067587611144, java.compile.jetbrains.mps.lang.typesystem2.test, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.typechecking.annotation, java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.sample, java.compile.jetbrains.mps.baseLanguageExt.test, java.compile.jetbrains.mps.lang.typesystem2.sample.test, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.test" />
<target name="processResources" />
@ -2521,46 +2449,6 @@
</javac>
</target>
<target name="java.compile.jetbrains.mps.typechecking.annotation#8686569986502648408" depends="java.compile.jetbrains.mps.typechecking.annotation, fetchDependencies">
<mkdir dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.typechecking.annotation/generator/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.typechecking.annotation#8686569986502648408" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.typechecking.annotation#8686569986502648408" fork="true" encoding="utf8" includeantruntime="false" debug="true">
<compilerarg value="-Xlint:none" />
<src>
<path location="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.typechecking.annotation/generator/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-annotations.jar" />
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.typechecking.annotation" />
<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" />
<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>
<target name="java.compile.jetbrains.mps.baseLanguageExt" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, 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" />
@ -2613,49 +2501,6 @@
</javac>
</target>
<target name="java.compile.jetbrains.mps.baseLanguageExt#8436953480441303409" depends="java.compile.jetbrains.mps.baseLanguageExt, fetchDependencies">
<mkdir dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/generator/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt#8436953480441303409" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt#8436953480441303409" fork="true" encoding="utf8" includeantruntime="false" debug="true">
<compilerarg value="-Xlint:none" />
<src>
<path location="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/generator/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-annotations.jar" />
<fileset file="${artifacts.mps}/lib/mps-openapi.jar" />
<fileset file="${artifacts.mps}/lib/mps-core.jar" />
<fileset file="${artifacts.mps}/lib/mps-logging.jar" />
<fileset file="${artifacts.mps}/lib/mps-tuples.jar" />
<fileset file="${artifacts.mps}/lib/mps-messaging.jar" />
<fileset file="${artifacts.mps}/lib/mps-boot-util.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-api.jar" />
<fileset file="${artifacts.mps}/lib/mps-editor-runtime.jar" />
<fileset file="${artifacts.mps}/lib/mps-environment.jar" />
<fileset file="${artifacts.mps}/lib/mps-platform.jar" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
<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" />
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.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" />
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
</classpath>
</javac>
</target>
<target name="java.compile.jetbrains.mps.lang.typesystem2.sample">
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sample" />
@ -2806,7 +2651,7 @@
</javac>
</target>
<target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.test" depends="java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
<target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.test" depends="java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
<mkdir dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/source_gen" />
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.test" />
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
@ -2836,9 +2681,15 @@
<fileset file="${artifacts.mps}/lib/mps-workbench.jar" />
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" />
<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-test.jar" />
<fileset file="${artifacts.mps}/plugins/mps-testing/lib/jetbrains.mps.lang.test.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/ant/lib/ant.jar" />
<fileset file="${artifacts.mps}/lib/annotations.jar" />
<fileset file="${artifacts.mps}/lib/log4j.jar" />
@ -3034,11 +2885,9 @@
<delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
<delete dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/source_gen" />
<delete dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/source_gen" />
<delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.typechecking.annotation/generator/source_gen" />
<delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/source_gen" />
<delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/source_gen" />
<delete dir="${mps.macro.logic_home}/typesystem2/languages/jetbrains.mps.lang.smodel.types/generator/source_gen" />
<delete dir="${mps.macro.logic_home}/typechecking/languages/jetbrains.mps.baseLanguageExt/generator/source_gen" />
<delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/source_gen" />
<delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/source_gen" />
<delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.test/source_gen" />

View File

@ -964,18 +964,18 @@
<ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
</node>
</node>
<node concept="1yeLz9" id="3u5wJtgj8q" role="1TViLv">
<node concept="1yeLz9" id="5w_kaFFMqLh" role="1TViLv">
<property role="TrG5h" value="jetbrains.mps.lang.smodel.types#7345257067587611144" />
<property role="3LESm3" value="ceb57370-a04c-41e9-91e3-f36110b5e4aa" />
<property role="2GAjPV" value="false" />
<node concept="1SiIV0" id="3u5wJtgj8r" role="3bR37C">
<node concept="3bR9La" id="3u5wJtgj8s" role="1SiIV1">
<node concept="1SiIV0" id="5w_kaFFMqLi" role="3bR37C">
<node concept="3bR9La" id="5w_kaFFMqLj" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="7BVjoXzUxee" resolve="jetbrains.mps.lang.typesystem2.runtime" />
</node>
</node>
<node concept="1SiIV0" id="3u5wJtgj8t" role="3bR37C">
<node concept="3bR9La" id="3u5wJtgj8u" role="1SiIV1">
<node concept="1SiIV0" id="5w_kaFFMqLk" role="3bR37C">
<node concept="3bR9La" id="5w_kaFFMqLl" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" to="ffeo:7YI57w6K0rx" resolve="jetbrains.mps.lang.smodel#1139186730696" />
</node>
@ -1263,11 +1263,6 @@
<ref role="3bR37D" to="ffeo:7Kfy9QB6L4X" resolve="jetbrains.mps.lang.editor" />
</node>
</node>
<node concept="1yeLz9" id="46o4wsH5Qli" role="1TViLv">
<property role="TrG5h" value="jetbrains.mps.typechecking.annotation#8686569986502648408" />
<property role="3LESm3" value="a3a7e08f-128a-4c99-9838-c4b2a4582540" />
<property role="2GAjPV" value="false" />
</node>
</node>
<node concept="1E1JtD" id="7Ant4WkHLsF" role="2G$12L">
<property role="BnDLt" value="true" />
@ -1305,11 +1300,6 @@
<ref role="1Busuk" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
</node>
</node>
<node concept="1yeLz9" id="7Ant4WkHLsX" role="1TViLv">
<property role="TrG5h" value="jetbrains.mps.baseLanguageExt#8436953480441303409" />
<property role="3LESm3" value="3128d3e3-76dc-4d6d-b958-99599e4307fa" />
<property role="2GAjPV" value="false" />
</node>
<node concept="1SiIV0" id="363KUOxL2_0" role="3bR37C">
<node concept="3bR9La" id="363KUOxL2_1" role="1SiIV1">
<property role="3bR36h" value="false" />
@ -1511,6 +1501,12 @@
<ref role="3bR37D" node="7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
</node>
</node>
<node concept="1SiIV0" id="5w_kaFF_5i2" role="3bR37C">
<node concept="3bR9La" id="5w_kaFF_5i3" role="1SiIV1">
<property role="3bR36h" value="false" />
<ref role="3bR37D" node="7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
</node>
</node>
</node>
</node>
<node concept="2sgV4H" id="7Ant4WkHLmd" role="1l3spa">

View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:be5ab8d3-12b3-4480-aee8-16596aeb9003(jetbrains.mps.baseLanguageExt.generator.template.main@generator)">
<persistence version="9" />
<languages>
<use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="-1" />
<use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="0" />
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports />
<registry>
<language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
<concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
</registry>
<node concept="bUwia" id="7km57PkcL5M">
<property role="TrG5h" value="main" />
</node>
</model>

View File

@ -6,47 +6,6 @@
</modelRoot>
</models>
<accessoryModels />
<generators>
<generator namespace="jetbrains.mps.baseLanguageExt#8436953480441303409" uuid="3128d3e3-76dc-4d6d-b958-99599e4307fa">
<models>
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="generator/template" />
</modelRoot>
</models>
<external-templates />
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="-1" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
<module reference="0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.lang.typesystem2.sampleLang)" version="0" />
<module reference="3128d3e3-76dc-4d6d-b958-99599e4307fa(jetbrains.mps.lang.typesystem2.sampleLang#8436953480441303409)" version="0" />
</dependencyVersions>
<mapping-priorities />
</generator>
</generators>
<sourcePath />
<dependencies>
<dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>

View File

@ -5,7 +5,9 @@
<use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="3" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports />
<imports>
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
</imports>
<registry />
</model>

View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<model ref="r:4f7fc196-9a9a-467a-9a63-602ad75de20b(jetbrains.mps.typechecking.annotation.generator.template.main@generator)">
<persistence version="9" />
<languages>
<use id="0b80a2e8-f9f1-47b3-823f-56eb115bca42" name="jetbrains.mps.typechecking.annotation" version="0" />
<use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
<use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="0" />
<use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports />
<registry>
<language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
<concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
</language>
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
</language>
</registry>
<node concept="bUwia" id="7ycTm4q3Q9p">
<property role="TrG5h" value="main" />
</node>
</model>

View File

@ -6,43 +6,6 @@
</modelRoot>
</models>
<accessoryModels />
<generators>
<generator namespace="jetbrains.mps.typechecking.annotation#8686569986502648408" uuid="a3a7e08f-128a-4c99-9838-c4b2a4582540">
<models>
<modelRoot contentPath="${module}" type="default">
<sourceRoot location="generator/template" />
</modelRoot>
</models>
<external-templates />
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="0b80a2e8-f9f1-47b3-823f-56eb115bca42(jetbrains.mps.typechecking.annotation)" version="0" />
<module reference="a3a7e08f-128a-4c99-9838-c4b2a4582540(jetbrains.mps.typechecking.annotation#8686569986502648408)" version="0" />
</dependencyVersions>
<mapping-priorities />
</generator>
</generators>
<sourcePath />
<dependencies>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>

View File

@ -12,6 +12,7 @@
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
<dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
<dependency reexport="false">bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
@ -22,13 +23,13 @@
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="0" />
<language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
<language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
<language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="1" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
<language slang="l:0fda14cc-a416-4c81-869a-2175d8b3325d:jetbrains.mps.lang.typesystem2.sampleLang" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
@ -38,6 +39,7 @@
<module reference="fec0c515-766a-48ae-a50a-45de7ad21bd9(jetbrains.mps.lang.typesystem2.samplechecker.test)" version="0" />
<module reference="35e2a720-13d8-4eda-88d3-ff9d78d5a3ae(jetbrains.mps.lang.typesystem2.sampleplugin)" version="0" />
<module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.typesystem2.template)" version="0" />
<module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
<module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
</dependencyVersions>
</solution>

View File

@ -10,7 +10,7 @@
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="5" />
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="-1" />
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
<use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.lang.typesystem2.sampleLang" version="-1" />
<use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="-1" />
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
</languages>
<imports>

View File

@ -6,7 +6,8 @@
<devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
</languages>
<imports>
<import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" implicit="true" />
<import index="tp25" ref="r:00000000-0000-4000-0000-011c89590301(jetbrains.mps.lang.smodel.structure)" />
<import index="tpee" ref="r:00000000-0000-4000-0000-011c895902ca(jetbrains.mps.baseLanguage.structure)" />
</imports>
<registry>
<language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">