diff --git a/samples/lambdacalc/build.gradle b/samples/lambdacalc/build.gradle index cb80d8b9..6b427748 100644 --- a/samples/lambdacalc/build.gradle +++ b/samples/lambdacalc/build.gradle @@ -2,6 +2,18 @@ configurations { junitAnt } +dependencies { + // initialize JUnit optional ant task + junitAnt 'junit:junit:4.8.2' + junitAnt('org.apache.ant:ant-junit:1.9.2') { + transitive = false + } +} + +ant.taskdef(name: 'junit', + classname: 'org.apache.tools.ant.taskdefs.optional.junit.JUnitTask', + classpath: configurations.junitAnt.asPath) + ant.importBuild('build.xml') {antTarget -> 'lambdacalc-'+antTarget } diff --git a/samples/lambdacalc/build.xml b/samples/lambdacalc/build.xml index fb1f2572..1eac52a5 100644 --- a/samples/lambdacalc/build.xml +++ b/samples/lambdacalc/build.xml @@ -29,7 +29,101 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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}coderules.ci.build.num=${coderules.ci.build.num} @@ -50,13 +144,15 @@ - + + + @@ -94,6 +190,7 @@ + @@ -136,10 +233,18 @@ + + + + + + + + @@ -160,6 +265,8 @@ + + @@ -216,19 +323,222 @@ - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps index c4c8f860..d5c3d7da 100644 --- a/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps +++ b/samples/lambdacalc/solutions/samples.lambdacalc.build/models/samples.lamdacalc.build.mps @@ -15,6 +15,15 @@ + + + + + + + + + @@ -24,11 +33,18 @@ + + + + + + + @@ -46,6 +62,13 @@ + + + + + + + @@ -59,6 +82,9 @@ + + + @@ -66,7 +92,9 @@ - + + + @@ -143,6 +171,7 @@ + @@ -159,6 +188,11 @@ + + + + + @@ -174,9 +208,24 @@ - + + + + + + + + + + + + + + + + @@ -214,6 +263,12 @@ + + + + + +