Rebuild project
This commit is contained in:
Fedor Isakov
parent
5516f062f1
commit
e37dffd4a1
|
|
@ -18,6 +18,7 @@
|
|||
<property name="mps.teamcity.buildConfName" value="${import.mps.mps.teamcity.buildConfName}" />
|
||||
<property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
|
||||
<property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
|
||||
<property name="mps.runtimeBuild" value="${import.mps.mps.runtimeBuild}" />
|
||||
<property name="mpsBootstrapCore.version.major" value="${import.mps.mpsBootstrapCore.version.major}" />
|
||||
<property name="mpsBootstrapCore.version.minor" value="${import.mps.mpsBootstrapCore.version.minor}" />
|
||||
<property name="mpsBootstrapCore.version.bugfixNr" value="${import.mps.mpsBootstrapCore.version.bugfixNr}" />
|
||||
|
|
@ -90,9 +91,7 @@
|
|||
<module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
|
||||
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
|
||||
<module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
|
||||
<module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
|
||||
<module ref="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" kind="cl" />
|
||||
<module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
|
||||
</dependencies>
|
||||
<uses>
|
||||
<language id="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" />
|
||||
|
|
@ -272,9 +271,7 @@
|
|||
<module ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" kind="cl" />
|
||||
<module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
|
||||
<module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
|
||||
<module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
|
||||
<module ref="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" kind="cl" />
|
||||
<module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
|
||||
<module ref="748b3ba1-2791-4ee8-b985-a5598baa7112(samples.fitch.herbrandLogic)" kind="cl" />
|
||||
</dependencies>
|
||||
<uses>
|
||||
|
|
@ -453,9 +450,7 @@
|
|||
<module ref="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" kind="cl" />
|
||||
<module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
|
||||
<module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
|
||||
<module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
|
||||
<module ref="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" kind="cl" />
|
||||
<module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
|
||||
<module ref="ec79e64d-4cbb-4f6c-b7b7-108dd125aba6(samples.fitch.propositionalLogic)" kind="cl" />
|
||||
</dependencies>
|
||||
<uses>
|
||||
|
|
@ -635,9 +630,7 @@
|
|||
<module ref="daafa647-f1f7-4b0b-b096-69cd7c8408c0(jetbrains.mps.baseLanguage.regexp)" kind="cl" />
|
||||
<module ref="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.coderules.typechecking)" kind="cl" />
|
||||
<module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
|
||||
<module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
|
||||
<module ref="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462(jetbrains.mps.lang.typechecking)" kind="cl" />
|
||||
<module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
|
||||
<module ref="06b7c5c7-e359-4f4b-a581-5d0c9323af39(samples.fitch)" kind="cl" />
|
||||
</dependencies>
|
||||
<uses>
|
||||
|
|
@ -837,7 +830,7 @@
|
|||
<zipfileset file="${basedir}/solutions/samples.fitch.demo/samples.fitch.demo.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-samples.fitch.demo-models" prefix="module/models" />
|
||||
</jar>
|
||||
<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.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}${line.separator}coderules.ci.build.tag=${coderules.ci.build.tag}${line.separator}coderules.ci.mps.release=${coderules.ci.mps.release}${line.separator}coderules.test.jvmargs=${coderules.test.jvmargs}</echo>
|
||||
<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}mps.runtimeBuild=${mps.runtimeBuild}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}${line.separator}coderules.ci.build.tag=${coderules.ci.build.tag}${line.separator}coderules.ci.mps.release=${coderules.ci.mps.release}${line.separator}coderules.test.jvmargs=${coderules.test.jvmargs}</echo>
|
||||
</target>
|
||||
|
||||
<target name="buildDependents" />
|
||||
|
|
@ -862,6 +855,7 @@
|
|||
<plugin path="${artifacts.mps}/plugins/mps-build" id="jetbrains.mps.build" />
|
||||
<plugin path="${artifacts.mps}/plugins/mps-core" id="jetbrains.mps.core" />
|
||||
<plugin path="${artifacts.mps}/plugins/mps-java" id="jetbrains.mps.ide.java" />
|
||||
<plugin path="${artifacts.mps}/plugins/mps-junit5" id="jetbrains.mps.junit5" />
|
||||
<plugin path="${artifacts.mps}/plugins/mps-testing" id="jetbrains.mps.testing" />
|
||||
<library file="${artifacts.mps}/languages/baseLanguage/closures.runtime.jar" />
|
||||
<library file="${artifacts.mps}/languages/baseLanguage/collections.runtime.jar" />
|
||||
|
|
@ -1071,11 +1065,13 @@
|
|||
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/util-8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/stats.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
|
||||
|
|
@ -1117,6 +1113,9 @@
|
|||
<fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.17.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${build.tmp}/java/out/samples.fitch">
|
||||
<fileset dir="${mps.macro.fitch_home}/languages/samples.fitch/source_gen" excludes="**/*.java" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.samples.fitch#4322786184247805322" depends="java.compile.samples.fitch, fetchDependencies">
|
||||
|
|
@ -1164,15 +1163,20 @@
|
|||
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/util-8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/stats.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${build.tmp}/java/out/samples.fitch#4322786184247805322">
|
||||
<fileset dir="${mps.macro.fitch_home}/languages/samples.fitch/generator/source_gen" excludes="**/*.java" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.samples.fitch.propositionalLogic" depends="java.compile.samples.fitch, fetchDependencies">
|
||||
|
|
@ -1220,11 +1224,13 @@
|
|||
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/util-8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/stats.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
|
||||
|
|
@ -1266,6 +1272,9 @@
|
|||
<fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.17.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${build.tmp}/java/out/samples.fitch.propositionalLogic">
|
||||
<fileset dir="${mps.macro.fitch_home}/languages/samples.fitch.propositionalLogic/source_gen" excludes="**/*.java" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.samples.fitch.propositionalLogic#5505606474790531941" depends="java.compile.samples.fitch, java.compile.samples.fitch.propositionalLogic, fetchDependencies">
|
||||
|
|
@ -1314,15 +1323,20 @@
|
|||
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/util-8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/stats.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${build.tmp}/java/out/samples.fitch.propositionalLogic#5505606474790531941">
|
||||
<fileset dir="${mps.macro.fitch_home}/languages/samples.fitch.propositionalLogic/generator/source_gen" excludes="**/*.java" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.samples.fitch.herbrandLogic" depends="java.compile.samples.fitch, java.compile.samples.fitch.propositionalLogic, fetchDependencies">
|
||||
|
|
@ -1371,11 +1385,13 @@
|
|||
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/util-8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/stats.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
|
||||
|
|
@ -1417,6 +1433,9 @@
|
|||
<fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.17.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${build.tmp}/java/out/samples.fitch.herbrandLogic">
|
||||
<fileset dir="${mps.macro.fitch_home}/languages/samples.fitch.herbrandLogic/source_gen" excludes="**/*.java" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.samples.fitch.herbrandLogic#3059457401298723545" depends="java.compile.samples.fitch, java.compile.samples.fitch.herbrandLogic, java.compile.samples.fitch.propositionalLogic, fetchDependencies">
|
||||
|
|
@ -1466,15 +1485,20 @@
|
|||
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/util-8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/stats.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${build.tmp}/java/out/samples.fitch.herbrandLogic#3059457401298723545">
|
||||
<fileset dir="${mps.macro.fitch_home}/languages/samples.fitch.herbrandLogic/generator/source_gen" excludes="**/*.java" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.samples.fitch.firstOrderLogic" depends="java.compile.samples.fitch, java.compile.samples.fitch.herbrandLogic, java.compile.samples.fitch.propositionalLogic, fetchDependencies">
|
||||
|
|
@ -1524,11 +1548,13 @@
|
|||
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/util-8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/stats.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
|
||||
|
|
@ -1568,6 +1594,9 @@
|
|||
<fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.17.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${build.tmp}/java/out/samples.fitch.firstOrderLogic">
|
||||
<fileset dir="${mps.macro.fitch_home}/languages/samples.fitch.firstOrderLogic/source_gen" excludes="**/*.java" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.samples.fitch.firstOrderLogic#4035326440039985569" depends="java.compile.samples.fitch, java.compile.samples.fitch.firstOrderLogic, java.compile.samples.fitch.herbrandLogic, java.compile.samples.fitch.propositionalLogic, fetchDependencies">
|
||||
|
|
@ -1618,15 +1647,20 @@
|
|||
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/util-8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/stats.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${build.tmp}/java/out/samples.fitch.firstOrderLogic#4035326440039985569">
|
||||
<fileset dir="${mps.macro.fitch_home}/languages/samples.fitch.firstOrderLogic/generator/source_gen" excludes="**/*.java" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.samples.fitch.demo" depends="java.compile.samples.fitch, java.compile.samples.fitch.firstOrderLogic, java.compile.samples.fitch.herbrandLogic, java.compile.samples.fitch.propositionalLogic, fetchDependencies">
|
||||
|
|
@ -1681,11 +1715,13 @@
|
|||
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/util-8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/stats.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove.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.scopes.jar" />
|
||||
|
|
@ -1711,24 +1747,29 @@
|
|||
<fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
|
||||
<fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
|
||||
<fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.17.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="apiguardian-api-1.1.2.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="opentest4j-1.2.0.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-jupiter-api-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-jupiter-engine-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-jupiter-migrationsupport-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-jupiter-params-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-platform-commons-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-platform-engine-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-platform-launcher-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-vintage-engine-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-platform-reporting-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="apiguardian-api-1.1.2.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-api-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-engine-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-migrationsupport-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-params-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-platform-commons-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-platform-engine-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-platform-launcher-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-vintage-engine-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="opentest4j-1.2.0.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-platform-reporting-1.9.3.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${build.tmp}/java/out/samples.fitch.demo">
|
||||
<fileset dir="${mps.macro.fitch_home}/solutions/samples.fitch.demo/source_gen" excludes="**/*.java" />
|
||||
<fileset dir="${mps.macro.fitch_home}/solutions/samples.fitch.demo/test_gen/" excludes="**/*.java" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="test.check" depends="assemble">
|
||||
<path location="${build.layout}/modules/samples.fitch.demo.jar" id="mps.tests.path" />
|
||||
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
|
||||
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
|
||||
<launchtests fork="true" haltonfailure="true" mpshome="${artifacts.mps}" reports="${build.tmp}">
|
||||
<jvmargs>
|
||||
<arg value="-ea" />
|
||||
|
|
@ -1741,7 +1782,7 @@
|
|||
<arg value="-Didea.config.path=${build.mps.config.path}" />
|
||||
<arg value="-Didea.system.path=${build.mps.system.path}" />
|
||||
<arg value="-Dintellij.platform.load.app.info.from.resources=true" />
|
||||
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
|
||||
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
|
||||
</jvmargs>
|
||||
|
||||
|
||||
|
|
@ -1880,6 +1921,7 @@
|
|||
<plugin id="jetbrains.mps.build" path="${artifacts.mps}/plugins/mps-build" />
|
||||
<plugin id="jetbrains.mps.core" path="${artifacts.mps}/plugins/mps-core" />
|
||||
<plugin id="jetbrains.mps.ide.java" path="${artifacts.mps}/plugins/mps-java" />
|
||||
<plugin id="jetbrains.mps.junit5" path="${artifacts.mps}/plugins/mps-junit5" />
|
||||
<plugin id="jetbrains.mps.testing" path="${artifacts.mps}/plugins/mps-testing" />
|
||||
<macro name="fitch_home" path="${basedir}" />
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
<property name="mps.teamcity.buildConfName" value="${import.mps.mps.teamcity.buildConfName}" />
|
||||
<property name="mps.idea.platform.build.number" value="${import.mps.mps.idea.platform.build.number}" />
|
||||
<property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
|
||||
<property name="mps.runtimeBuild" value="${import.mps.mps.runtimeBuild}" />
|
||||
<property name="mpsBootstrapCore.version.major" value="${import.mps.mpsBootstrapCore.version.major}" />
|
||||
<property name="mpsBootstrapCore.version.minor" value="${import.mps.mpsBootstrapCore.version.minor}" />
|
||||
<property name="mpsBootstrapCore.version.bugfixNr" value="${import.mps.mpsBootstrapCore.version.bugfixNr}" />
|
||||
|
|
@ -91,8 +92,6 @@
|
|||
<module ref="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" kind="cl" />
|
||||
<module ref="26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)" kind="cl" />
|
||||
<module ref="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" kind="cl" />
|
||||
<module ref="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" kind="cl" />
|
||||
<module ref="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" kind="cl" />
|
||||
<module ref="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" kind="cl" />
|
||||
<module ref="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" kind="cl" />
|
||||
</dependencies>
|
||||
|
|
@ -241,7 +240,7 @@
|
|||
<zipfileset file="${basedir}/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd" prefix="module" />
|
||||
<zipfileset dir="${build.tmp}/customProcessors/copyModels/solutions-samples.lambdacalc.demo-models" prefix="module/models" />
|
||||
</jar>
|
||||
<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.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}${line.separator}coderules.ci.build.tag=${coderules.ci.build.tag}${line.separator}coderules.ci.mps.release=${coderules.ci.mps.release}${line.separator}coderules.test.jvmargs=${coderules.test.jvmargs}</echo>
|
||||
<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}mps.runtimeBuild=${mps.runtimeBuild}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}coderules.ci.build.num=${coderules.ci.build.num}${line.separator}coderules.ci.build.tag=${coderules.ci.build.tag}${line.separator}coderules.ci.mps.release=${coderules.ci.mps.release}${line.separator}coderules.test.jvmargs=${coderules.test.jvmargs}</echo>
|
||||
</target>
|
||||
|
||||
<target name="buildDependents" />
|
||||
|
|
@ -276,6 +275,7 @@
|
|||
<plugin path="${artifacts.mps}/plugins/mps-build" id="jetbrains.mps.build" />
|
||||
<plugin path="${artifacts.mps}/plugins/mps-core" id="jetbrains.mps.core" />
|
||||
<plugin path="${artifacts.mps}/plugins/mps-java" id="jetbrains.mps.ide.java" />
|
||||
<plugin path="${artifacts.mps}/plugins/mps-junit5" id="jetbrains.mps.junit5" />
|
||||
<plugin path="${artifacts.mps}/plugins/mps-testing" id="jetbrains.mps.testing" />
|
||||
<library file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.test.jar" />
|
||||
<library file="${artifacts.coderules}/jetbrains.mps.coderules/languages/jetbrains.mps.coderules.typechecking.testlang.sandbox.jar" />
|
||||
|
|
@ -474,11 +474,13 @@
|
|||
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/util-8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/stats.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/runtimes/jetbrains.mps.analyzers.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
|
||||
<fileset file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
|
||||
|
|
@ -504,6 +506,9 @@
|
|||
<fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.17.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${build.tmp}/java/out/samples.lambdacalc">
|
||||
<fileset dir="${mps.macro.lambdacalc_home}/languages/samples.lambdacalc/source_gen" excludes="**/*.java" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="java.compile.samples.lambdacalc.demo" depends="java.compile.samples.lambdacalc, fetchDependencies">
|
||||
|
|
@ -555,11 +560,13 @@
|
|||
<fileset file="${artifacts.mps}/lib/util_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/util-8.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/forms_rt.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-frontback.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/java-impl.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/jps-model.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/testFramework.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/stats.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/platform-loader.jar" />
|
||||
<fileset file="${artifacts.mps}/lib/trove.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.scopes.jar" />
|
||||
|
|
@ -587,24 +594,29 @@
|
|||
<fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="collection-0.7.jar" />
|
||||
<fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="trove4j-3.0.3.jar" />
|
||||
<fileset dir="${artifacts.coderules}/jetbrains.mps.coderules/lib" includes="conreactor-core-0.9.17.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="apiguardian-api-1.1.2.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="opentest4j-1.2.0.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-jupiter-api-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-jupiter-engine-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-jupiter-migrationsupport-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-jupiter-params-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-platform-commons-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-platform-engine-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-platform-launcher-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-vintage-engine-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-testing/languages/junit5/lib" includes="junit-platform-reporting-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="apiguardian-api-1.1.2.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-api-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-engine-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-migrationsupport-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-jupiter-params-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-platform-commons-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-platform-engine-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-platform-launcher-1.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-vintage-engine-5.9.3.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="opentest4j-1.2.0.jar" />
|
||||
<fileset dir="${artifacts.mps}/plugins/mps-junit5/lib" includes="junit-platform-reporting-1.9.3.jar" />
|
||||
</classpath>
|
||||
</javac>
|
||||
<copy todir="${build.tmp}/java/out/samples.lambdacalc.demo">
|
||||
<fileset dir="${mps.macro.lambdacalc_home}/solutions/samples.lambdacalc.demo/source_gen" excludes="**/*.java" />
|
||||
<fileset dir="${mps.macro.lambdacalc_home}/solutions/samples.lambdacalc.demo/test_gen/" excludes="**/*.java" />
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
<target name="test.demo" depends="assemble">
|
||||
<path location="${build.layout}/lambdacalc/samples.lambdacalc.demo.jar" id="mps.tests.path" />
|
||||
<pathconvert property="mps.tests.path.string" refid="mps.tests.path" />
|
||||
<property name="build.jna.library.path" location="${artifacts.mps}/lib/jna" />
|
||||
<launchtests fork="true" haltonfailure="true" mpshome="${artifacts.mps}" reports="${build.tmp}">
|
||||
<jvmargs>
|
||||
<arg value="-ea" />
|
||||
|
|
@ -617,7 +629,7 @@
|
|||
<arg value="-Didea.config.path=${build.mps.config.path}" />
|
||||
<arg value="-Didea.system.path=${build.mps.system.path}" />
|
||||
<arg value="-Dintellij.platform.load.app.info.from.resources=true" />
|
||||
<arg value="-Djna.boot.library.path=${artifacts.mps}/lib/jna" />
|
||||
<arg value="-Djna.boot.library.path=${build.jna.library.path}" />
|
||||
</jvmargs>
|
||||
|
||||
|
||||
|
|
@ -757,6 +769,7 @@
|
|||
<plugin id="jetbrains.mps.build" path="${artifacts.mps}/plugins/mps-build" />
|
||||
<plugin id="jetbrains.mps.core" path="${artifacts.mps}/plugins/mps-core" />
|
||||
<plugin id="jetbrains.mps.ide.java" path="${artifacts.mps}/plugins/mps-java" />
|
||||
<plugin id="jetbrains.mps.junit5" path="${artifacts.mps}/plugins/mps-junit5" />
|
||||
<plugin id="jetbrains.mps.testing" path="${artifacts.mps}/plugins/mps-testing" />
|
||||
<macro name="lambdacalc_home" path="${basedir}" />
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue