[lucene] 02/06: Correct run order between tidy and regenerate's deps. Make snowball not fail on Windows (just emit an error).

[dw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dweiss pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git

commit 34f589b0aaeb659bcdb0a44a8aff846deaf53e78
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Tue Mar 23 09:48:27 2021 +0100

    Correct run order between tidy and regenerate's deps. Make snowball not fail on Windows (just emit an error).
---
 gradle/generation/regenerate.gradle |  2 +-
 gradle/generation/snowball.gradle   | 27 +++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/gradle/generation/regenerate.gradle b/gradle/generation/regenerate.gradle
index 52197b4..322c27a 100644
--- a/gradle/generation/regenerate.gradle
+++ b/gradle/generation/regenerate.gradle
@@ -35,7 +35,7 @@ configure([
       Set<Task> deps = regenerate.getTaskDependencies().getDependencies(regenerate)
       def tidy = deps.find { it.name == "tidy" }
       if (tidy) {
-          tidy.dependsOn (deps - [tidy])
+          tidy.mustRunAfter (deps - [tidy])
       }
     }
 }
\ No newline at end of file
diff --git a/gradle/generation/snowball.gradle b/gradle/generation/snowball.gradle
index f975f44..7a5adf8 100644
--- a/gradle/generation/snowball.gradle
+++ b/gradle/generation/snowball.gradle
@@ -90,19 +90,22 @@ configure(project(":lucene:analysis:common")) {
     description "Regenerates snowball stemmers."
     group "generation"
 
-    dependsOn downloadSnowballStemmers
-    dependsOn downloadSnowballWebsite
-    dependsOn downloadSnowballData
-
-    doFirst {
-      if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-        logger.warn("Snowball generation does not work on Windows, use a platform where bash is available.")
-        return
+    // Don't even bother adding dependencies.
+    if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+      doFirst {
+        // Just emit a big fat error message but don't fail the build.
+        logger.error("Snowball generation does not work on Windows, use a platform where bash is available.")
       }
-
-      project.exec {
-        executable "bash"
-        args = [snowballScript, snowballStemmerDir, snowballWebsiteDir, snowballDataDir, projectDir]
+    } else {
+      dependsOn downloadSnowballStemmers
+      dependsOn downloadSnowballWebsite
+      dependsOn downloadSnowballData
+
+      doFirst {
+        project.exec {
+          executable "bash"
+          args = [snowballScript, snowballStemmerDir, snowballWebsiteDir, snowballDataDir, projectDir]
+        }
       }
     }
   }