Alexandre Julliard : wineandroid: Generate assets checksum from the gradle build file.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0f19685917a9bc5cce2b581fc31d4bb90f8f2003
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0f19685917a9bc5cce2b581fc...

Author: Alexandre Julliard 
Date:   Mon Dec  3 16:16:27 2018 +0100

wineandroid: Generate assets checksum from the gradle build file.

Signed-off-by: Alexandre Julliard

---

dlls/wineandroid.drv/Makefile.in     |  8 ++------
 dlls/wineandroid.drv/build.gradle.in | 39 +++++++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in
index d2e2d01..40ab495 100644
--- a/dlls/wineandroid.drv/Makefile.in
+++ b/dlls/wineandroid.drv/Makefile.in
@@ -20,9 +20,5 @@ EXTRA_TARGETS = wine-debug.apk
 all: wine-debug.apk

wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg
-	(test -d assets && \
-	  rm -f assets/files.sum assets/sums.sum && \
-	  sha256sum `find assets -type f -print` | sed 's/ assets// /' >files.sum && \
-	  sha256sum files.sum >sums.sum && \
-	  mv files.sum sums.sum assets) || rm -rf assets
-	gradle -q assembleDebug && mv build/outputs/apk/wine-debug.apk .
+	gradle -q assembleDebug
+	mv build/outputs/apk/wine-debug.apk $@
diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in
index 3fba34a..8ae2fb4 100644
--- a/dlls/wineandroid.drv/build.gradle.in
+++ b/dlls/wineandroid.drv/build.gradle.in
@@ -32,7 +32,8 @@ buildscript
     }
 }

-def add_icon_task( dir, scale ) {
+def add_icon_task( dir, scale )
+{
     return tasks.create( "createIcon-" + dir, Exec ) {
         def outdir = new File( "res", "drawable-" + dir )
         outputs.dir( outdir )
@@ -45,15 +46,33 @@ def add_icon_task( dir, scale ) {
     }
 }

-tasks.whenTaskAdded { t ->
-      if (t.name.equals( "generateDebugResources" )) {
-          t.dependsOn add_icon_task( "ldpi", 0.75 )
-          t.dependsOn add_icon_task( "mdpi", 1 )
-          t.dependsOn add_icon_task( "hdpi", 1.5 )
-          t.dependsOn add_icon_task( "xhdpi", 2 )
-          t.dependsOn add_icon_task( "xxhdpi", 3 )
-          t.dependsOn add_icon_task( "xxxhdpi", 4 )
-      }
+def checksum_task()
+{
+    return tasks.create( "checksumAssets", Exec ) {
+        commandLine "sh", "-c",
+                    "(test -d assets && " +
+                    "rm -f assets/files.sum assets/sums.sum && " +
+                    "sha256sum $(find assets -type f -print) | sed 's/ assets\// /' >files.sum && " +
+                    "sha256sum files.sum >sums.sum && " +
+                    "mv files.sum sums.sum assets) || rm -rf assets";
+    }
+}
+
+tasks.whenTaskAdded
+{
+    if (name.equals( "generateDebugResources" ))
+    {
+        dependsOn add_icon_task( "ldpi", 0.75 )
+        dependsOn add_icon_task( "mdpi", 1 )
+        dependsOn add_icon_task( "hdpi", 1.5 )
+        dependsOn add_icon_task( "xhdpi", 2 )
+        dependsOn add_icon_task( "xxhdpi", 3 )
+        dependsOn add_icon_task( "xxxhdpi", 4 )
+    }
+    if (name.equals( "generateDebugAssets" ))
+    {
+        dependsOn checksum_task()
+    }
 }

tasks.withType(JavaCompile)