Trying to make tests launch from the build file (unsuccessful)
This commit is contained in:
Fedor Isakov
parent
569b1fd082
commit
778f1bf167
120
build.xml
120
build.xml
|
|
@ -370,7 +370,7 @@
|
|||
<module ref="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" />
|
||||
<module ref="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" />
|
||||
</dependencies>
|
||||
<library jar="../languages/unification-lib-1.0.2.jar" />
|
||||
<library jar="../lib/unification-lib-1.0.2.jar" />
|
||||
<sources jar="jetbrains.mps.logic.atom-src.jar" descriptor="jetbrains.mps.logic.atom.msd" />
|
||||
</module>
|
||||
</echoxml>
|
||||
|
|
@ -401,11 +401,11 @@
|
|||
<module ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" />
|
||||
<module ref="a3e4657f-a76c-45bb-bbda-c764596ecc65(jetbrains.mps.baseLanguage.logging.runtime)" />
|
||||
</dependencies>
|
||||
<library jar="../languages/memreactor-core-0.1.jar" />
|
||||
<library jar="../languages/dexx-collections-0.2.jar" />
|
||||
<library jar="../languages/google-collections-1.0.jar" />
|
||||
<library jar="../languages/kotlin-runtime-1.0.0-rc-1050.jar" />
|
||||
<library jar="../languages/kotlin-stdlib-1.0.0-rc-1050.jar" />
|
||||
<library jar="../lib/memreactor-core-0.1.jar" />
|
||||
<library jar="../lib/dexx-collections-0.2.jar" />
|
||||
<library jar="../lib/google-collections-1.0.jar" />
|
||||
<library jar="../lib/kotlin-runtime-1.0.0-rc-1050.jar" />
|
||||
<library jar="../lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
|
||||
<sources jar="jetbrains.mps.logic.reactor-src.jar" descriptor="jetbrains.mps.logic.reactor.msd" />
|
||||
</module>
|
||||
</echoxml>
|
||||
|
|
@ -429,8 +429,8 @@
|
|||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/logic-solutions-jetbrains.mps.logic.reactor-models" prefix="module/models" />
|
||||
</jar>
|
||||
<zip destfile="${build.layout}/samplechecker.zip">
|
||||
<zipfileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib" prefix="samplechecker/languages" />
|
||||
<zipfileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib" prefix="samplechecker/languages" />
|
||||
<zipfileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib" prefix="samplechecker/lib" />
|
||||
<zipfileset dir="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib" prefix="samplechecker/lib" />
|
||||
<fileset dir="${build.tmp}/default/samplechecker.zip" />
|
||||
</zip>
|
||||
<echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}</echo>
|
||||
|
|
@ -447,7 +447,7 @@
|
|||
<delete dir="${build.layout}" />
|
||||
</target>
|
||||
|
||||
<target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.2, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin" />
|
||||
<target name="compileJava" depends="java.compile.jetbrains.mps.logic, java.compile.jetbrains.mps.logic#6626732309150416985, java.compile.java.modules.cycle.1, java.compile.jetbrains.mps.logic.runtime, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.lang.typesystem2, java.compile.jetbrains.mps.lang.typesystem2#4578927328670739933, java.compile.java.modules.cycle.2, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.sampleplugin, java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
|
||||
|
||||
<target name="processResources" />
|
||||
|
||||
|
|
@ -1106,57 +1106,6 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
<compilerarg value="-Xlint:none" />
|
||||
<src>
|
||||
<path location="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/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-tuples.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.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
|
||||
<fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
|
||||
<fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
|
||||
<fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
|
||||
<fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
|
||||
<fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/asm-all.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.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.sampleplugin" 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, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.sampleplugin/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.sampleplugin" />
|
||||
|
|
@ -1217,6 +1166,57 @@
|
|||
</javac>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.jetbrains.mps.lang.typesystem2.samplechecker.handler.util" depends="java.compile.jetbrains.mps.lang.typesystem2.runtime, java.compile.jetbrains.mps.lang.typesystem2.template, java.compile.jetbrains.mps.logic.atom, java.compile.jetbrains.mps.logic.reactor, java.compile.jetbrains.mps.logic.runtime, fetchDependencies">
|
||||
<mkdir dir="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/source_gen" />
|
||||
<mkdir dir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" />
|
||||
<javac destdir="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.samplechecker.handler.util" fork="true" encoding="utf8" includeantruntime="false" debug="true">
|
||||
<compilerarg value="-Xlint:none" />
|
||||
<src>
|
||||
<path location="${basedir}/typechecking/solutions/jetbrains.mps.lang.typesystem2.samplechecker.handler.util/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-tuples.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.lang.typesystem2.runtime" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.lang.typesystem2.template" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.atom" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.reactor" />
|
||||
<pathelement path="${build.tmp}/java/out/jetbrains.mps.logic.runtime" />
|
||||
<fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.atom/lib/unification-lib-1.0.2.jar" />
|
||||
<fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/memreactor-core-0.1.jar" />
|
||||
<fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/dexx-collections-0.2.jar" />
|
||||
<fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/google-collections-1.0.jar" />
|
||||
<fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-runtime-1.0.0-rc-1050.jar" />
|
||||
<fileset file="${basedir}/logic/solutions/jetbrains.mps.logic.reactor/lib/kotlin-stdlib-1.0.0-rc-1050.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/log4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/annotations.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jdom.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove4j.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/xstream-1.4.8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/asm-all.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/diffutils-1.2.1.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/ecj-4.5.2.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.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="cleanSources">
|
||||
<delete dir="${basedir}/logic/languages/jetbrains.mps.logic/source_gen" />
|
||||
<delete dir="${basedir}/logic/languages/jetbrains.mps.logic/generator/source_gen" />
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
<modelRoot contentPath="${module}" type="default">
|
||||
<sourceRoot location="models" />
|
||||
</modelRoot>
|
||||
<modelRoot contentPath="${module}" type="java_source_stubs" />
|
||||
</models>
|
||||
<sourcePath />
|
||||
<dependencies>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<model ref="r:5a1f4b5d-8f7a-49a1-a68a-49cfbbceb473(jetbrains.mps.lang.typesystem2.samplechecker.handle.test.util)">
|
||||
<model ref="r:1d1f2b4d-6979-4c44-824f-e9f44617f63d(jetbrains.mps.lang.typesystem2.samplechecker.handle.test.util@tests)">
|
||||
<persistence version="9" />
|
||||
<languages>
|
||||
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
|
||||
|
|
@ -1,12 +1,15 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<model ref="r:a2b9c5e8-1c86-4372-9a3f-35db5f00994a(jetbrains.mps.lang.typesystem2.samplechecker.test.type)">
|
||||
<model ref="r:2b3e6804-bc6d-4927-bcda-d2c5bfc10d0b(jetbrains.mps.lang.typesystem2.samplechecker.test.type@tests)">
|
||||
<persistence version="9" />
|
||||
<languages>
|
||||
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
|
||||
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="0" />
|
||||
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="1" />
|
||||
<use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
|
||||
<use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
|
||||
<use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="4" />
|
||||
<use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="4" />
|
||||
<use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="0" />
|
||||
<use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
|
||||
<devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
|
||||
</languages>
|
||||
<imports>
|
||||
Loading…
Reference in New Issue