From fd94f0a249d94d467673b50c2498889f6fe755fe Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 4 Feb 2019 11:11:16 +0100
Subject: [PATCH] Straghten up build tasks: assemble to be the default task.
 Remove superfluous configure_gradle script, use -P switches instead.

---
 INSTALL.txt                     | 25 ++++++++++++-------------
 build.gradle                    |  4 ++--
 configure_gradle.xml            | 12 ------------
 samples/fitch/build.gradle      |  2 +-
 samples/lambdacalc/build.gradle |  2 +-
 samples/mpscore/build.gradle    |  2 +-
 6 files changed, 17 insertions(+), 30 deletions(-)
 delete mode 100644 configure_gradle.xml

diff --git a/INSTALL.txt b/INSTALL.txt
index 481dad47..f00886a8 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,32 +1,31 @@
 # INSTALL #
 
-Prerequisites: 
+Prerequisites:
 
-- Oracle JDK 1.8 
+- Oracle JDK 1.8
 - Maven 3
 
-## To fully build the project execute: ##
+** NOTE: ** in order to open any of the sample projects follow the steps below
+for building the whole project, as samples expect the compiled languages to be
+available in a project library.
 
-    mvn -Dmaven.javadoc.skip=true -B -f reactor install && ./gradlew build
+## To fully build the project including all subprojects, execute: ##
 
-## To fully build and test the project execute: ##
+    mvn -Dmaven.javadoc.skip=true -B -f reactor install && ./gradlew assemble
+
+## To fully build and test the project including all subprojects, execute: ##
 
     mvn -Dmaven.javadoc.skip=true -B -f reactor install && ./gradlew check
 
 This builds the "reactor" project and installs its artefacts into local Maven
 repository. Then the regular Gradle build is launched. Further launches of
-Gradle can be done without running the build in "reactor". 
+Gradle can be done without running the build in "reactor".
 
-The default task to execute if none is specified is "build".
+The default task to execute if none is specified is "assemble".
 
 ## To install all the dependencies in order to open the project with MPS: ##
 
     mvn -Dmaven.javadoc.skip=true -B -f reactor install && ./gradlew setup
 
-Once the project is opened, execute "Rebuild Project", since generated 
+Once the project is opened, execute "Rebuild Project", since generated
 artefacts are excluded from version control.
-
-**NOTE: ** in order to open any of the sample projects follow the steps above
-for building the whole project, as samples expect the compiled languages to be
-available in a project library.
-
diff --git a/build.gradle b/build.gradle
index befd0ad4..f530f995 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 import groovy.xml.MarkupBuilder
 import java.util.regex.*
 
-defaultTasks 'build'
+defaultTasks 'assemble'
 
 allprojects {
   apply plugin: 'java'
@@ -143,7 +143,7 @@ ant.properties.'ci.build.num' = "${tagMatcher().find() ? tagMatcher()[0][2] : '9
   }
 }
 
-build {
+assemble {
   dependsOn {
     [
       ':coderules-assemble',
diff --git a/configure_gradle.xml b/configure_gradle.xml
deleted file mode 100644
index 4a6bba0d..00000000
--- a/configure_gradle.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<project default="configure" xmlns:if="ant:if">
-
-  <target name="configure">
-    <echo message="Configuring gradle properties"/>
-    <propertyfile file="gradle.properties">
-      <entry  key="mpsBuildConfiguration" value="${mpsBuildConfiguration}" if:set="mpsBuildConfiguration"/>
-      <entry  key="mpsBuildNumber" value="${mpsBuildNumber}" if:set="mpsBuildNumber"/>
-      <entry  key="mpsRelease"  value="${mpsRelease}" if:set="mpsRelease"/>
-     </propertyfile>
-  </target>
-
-</project>
diff --git a/samples/fitch/build.gradle b/samples/fitch/build.gradle
index 1b6df318..c4c76363 100644
--- a/samples/fitch/build.gradle
+++ b/samples/fitch/build.gradle
@@ -40,7 +40,7 @@ ant.importBuild('build.xml') {antTarget ->
   }
 }
 
-build {
+assemble {
   dependsOn {
     'fitch-assemble'
   }
diff --git a/samples/lambdacalc/build.gradle b/samples/lambdacalc/build.gradle
index 186d19f6..bb1a52f2 100644
--- a/samples/lambdacalc/build.gradle
+++ b/samples/lambdacalc/build.gradle
@@ -40,7 +40,7 @@ ant.importBuild('build.xml') {antTarget ->
   }
 }
 
-build {
+assemble {
   dependsOn {
     'lambdacalc-assemble'
   }
diff --git a/samples/mpscore/build.gradle b/samples/mpscore/build.gradle
index 362692c3..4ef32858 100644
--- a/samples/mpscore/build.gradle
+++ b/samples/mpscore/build.gradle
@@ -40,7 +40,7 @@ ant.importBuild('build.xml') {antTarget ->
   }
 }
 
-build {
+assemble {
   dependsOn {
     'mpscore-assemble'
   }