From 78a060162503f89a6822c0b8d20cd9f51994c734 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 18 Jul 2018 13:53:54 +0200
Subject: [PATCH] Include lambdacalc sample into the common build.

---
 build.gradle                                  |   6 +-
 samples/lambdacalc/.mps/libraries.xml         |  17 ++
 samples/lambdacalc/.mps/modules.xml           |   3 +-
 samples/lambdacalc/.mps/vcs.xml               |   2 +-
 samples/lambdacalc/build.gradle               |  23 ++
 samples/lambdacalc/build.xml                  | 229 ++++++++++++++++++
 .../models/sample.lambdacalc.types.mps        |   1 -
 .../sample.lambdacalc/sample.lambdacalc.mpl   |   2 +-
 samples/lambdacalc/solutions/build/build.msd  |  32 +++
 .../build/models/sample.lamdacalc.build.mps   | 226 +++++++++++++++++
 settings.gradle                               |   1 +
 11 files changed, 537 insertions(+), 5 deletions(-)
 create mode 100644 samples/lambdacalc/.mps/libraries.xml
 create mode 100644 samples/lambdacalc/build.gradle
 create mode 100644 samples/lambdacalc/build.xml
 create mode 100644 samples/lambdacalc/solutions/build/build.msd
 create mode 100644 samples/lambdacalc/solutions/build/models/sample.lamdacalc.build.mps

diff --git a/build.gradle b/build.gradle
index 0459c9eb..c6c27768 100644
--- a/build.gradle
+++ b/build.gradle
@@ -142,6 +142,10 @@ ant.properties.'ci.build.num' = "${tagMatcher().find() ? tagMatcher()[0][2] : '9
 
 task check {
   dependsOn {
-    [':coderules-test', ':samples/mpscore:mpscore-test']
+    [
+      ':coderules-test',
+      ':samples/mpscore:mpscore-test',
+      ':samples/lambdacalc:lambdacalc-generate'
+    ]
   }
 }
diff --git a/samples/lambdacalc/.mps/libraries.xml b/samples/lambdacalc/.mps/libraries.xml
new file mode 100644
index 00000000..f8cd8b60
--- /dev/null
+++ b/samples/lambdacalc/.mps/libraries.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectLibraryManager">
+    <option name="libraries">
+      <map>
+        <entry key="coderules">
+          <value>
+            <Library>
+              <option name="name" value="coderules" />
+              <option name="path" value="$PROJECT_DIR$/../../build/artifacts/typechecking-plugin/deploy" />
+            </Library>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/samples/lambdacalc/.mps/modules.xml b/samples/lambdacalc/.mps/modules.xml
index ea877cca..ff58a981 100644
--- a/samples/lambdacalc/.mps/modules.xml
+++ b/samples/lambdacalc/.mps/modules.xml
@@ -3,7 +3,8 @@
   <component name="MPSProject">
     <projectModules>
       <modulePath path="$PROJECT_DIR$/languages/sample.lambdacalc/sample.lambdacalc.mpl" folder="" />
+      <modulePath path="$PROJECT_DIR$/solutions/build/build.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/sample.demo/sample.demo.msd" folder="" />
     </projectModules>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/samples/lambdacalc/.mps/vcs.xml b/samples/lambdacalc/.mps/vcs.xml
index 94a25f7f..b2bdec2d 100644
--- a/samples/lambdacalc/.mps/vcs.xml
+++ b/samples/lambdacalc/.mps/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/samples/lambdacalc/build.gradle b/samples/lambdacalc/build.gradle
new file mode 100644
index 00000000..cb80d8b9
--- /dev/null
+++ b/samples/lambdacalc/build.gradle
@@ -0,0 +1,23 @@
+configurations {
+    junitAnt
+}
+
+ant.importBuild('build.xml') {antTarget ->
+    'lambdacalc-'+antTarget
+}
+
+// ensure 'generate' runs before 'classes' ('generate' is NOT optional)
+'lambdacalc-classes' {
+  dependsOn {
+    'lambdacalc-generate'
+  }
+  mustRunAfter {
+    'lambdacalc-generate'
+  }
+}
+
+'lambdacalc-generate' {
+  dependsOn {
+    ':coderules-assemble'
+  }
+}
diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml
new file mode 100644
index 00000000..6e258f3d
--- /dev/null
+++ b/samples/lambdacalc/build.xml
@@ -0,0 +1,229 @@
+<project name="lambdacalc" default="build">
+  <!-- Generated by MPS -->
+  <property name="build.dir" location="build" />
+  <property name="build.tmp" location="${build.dir}/tmp/lambdacalc" />
+  <property name="build.layout" location="${build.dir}/artifacts/lambdacalc" />
+  <property name="coderules_deploy" location="${basedir}/../../build/artifacts/typechecking-plugin" />
+  <property name="mps_home" location="${basedir}/../../MPS_HOME" />
+  <property name="artifacts.mps" location="${mps_home}" />
+  <property name="artifacts.typechecking-plugin" location="${coderules_deploy}" />
+  <property file="${artifacts.mps}/build.properties" prefix="import.mps" />
+  <property file="${artifacts.typechecking-plugin}/build.properties" prefix="import.typechecking-plugin" />
+  <property name="mps.build.number" value="${import.mps.mps.build.number}" />
+  <property name="mps.date" value="${import.mps.mps.date}" />
+  <property name="mps.build.vcs.number" value="${import.mps.mps.build.vcs.number}" />
+  <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="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
+  <property name="typechecking-plugin.ci.build.num" value="${import.typechecking-plugin.typechecking-plugin.ci.build.num}" />
+  <property name="environment" value="env" />
+  <property name="env.JAVA_HOME" value="${java.home}/.." />
+  <property name="jdk.home" value="${env.JAVA_HOME}" />
+  
+  <path id="path.mps.ant.path">
+    <pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
+    <pathelement location="${artifacts.mps}/lib/jdom.jar" />
+    <pathelement location="${artifacts.mps}/lib/log4j.jar" />
+  </path>
+  
+  <target name="assemble" depends="classes, declare-mps-tasks">
+    <mkdir dir="${build.layout}" />
+    <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}${line.separator}typechecking-plugin.ci.build.num=${typechecking-plugin.ci.build.num}</echo>
+  </target>
+  
+  <target name="buildDependents" />
+  
+  <target name="fetchDependencies" />
+  
+  <target name="build" depends="assemble" />
+  
+  <target name="clean">
+    <delete dir="${build.tmp}" />
+    <delete dir="${build.layout}" />
+  </target>
+  
+  <target name="compileJava" depends="java.compile.sample.lambdacalc, java.compile.sample.demo" />
+  
+  <target name="processResources" />
+  
+  <target name="classes" depends="compileJava, processResources" />
+  
+  <target name="test" depends="classes" />
+  
+  <target name="check" depends="test" />
+  
+  <target name="generate" depends="declare-mps-tasks, fetchDependencies">
+    <echo message="generating" />
+    <generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.checkedDots.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.extensionMethods.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.logging.runtime.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.scopes.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.tuples.jar" />
+      <library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguageInternal.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.constraints.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.structure.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.aspect.typesystem.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.bootstrap-languages.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.general-purpose.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-descriptor.jar" />
+      <library file="${artifacts.mps}/languages/devkits/jetbrains.mps.devkit.language-design.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.baseLanguage.lightweightdsl.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.actions.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.aspect.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.behavior.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.checkedName.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.constraints.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.analyzers.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.aspects.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.descriptor.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.runtime.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.quotation.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.refactoring.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.resources.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.script.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.smodel.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.structure.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.textGen.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.traceable.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.typesystem.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.util.order.jar" />
+      <library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.refactoring.participant.jar" />
+      <library file="${artifacts.mps}/languages/text/jetbrains.mps.lang.text.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-api.jar" />
+      <library file="${artifacts.mps}/lib/mps-behavior-runtime.jar" />
+      <library file="${artifacts.mps}/lib/mps-closures.jar" />
+      <library file="${artifacts.mps}/lib/mps-collections.jar" />
+      <library file="${artifacts.mps}/lib/mps-core.jar" />
+      <library file="${artifacts.mps}/lib/mps-editor.jar" />
+      <library file="${artifacts.mps}/lib/mps-openapi.jar" />
+      <library file="${artifacts.mps}/lib/mps-platform.jar" />
+      <library file="${artifacts.mps}/lib/mps-tuples.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.dataform.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.template.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.smodel.types.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.reactor.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
+      <library file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
+      <chunk bootstrap="true">
+        <module file="${basedir}/languages/sample.lambdacalc/sample.lambdacalc.mpl" bootstrap="true" />
+      </chunk>
+      <chunk>
+        <module file="${basedir}/solutions/sample.demo/sample.demo.msd" />
+      </chunk>
+      <jvmargs>
+        <arg value="-Xmx512m" />
+      </jvmargs>
+      <macro name="coderules_deploy" path="${coderules_deploy}" />
+      <macro name="mps_home" path="${mps_home}" />
+    </generate>
+  </target>
+  
+  <target name="declare-mps-tasks">
+    <taskdef resource="jetbrains/mps/build/ant/antlib.xml" classpathref="path.mps.ant.path" />
+  </target>
+  
+  <target name="makeDependents" />
+  
+  <target name="java.compile.sample.lambdacalc" depends="fetchDependencies">
+    <mkdir dir="${basedir}/languages/sample.lambdacalc/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/sample.lambdacalc" />
+    <javac destdir="${build.tmp}/java/out/sample.lambdacalc" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${basedir}/languages/sample.lambdacalc/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-platform.jar" />
+        <fileset file="${artifacts.mps}/lib/mps-environment.jar" />
+        <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.7.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/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.coderules.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.lang.coderules.runtime.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/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.typechecking-plugin}/deploy/jetbrains.mps.lang.typechecking.runtime.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.logic.runtime.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.jar" />
+        <fileset file="${artifacts.typechecking-plugin}/deploy/jetbrains.mps.typechecking.reporting.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="reactive-streams-1.0.0.final.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava-2.1.1.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="rxjava2-swing-0.2.1.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="collection-0.7.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-api-0.9.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="conreactor-core-0.9.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="trove4j-3.0.3.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-runtime-1.2.30.jar" />
+        <fileset dir="${artifacts.typechecking-plugin}/deploy/lib" includes="kotlin-stdlib-1.2.30.jar" />
+      </classpath>
+    </javac>
+  </target>
+  
+  <target name="java.compile.sample.demo">
+    <mkdir dir="${basedir}/solutions/sample.demo/source_gen" />
+    <mkdir dir="${build.tmp}/java/out/sample.demo" />
+    <javac destdir="${build.tmp}/java/out/sample.demo" fork="true" encoding="utf8" includeantruntime="false" debug="true">
+      <compilerarg value="-Xlint:none" />
+      <src>
+        <path location="${basedir}/solutions/sample.demo/source_gen" />
+      </src>
+      <classpath />
+    </javac>
+  </target>
+  
+  <target name="cleanSources">
+    <delete dir="${basedir}/solutions/sample.demo/source_gen" />
+  </target>
+</project>
\ No newline at end of file
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
index de925f8c..389ec55c 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
+++ b/samples/lambdacalc/languages/sample.lambdacalc/models/sample.lambdacalc.types.mps
@@ -20,7 +20,6 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="w7la" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.evaluation(jetbrains.mps.logic.reactor/)" />
     <import index="cxk7" ref="r:daa544a7-0a5c-49c0-a54c-4c2a5b4868aa(jetbrains.mps.logic.builtin.predicate)" />
-    <import index="69ci" ref="r:d628db6e-191f-4c0f-a802-15ad423aa41e(sample.lambdacalc.types)" />
     <import index="6exd" ref="r:0f9b1fb3-00f9-4480-b235-1a906a087ab2(jetbrains.mps.logic.dataform)" />
     <import index="oy3s" ref="r:a6030cee-34eb-4503-b1bf-015fe5cd8c1a(jetbrains.mps.logic.builtin.unification)" />
     <import index="6pyv" ref="r:e418ad23-36dc-4ed0-b837-26a7fd157da3(jetbrains.mps.lang.coderules.program)" />
diff --git a/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl b/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
index 31aceb58..43c06d4d 100644
--- a/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/sample.lambdacalc/sample.lambdacalc.mpl
@@ -9,7 +9,6 @@
   <sourcePath />
   <dependencies>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
-    <dependency reexport="false">af858d84-85f2-42f4-a854-0b3c6b5cd482(sample.lambdacalc)</dependency>
     <dependency reexport="false">26e8f4ce-2a35-4f44-8065-e5ba154b18e9(jetbrains.mps.lang.coderules.runtime)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)</dependency>
@@ -74,6 +73,7 @@
     <module reference="ff6372a2-2f45-4ec3-952b-02581666015f(jetbrains.mps.lang.coderules.template)" version="0" />
     <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="f486b8aa-5b2d-4ec0-8ef5-8f45d773fb84(jetbrains.mps.lang.typechecking.runtime)" 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" />
     <module reference="6998f568-f0e9-473b-b4a8-9efb6499fc8d(jetbrains.mps.typechecking)" version="0" />
diff --git a/samples/lambdacalc/solutions/build/build.msd b/samples/lambdacalc/solutions/build/build.msd
new file mode 100644
index 00000000..82f2b519
--- /dev/null
+++ b/samples/lambdacalc/solutions/build/build.msd
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<solution name="build" uuid="dc70cc8a-128e-4f6c-ad96-05b193c44372" moduleVersion="0" compileInMPS="true">
+  <models>
+    <modelRoot contentPath="${module}" type="default">
+      <sourceRoot location="models" />
+    </modelRoot>
+  </models>
+  <sourcePath />
+  <dependencies>
+    <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
+    <dependency reexport="false">bc9cd1e7-827b-4d61-b111-d2c896dcae6f(jetbrains.mps.typechecking.build)</dependency>
+  </dependencies>
+  <languageVersions>
+    <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
+    <language slang="l:0cf935df-4699-4e9c-a132-fa109541cba3:jetbrains.mps.build.mps" version="5" />
+    <language slang="l:427a473d-5177-432c-9905-bcbceb71b996:jetbrains.mps.build.mps.runner" version="0" />
+    <language slang="l:9f846aef-4e4a-4a84-828e-7e83fe2697f2:jetbrains.mps.build.mps.testManifest" version="0" />
+    <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="0" />
+    <language slang="l:d5033cee-f632-44b6-b308-89d4fbde34ff:jetbrains.mps.build.startup" version="0" />
+    <language slang="l:698a8d22-a104-47a0-ba8d-10e3ec237f13:jetbrains.mps.build.workflow" version="0" />
+    <language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
+  <dependencyVersions>
+    <module reference="dc70cc8a-128e-4f6c-ad96-05b193c44372(build)" version="0" />
+    <module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
+    <module reference="bc9cd1e7-827b-4d61-b111-d2c896dcae6f(jetbrains.mps.typechecking.build)" version="0" />
+  </dependencyVersions>
+</solution>
+
diff --git a/samples/lambdacalc/solutions/build/models/sample.lamdacalc.build.mps b/samples/lambdacalc/solutions/build/models/sample.lamdacalc.build.mps
new file mode 100644
index 00000000..ba01d96d
--- /dev/null
+++ b/samples/lambdacalc/solutions/build/models/sample.lamdacalc.build.mps
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:28481291-d2d5-4731-aef9-4e3085be546e(sample.lamdacalc.build)">
+  <persistence version="9" />
+  <languages>
+    <use id="427a473d-5177-432c-9905-bcbceb71b996" name="jetbrains.mps.build.mps.runner" version="0" />
+    <use id="698a8d22-a104-47a0-ba8d-10e3ec237f13" name="jetbrains.mps.build.workflow" version="0" />
+    <use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="5" />
+    <use id="d5033cee-f632-44b6-b308-89d4fbde34ff" name="jetbrains.mps.build.startup" version="0" />
+    <use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
+    <use id="9f846aef-4e4a-4a84-828e-7e83fe2697f2" name="jetbrains.mps.build.mps.testManifest" version="0" />
+    <use id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests" version="0" />
+  </languages>
+  <imports>
+    <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
+    <import index="zqd8" ref="r:4f157831-48e7-4c8f-a144-b5bbd1be1539(jetbrains.mps.typechecking.build)" />
+  </imports>
+  <registry>
+    <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
+      <concept id="5481553824944787378" name="jetbrains.mps.build.structure.BuildSourceProjectRelativePath" flags="ng" index="55IIr" />
+      <concept id="7321017245476976379" name="jetbrains.mps.build.structure.BuildRelativePath" flags="ng" index="iG8Mu">
+        <child id="7321017245477039051" name="compositePart" index="iGT6I" />
+      </concept>
+      <concept id="4993211115183325728" name="jetbrains.mps.build.structure.BuildProjectDependency" flags="ng" index="2sgV4H">
+        <reference id="5617550519002745380" name="script" index="1l3spb" />
+        <child id="4129895186893471026" name="artifacts" index="2JcizS" />
+      </concept>
+      <concept id="8618885170173601777" name="jetbrains.mps.build.structure.BuildCompositePath" flags="nn" index="2Ry0Ak">
+        <property id="8618885170173601779" name="head" index="2Ry0Am" />
+        <child id="8618885170173601778" name="tail" index="2Ry0An" />
+      </concept>
+      <concept id="6647099934206700647" name="jetbrains.mps.build.structure.BuildJavaPlugin" flags="ng" index="10PD9b" />
+      <concept id="7389400916848136194" name="jetbrains.mps.build.structure.BuildFolderMacro" flags="ng" index="398rNT">
+        <child id="7389400916848144618" name="defaultPath" index="398pKh" />
+      </concept>
+      <concept id="7389400916848153117" name="jetbrains.mps.build.structure.BuildSourceMacroRelativePath" flags="ng" index="398BVA">
+        <reference id="7389400916848153130" name="macro" index="398BVh" />
+      </concept>
+      <concept id="5617550519002745364" name="jetbrains.mps.build.structure.BuildLayout" flags="ng" index="1l3spV" />
+      <concept id="5617550519002745363" name="jetbrains.mps.build.structure.BuildProject" flags="ng" index="1l3spW">
+        <property id="5204048710541015587" name="internalBaseDirectory" index="2DA0ip" />
+        <child id="4796668409958418110" name="scriptsDir" index="auvoZ" />
+        <child id="6647099934206700656" name="plugins" index="10PD9s" />
+        <child id="7389400916848080626" name="parts" index="3989C9" />
+        <child id="3542413272732620719" name="aspects" index="1hWBAP" />
+        <child id="5617550519002745381" name="dependencies" index="1l3spa" />
+        <child id="5617550519002745378" name="macros" index="1l3spd" />
+        <child id="5617550519002745372" name="layout" index="1l3spN" />
+      </concept>
+    </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>
+    <language id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps">
+      <concept id="6503355885715333289" name="jetbrains.mps.build.mps.structure.BuildMpsAspect" flags="ng" index="2igEWh">
+        <property id="6503355885715353788" name="bootstrap" index="2igJW4" />
+      </concept>
+      <concept id="1500819558095907805" name="jetbrains.mps.build.mps.structure.BuildMps_Group" flags="ng" index="2G$12M">
+        <child id="1500819558095907806" name="modules" index="2G$12L" />
+      </concept>
+      <concept id="868032131020265945" name="jetbrains.mps.build.mps.structure.BuildMPSPlugin" flags="ng" index="3b7kt6" />
+      <concept id="5253498789149381388" name="jetbrains.mps.build.mps.structure.BuildMps_Module" flags="ng" index="3bQrTs">
+        <property id="1500819558096356884" name="doNotCompile" index="2GAjPV" />
+        <child id="5253498789149547704" name="dependencies" index="3bR37C" />
+      </concept>
+      <concept id="5253498789149585690" name="jetbrains.mps.build.mps.structure.BuildMps_ModuleDependencyOnModule" flags="ng" index="3bR9La">
+        <property id="5253498789149547713" name="reexport" index="3bR36h" />
+        <reference id="5253498789149547705" name="module" index="3bR37D" />
+      </concept>
+      <concept id="3189788309731840247" name="jetbrains.mps.build.mps.structure.BuildMps_Solution" flags="ng" index="1E1JtA" />
+      <concept id="3189788309731840248" name="jetbrains.mps.build.mps.structure.BuildMps_Language" flags="ng" index="1E1JtD" />
+      <concept id="322010710375871467" name="jetbrains.mps.build.mps.structure.BuildMps_AbstractModule" flags="ng" index="3LEN3z">
+        <property id="8369506495128725901" name="compact" index="BnDLt" />
+        <property id="322010710375892619" name="uuid" index="3LESm3" />
+        <child id="322010710375956261" name="path" index="3LF7KH" />
+      </concept>
+      <concept id="7259033139236285166" name="jetbrains.mps.build.mps.structure.BuildMps_ExtractedModuleDependency" flags="nn" index="1SiIV0">
+        <child id="7259033139236285167" name="dependency" index="1SiIV1" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="1l3spW" id="7E7FS_VaSlS">
+    <property role="TrG5h" value="lambdacalc" />
+    <property role="2DA0ip" value="../.." />
+    <node concept="2G$12M" id="7E7FS_VaVAi" role="3989C9">
+      <property role="TrG5h" value="lambdacalc" />
+      <node concept="1E1JtD" id="7E7FS_VaVAl" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="sample.lambdacalc" />
+        <property role="3LESm3" value="af858d84-85f2-42f4-a854-0b3c6b5cd482" />
+        <property role="2GAjPV" value="false" />
+        <node concept="55IIr" id="7E7FS_VaVAm" role="3LF7KH">
+          <node concept="2Ry0Ak" id="7E7FS_VaVAs" role="iGT6I">
+            <property role="2Ry0Am" value="languages" />
+            <node concept="2Ry0Ak" id="7E7FS_VaVAx" role="2Ry0An">
+              <property role="2Ry0Am" value="sample.lambdacalc" />
+              <node concept="2Ry0Ak" id="7E7FS_VaVAA" role="2Ry0An">
+                <property role="2Ry0Am" value="sample.lambdacalc.mpl" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7E7FS_VaVAC" role="3bR37C">
+          <node concept="3bR9La" id="7E7FS_VaVAD" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7E7FS_VaVAE" role="3bR37C">
+          <node concept="3bR9La" id="7E7FS_VaVAF" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:7BVjoXzUxee" resolve="jetbrains.mps.lang.coderules.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7E7FS_VaVAG" role="3bR37C">
+          <node concept="3bR9La" id="7E7FS_VaVAH" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:7BVjoXzUxoR" resolve="jetbrains.mps.logic.reactor" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7E7FS_VaVAI" role="3bR37C">
+          <node concept="3bR9La" id="7E7FS_VaVAJ" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7E7FS_VaVAK" role="3bR37C">
+          <node concept="3bR9La" id="7E7FS_VaVAL" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:7BVjoXzUx$V" resolve="jetbrains.mps.logic.runtime" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7E7FS_VaVAM" role="3bR37C">
+          <node concept="3bR9La" id="7E7FS_VaVAN" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7E7FS_VaVAO" role="3bR37C">
+          <node concept="3bR9La" id="7E7FS_VaVAP" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="ffeo:7Kfy9QB6LfQ" resolve="jetbrains.mps.kernel" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="7E7FS_VaVAQ" role="3bR37C">
+          <node concept="3bR9La" id="7E7FS_VaVAR" role="1SiIV1">
+            <property role="3bR36h" value="false" />
+            <ref role="3bR37D" to="zqd8:65DJywFj0Fi" resolve="jetbrains.mps.typechecking" />
+          </node>
+        </node>
+      </node>
+      <node concept="1E1JtA" id="7E7FS_VaVB_" role="2G$12L">
+        <property role="BnDLt" value="true" />
+        <property role="TrG5h" value="sample.demo" />
+        <property role="3LESm3" value="05f15741-5274-4aed-a086-84d9a15ab93b" />
+        <property role="2GAjPV" value="false" />
+        <node concept="55IIr" id="7E7FS_VaVBC" role="3LF7KH">
+          <node concept="2Ry0Ak" id="7E7FS_VaVC3" role="iGT6I">
+            <property role="2Ry0Am" value="solutions" />
+            <node concept="2Ry0Ak" id="7E7FS_VaVC8" role="2Ry0An">
+              <property role="2Ry0Am" value="sample.demo" />
+              <node concept="2Ry0Ak" id="7E7FS_VaVCd" role="2Ry0An">
+                <property role="2Ry0Am" value="sample.demo.msd" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2sgV4H" id="7E7FS_VaV_9" role="1l3spa">
+      <ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
+      <node concept="398BVA" id="7E7FS_VaV_c" role="2JcizS">
+        <ref role="398BVh" node="7E7FS_VaSmi" resolve="mps_home" />
+      </node>
+    </node>
+    <node concept="2sgV4H" id="7E7FS_VaV_t" role="1l3spa">
+      <ref role="1l3spb" to="zqd8:1BDNG5xBZgg" resolve="typechecking-plugin" />
+      <node concept="398BVA" id="7E7FS_VaV_y" role="2JcizS">
+        <ref role="398BVh" node="7E7FS_VaSma" resolve="coderules_deploy" />
+      </node>
+    </node>
+    <node concept="55IIr" id="7E7FS_VaSlT" role="auvoZ" />
+    <node concept="1l3spV" id="7E7FS_VaSlU" role="1l3spN" />
+    <node concept="10PD9b" id="7E7FS_VaSlV" role="10PD9s" />
+    <node concept="3b7kt6" id="7E7FS_VaSm0" role="10PD9s" />
+    <node concept="398rNT" id="7E7FS_VaSma" role="1l3spd">
+      <property role="TrG5h" value="coderules_deploy" />
+      <node concept="55IIr" id="7E7FS_VaSmc" role="398pKh">
+        <node concept="2Ry0Ak" id="7E7FS_VaSn8" role="iGT6I">
+          <property role="2Ry0Am" value=".." />
+          <node concept="2Ry0Ak" id="7E7FS_VaSnb" role="2Ry0An">
+            <property role="2Ry0Am" value=".." />
+            <node concept="2Ry0Ak" id="7E7FS_VaV_Z" role="2Ry0An">
+              <property role="2Ry0Am" value="build" />
+              <node concept="2Ry0Ak" id="7E7FS_VaVA4" role="2Ry0An">
+                <property role="2Ry0Am" value="artifacts" />
+                <node concept="2Ry0Ak" id="7E7FS_VaVA9" role="2Ry0An">
+                  <property role="2Ry0Am" value="typechecking-plugin" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="398rNT" id="7E7FS_VaSmi" role="1l3spd">
+      <property role="TrG5h" value="mps_home" />
+      <node concept="55IIr" id="7E7FS_VaSms" role="398pKh">
+        <node concept="2Ry0Ak" id="7E7FS_VaSmw" role="iGT6I">
+          <property role="2Ry0Am" value=".." />
+          <node concept="2Ry0Ak" id="7E7FS_VaSm_" role="2Ry0An">
+            <property role="2Ry0Am" value=".." />
+            <node concept="2Ry0Ak" id="7E7FS_VaSn5" role="2Ry0An">
+              <property role="2Ry0Am" value="MPS_HOME" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2igEWh" id="7E7FS_Vb3KS" role="1hWBAP">
+      <property role="2igJW4" value="true" />
+    </node>
+  </node>
+</model>
+
diff --git a/settings.gradle b/settings.gradle
index 13dd88c0..2f914e4a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,3 +3,4 @@ include 'coderules/solutions/jetbrains.mps.logic.test'
 include 'coderules/solutions/jetbrains.mps.typechecking'
 include 'coderules/solutions/jetbrains.mps.coderules'
 include 'samples/mpscore'
+include 'samples/lambdacalc'