Rename solution "typesystem2.test" to "typechecking.test".
This commit is contained in:
Fedor Isakov
parent
51263e9b8b
commit
0a615c8490
|
|
@ -13,12 +13,12 @@
|
|||
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd" folder="typechecking.sample" />
|
||||
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd" folder="typechecking.sample" />
|
||||
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" folder="typechecking.plugin" />
|
||||
<modulePath path="$PROJECT_DIR$/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd" folder="typechecking" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl" folder="typesystem2" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/jetbrains.mps.lang.typesystem2.mpl" folder="typesystem2" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/languages/jetbrains.mps.lang.typesystem2/runtime/jetbrains.mps.lang.typesystem2.runtime.msd" folder="typesystem2" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.helper/jetbrains.mps.lang.typesystem2.helper.msd" folder="typesystem2" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.template/jetbrains.mps.lang.typesystem2.template.msd" folder="typesystem2" />
|
||||
<modulePath path="$PROJECT_DIR$/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd" folder="typechecking" />
|
||||
</projectModules>
|
||||
</component>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
|||
54
build.xml
54
build.xml
|
|
@ -481,10 +481,10 @@
|
|||
<zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/jetbrains.mps.lang.typesystem2.sampleplugin.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.lang.typesystem2.sampleplugin-models" prefix="module/models" />
|
||||
</jar>
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.test.jar" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.test.jar/META-INF" />
|
||||
<echoxml file="${build.tmp}/default/jetbrains.mps.lang.typesystem2.test.jar/META-INF/module.xml">
|
||||
<module namespace="jetbrains.mps.lang.typesystem2.test" type="solution" uuid="c9670c16-a215-41fb-8784-04b14329799d">
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.test.jar" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.test.jar/META-INF" />
|
||||
<echoxml file="${build.tmp}/default/jetbrains.mps.lang.typechecking.test.jar/META-INF/module.xml">
|
||||
<module namespace="jetbrains.mps.lang.typechecking.test" type="solution" uuid="c9670c16-a215-41fb-8784-04b14329799d">
|
||||
<dependencies>
|
||||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
|
||||
<module ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" />
|
||||
|
|
@ -501,27 +501,27 @@
|
|||
<classpath>
|
||||
<entry path="." />
|
||||
</classpath>
|
||||
<sources jar="jetbrains.mps.lang.typesystem2.test-src.jar" descriptor="jetbrains.mps.lang.typesystem2.test.msd" />
|
||||
<sources jar="jetbrains.mps.lang.typechecking.test-src.jar" descriptor="jetbrains.mps.lang.typechecking.test.msd" />
|
||||
</module>
|
||||
</echoxml>
|
||||
<jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.test.jar" duplicate="preserve">
|
||||
<fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.test" />
|
||||
<fileset dir="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test" includes="icons/**, resources/**" />
|
||||
<fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
|
||||
<fileset dir="${build.tmp}/default/jetbrains.mps.lang.typesystem2.test.jar" />
|
||||
<jar destfile="${build.layout}/tests/jetbrains.mps.lang.typechecking.test.jar" duplicate="preserve">
|
||||
<fileset dir="${build.tmp}/java/out/jetbrains.mps.lang.typechecking.test" />
|
||||
<fileset dir="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.test" includes="icons/**, resources/**" />
|
||||
<fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen" includes="**/trace.info, **/exports, **/*.mps, **/checkpoints" />
|
||||
<fileset dir="${build.tmp}/default/jetbrains.mps.lang.typechecking.test.jar" />
|
||||
</jar>
|
||||
<copyModels todir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.test-models">
|
||||
<fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
|
||||
<copyModels todir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking.test-models">
|
||||
<fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/models" includes="**/*.mps, **/*.metadata, **/*.history, **/*.mpsr, **/.model" />
|
||||
</copyModels>
|
||||
<jar destfile="${build.layout}/tests/jetbrains.mps.lang.typesystem2.test-src.jar" duplicate="preserve">
|
||||
<fileset dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/source_gen">
|
||||
<jar destfile="${build.layout}/tests/jetbrains.mps.lang.typechecking.test-src.jar" duplicate="preserve">
|
||||
<fileset dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen">
|
||||
<exclude name="**/trace.info" />
|
||||
<exclude name="**/exports" />
|
||||
<exclude name="**/checkpoints" />
|
||||
<exclude name="**/*.mps" />
|
||||
</fileset>
|
||||
<zipfileset file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typesystem2-solutions-jetbrains.mps.lang.typesystem2.test-models" prefix="module/models" />
|
||||
<zipfileset file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/typechecking-solutions-jetbrains.mps.typechecking.test-models" prefix="module/models" />
|
||||
</jar>
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar" />
|
||||
<mkdir dir="${build.tmp}/default/jetbrains.mps.baseLanguageExt.jar/META-INF" />
|
||||
|
|
@ -1343,7 +1343,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.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" />
|
||||
<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.typechecking.test, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, 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" />
|
||||
|
||||
<target name="processResources" />
|
||||
|
||||
|
|
@ -1457,9 +1457,9 @@
|
|||
<module file="${basedir}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd" />
|
||||
</chunk>
|
||||
<chunk>
|
||||
<module file="${basedir}/typechecking/solutions/jetbrains.mps.typechecking.test/jetbrains.mps.lang.typechecking.test.msd" />
|
||||
<module file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample/jetbrains.mps.lang.typesystem2.sample.msd" />
|
||||
<module file="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/jetbrains.mps.lang.typesystem2.sample.test.msd" />
|
||||
<module file="${basedir}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/jetbrains.mps.lang.typesystem2.test.msd" />
|
||||
</chunk>
|
||||
<jvmargs>
|
||||
<arg value="-Xmx512m" />
|
||||
|
|
@ -2097,14 +2097,14 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, 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}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.test" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.test" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
<target name="java.compile.jetbrains.mps.lang.typechecking.test" depends="java.compile.jetbrains.mps.baseLanguageExt, java.compile.jetbrains.mps.lang.typesystem2.helper, java.compile.jetbrains.mps.lang.typesystem2.runtime, 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.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">
|
||||
<compilerarg value="-Xlint:none" />
|
||||
<src>
|
||||
<path location="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/source_gen" />
|
||||
<pathelement path="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/test_gen/" />
|
||||
<path location="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/source_gen" />
|
||||
<pathelement path="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/test_gen/" />
|
||||
</src>
|
||||
<classpath>
|
||||
<fileset file="${artifacts.mps}/lib/mps-behavior-api.jar" />
|
||||
|
|
@ -2562,8 +2562,8 @@
|
|||
<pathconvert pathsep="${path.separator}" property="mps.plugins.path.string" refid="mps.plugins.path" />
|
||||
<path id="mps.tests.path">
|
||||
<pathelement location="${build.layout}/tests/jetbrains.mps.baseLanguageExt.test.jar" />
|
||||
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.typechecking.test.jar" />
|
||||
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.sample.test.jar" />
|
||||
<pathelement location="${build.layout}/tests/jetbrains.mps.lang.typesystem2.test.jar" />
|
||||
<pathelement location="${build.layout}/tests/jetbrains.mps.logic.test.jar" />
|
||||
</path>
|
||||
<pathconvert pathsep="${path.separator}" property="mps.tests.path.string" refid="mps.tests.path" />
|
||||
|
|
@ -2635,12 +2635,12 @@
|
|||
<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/solutions/jetbrains.mps.typechecking.test/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}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/source_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/logic/solutions/jetbrains.mps.logic.test/test_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.baseLanguageExt.test/test_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.typechecking.test/test_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sample.test/test_gen" />
|
||||
<delete dir="${mps.macro.logic_home}/typesystem2/solutions/jetbrains.mps.lang.typesystem2.test/test_gen" />
|
||||
</target>
|
||||
</project>
|
||||
|
|
@ -969,19 +969,19 @@
|
|||
<property role="TrG5h" value="typesystem2-test" />
|
||||
<node concept="1E1JtA" id="5pz4PwHqqS4" role="2G$12L">
|
||||
<property role="BnDLt" value="true" />
|
||||
<property role="TrG5h" value="jetbrains.mps.lang.typesystem2.test" />
|
||||
<property role="TrG5h" value="jetbrains.mps.lang.typechecking.test" />
|
||||
<property role="3LESm3" value="c9670c16-a215-41fb-8784-04b14329799d" />
|
||||
<property role="2GAjPV" value="false" />
|
||||
<property role="aoJFB" value="sources and tests" />
|
||||
<node concept="55IIr" id="5pz4PwHqqS5" role="3LF7KH">
|
||||
<node concept="2Ry0Ak" id="5pz4PwHqrc5" role="iGT6I">
|
||||
<property role="2Ry0Am" value="typesystem2" />
|
||||
<property role="2Ry0Am" value="typechecking" />
|
||||
<node concept="2Ry0Ak" id="5pz4PwHqrm6" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="solutions" />
|
||||
<node concept="2Ry0Ak" id="5pz4PwHqrw7" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.test" />
|
||||
<node concept="2Ry0Ak" id="5pz4PwHqrE8" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="jetbrains.mps.lang.typesystem2.test.msd" />
|
||||
<property role="2Ry0Am" value="jetbrains.mps.typechecking.test" />
|
||||
<node concept="2Ry0Ak" id="6HVcbo5Dy$x" role="2Ry0An">
|
||||
<property role="2Ry0Am" value="jetbrains.mps.lang.typechecking.test.msd" />
|
||||
</node>
|
||||
</node>
|
||||
</node>
|
||||
|
|
@ -1433,7 +1433,7 @@
|
|||
<ref role="L2wRA" node="65DJywFj0Fi" resolve="jetbrains.mps.lang.typesystem2.sampleplugin" />
|
||||
</node>
|
||||
<node concept="L2wRC" id="5pz4PwHqt4r" role="39821P">
|
||||
<ref role="L2wRA" node="5pz4PwHqqS4" resolve="jetbrains.mps.lang.typesystem2.test" />
|
||||
<ref role="L2wRA" node="5pz4PwHqqS4" resolve="jetbrains.mps.lang.typechecking.test" />
|
||||
</node>
|
||||
<node concept="3_J27D" id="7Ant4WkHLAr" role="Nbhlr">
|
||||
<node concept="3Mxwew" id="7Ant4WkHLDj" role="3MwsjC">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<solution name="jetbrains.mps.lang.typesystem2.test" uuid="c9670c16-a215-41fb-8784-04b14329799d" moduleVersion="0" compileInMPS="true">
|
||||
<solution name="jetbrains.mps.lang.typechecking.test" uuid="c9670c16-a215-41fb-8784-04b14329799d" moduleVersion="0" compileInMPS="true">
|
||||
<models>
|
||||
<modelRoot contentPath="${module}" type="default">
|
||||
<sourceRoot location="models" />
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<model ref="r:cbfbe9a2-941f-4667-8e48-3bf39c5dad6d(jetbrains.mps.lang.typesystem2.typechecking@tests)">
|
||||
<model ref="r:cbfbe9a2-941f-4667-8e48-3bf39c5dad6d(jetbrains.mps.typechecking@tests)">
|
||||
<persistence version="9" />
|
||||
<languages>
|
||||
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
|
||||
Loading…
Reference in New Issue