Types for j.m.l.test lang
This commit is contained in:
parent
28dd6c7a12
commit
d7ff661670
|
|
@ -3668,7 +3668,7 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.testExt" depends="java.compile.jetbrains.mps.baseLanguageExt, fetchDependencies">
|
||||
<target name="java.compile.jetbrains.mps.lang.testExt" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.smodelExt, fetchDependencies">
|
||||
<mkdir dir="${mps.macro.mpscore_home}/languages/jetbrains.mps.lang.testExt/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.testExt" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.testExt" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
|
|
@ -3705,6 +3705,7 @@
|
|||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.baseLanguageExt" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-feedback-api.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/mps-messages-api.jar" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.smodelExt" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset dir="${artifacts.mps}/lib" includes="*.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
|
|
@ -3713,18 +3714,25 @@
|
|||
<fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.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}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
|
||||
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
|
||||
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.coderules.template.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
|
||||
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
|
||||
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
|
||||
<fileset file="${artifacts.coderules}/deploy/jetbrains.mps.logic.runtime.jar" />
|
||||
<fileset dir="${artifacts.coderules}/deploy/lib" includes="collection-0.7.jar" />
|
||||
<fileset dir="${artifacts.coderules}/deploy/lib" includes="trove4j-3.0.3.jar" />
|
||||
|
|
@ -3776,8 +3784,14 @@
|
|||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/ecj-4.16.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.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}/plugins/mps-testing/languages/baseLanguage/jetbrains.mps.baseLanguage.unitTest.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
|
||||
<fileset file="${artifacts.mps}/plugins/mps-testing/languages/languageDesign/jetbrains.mps.lang.test.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
|
|
|||
|
|
@ -44,21 +44,45 @@
|
|||
</languageVersions>
|
||||
<dependencyVersions>
|
||||
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
|
||||
<module reference="847a3235-09f9-403c-b6a9-1c294a212e92(Ant)" version="0" />
|
||||
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
|
||||
<module reference="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" version="0" />
|
||||
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
|
||||
<module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
|
||||
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
|
||||
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
|
||||
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
|
||||
<module reference="920eaa0e-ecca-46bc-bee7-4e5c59213dd6(Testbench)" version="0" />
|
||||
<module reference="4c6a28d1-2c60-478d-b36e-db9b3cbb21fb(closures.runtime)" version="0" />
|
||||
<module reference="9b80526e-f0bf-4992-bdf5-cee39c1833f3(collections.runtime)" version="0" />
|
||||
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
|
||||
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
|
||||
<module reference="52b81ac7-93fd-4e9e-b972-4995882da6d4(jetbrains.mps.baseLanguage.references.runtime)" version="0" />
|
||||
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
|
||||
<module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
|
||||
<module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
|
||||
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
|
||||
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
|
||||
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" version="0" />
|
||||
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
|
||||
<module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
|
||||
<module reference="e55e6749-03cb-4ea7-9695-2322bab791c1(jetbrains.mps.lang.test.matcher)" version="0" />
|
||||
<module reference="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" version="0" />
|
||||
<module reference="a662e823-fbc1-4c03-bb95-1e23a88e48ee(jetbrains.mps.lang.testExt)" version="0" />
|
||||
<module reference="327272ac-0643-4d5c-922f-c61a3f0f203f(jetbrains.mps.lang.testExt.generator)" version="0" />
|
||||
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
|
||||
<module reference="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" version="0" />
|
||||
</dependencyVersions>
|
||||
<mapping-priorities />
|
||||
</generator>
|
||||
</generators>
|
||||
<sourcePath />
|
||||
<dependencies>
|
||||
<dependency reexport="false">8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)</dependency>
|
||||
<dependency reexport="false">0fda14cc-a416-4c81-869a-2175d8b3325d(jetbrains.mps.baseLanguageExt)</dependency>
|
||||
<dependency reexport="false">d7a92d38-f7db-40d0-8431-763b0c3c9f20(jetbrains.mps.lang.intentions)</dependency>
|
||||
<dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
|
||||
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
|
||||
<dependency reexport="false">65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)</dependency>
|
||||
</dependencies>
|
||||
<languageVersions>
|
||||
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />
|
||||
|
|
@ -101,9 +125,14 @@
|
|||
<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="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
|
||||
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
|
||||
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
|
||||
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
|
||||
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
|
||||
<module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
|
||||
<module reference="fd392034-7849-419d-9071-12563d152375(jetbrains.mps.baseLanguage.closures)" version="0" />
|
||||
<module reference="83888646-71ce-4f1c-9c53-c54016f6ad4f(jetbrains.mps.baseLanguage.collections)" version="0" />
|
||||
<module reference="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67(jetbrains.mps.baseLanguage.lightweightdsl)" version="0" />
|
||||
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
|
||||
<module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
|
||||
|
|
@ -114,7 +143,10 @@
|
|||
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
|
||||
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
|
||||
<module reference="d7a92d38-f7db-40d0-8431-763b0c3c9f20(jetbrains.mps.lang.intentions)" version="0" />
|
||||
<module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
|
||||
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
|
||||
<module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
|
||||
<module reference="65e59b42-e7f3-45ec-8692-6c7829780afe(jetbrains.mps.lang.smodelExt)" version="0" />
|
||||
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
|
||||
<module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
|
||||
<module reference="a662e823-fbc1-4c03-bb95-1e23a88e48ee(jetbrains.mps.lang.testExt)" version="0" />
|
||||
|
|
@ -122,6 +154,8 @@
|
|||
<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>
|
||||
<extendedLanguages />
|
||||
<extendedLanguages>
|
||||
<extendedLanguage>8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)</extendedLanguage>
|
||||
</extendedLanguages>
|
||||
</language>
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1122,11 +1122,6 @@
|
|||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="55xYlrl9SaJ" role="3bR37C">
|
||||
<node concept="3bR9La" id="55xYlrl9SaK" role="1SiIV1">
|
||||
<ref role="3bR37D" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="55xYlrl9SaL" role="3bR37C">
|
||||
<node concept="3bR9La" id="55xYlrl9SaM" role="1SiIV1">
|
||||
<ref role="3bR37D" node="69UmpDmJW26" resolve="jetbrains.mps.baseLanguageExt" />
|
||||
|
|
@ -1137,6 +1132,26 @@
|
|||
<ref role="3bR37D" to="ffeo:7Kfy9QB6L7y" resolve="jetbrains.mps.lang.intentions" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1tzntNAbTLW" role="3bR37C">
|
||||
<node concept="3bR9La" id="1tzntNAbTLX" role="1SiIV1">
|
||||
<ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1tzntNAkqmd" role="3bR37C">
|
||||
<node concept="3bR9La" id="1tzntNAkqme" role="1SiIV1">
|
||||
<ref role="3bR37D" to="ffeo:7Kfy9QB6KYb" resolve="jetbrains.mps.baseLanguage" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1tzntNAkqmf" role="3bR37C">
|
||||
<node concept="3bR9La" id="1tzntNAkqmg" role="1SiIV1">
|
||||
<ref role="3bR37D" node="6Dg__VJQ3B2" resolve="jetbrains.mps.lang.smodelExt" />
|
||||
</node>
|
||||
</node>
|
||||
<node concept="1SiIV0" id="1tzntNAkqmp" role="3bR37C">
|
||||
<node concept="1Busua" id="1tzntNAkqmq" role="1SiIV1">
|
||||
<ref role="1Busuk" to="ffeo:ymnOULAU0H" resolve="jetbrains.mps.lang.test" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
<node concept="2G$12M" id="69UmpDmJW20" role="3989C9">
|
||||
|
|
|
|||
Loading…
Reference in New Issue