build: simplify Eclipse project generation

Make sure both the :generateXtext and :generateTestXtext task are run if
there is a generated xtend-gen source folder, so that BuildShip can set
ignore_optional_problems also on there.

3 files changed, 12 insertions, 1 deletions

diff --git a/README.md b/README.md
index 9723519d..5092efe6 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
           
 7. Clone the project Git repository but do not import it into Eclipse yet.
 
-8. Open a new terminal an run `./gradlew generateXtext eclipseJdt` (`.\gradlew generateXtext eclipseJdt` on Windows) in the cloned repository.
+8. Open a new terminal an run `./gradlew eclipseJdt` (`.\gradlew eclipseJdt` on Windows) in the cloned repository.
     * This should complete without any compilation errors.
     * If you get any errors about the JVM version, check whether the `JAVA_HOME` environment variable is set to the location of JDK. You can query the variable with `echo $JAVA_HOME` on Linux and `echo $Env:JAVA_HOME` in PowerShell on Windows. To set it, use `export JAVA_HOME=/java/path/here` or `$Env:JAVA_HOME="C:\java\path\here"`, respectively.
 
diff --git a/gradle/xtend.gradle b/gradle/xtend.gradle
index 8875465b..b70892c7 100644
--- a/gradle/xtend.gradle
+++ b/gradle/xtend.gradle
@@ -26,3 +26,9 @@ sonarqube.properties {
                 'src/test/xtend-gen/**',
         ]
 }
+
+tasks.named('eclipseJdt') {
+        // Make sure all xtend-gen source folders are available.
+        dependsOn tasks.named('generateXtext')
+        dependsOn tasks.named('generateTestXtext')
+}
diff --git a/language/build.gradle b/language/build.gradle
index e9db351f..31bf6bc5 100644
--- a/language/build.gradle
+++ b/language/build.gradle
@@ -72,3 +72,8 @@ sonarqube.properties {
                 'src/testFixtures/xtext-gen/**',
         ]
 }
+
+tasks.named('eclipseJdt') {
+        // Make sure all xtext-gen source folders are available.
+        dependsOn generateXtextLanguage
+}