From 3a85251595d9624da7280e6eb30bfd07154ecf28 Mon Sep 17 00:00:00 2001
From: Mark Hammond <mhammond@skippinet.com.au>
Date: Tue, 21 Jul 2020 15:21:41 +1000
Subject: [PATCH] Cleanup locall publish flows for application-services

---
 settings.gradle | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 493215ab8..8440fc306 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -45,22 +45,14 @@ if (localProperties != null) {
 
     if (appServicesLocalPath != null) {
         log("Enabling automatic publication of application-services from: $appServicesLocalPath")
-        def publishAppServicesCmd = ["./automation/publish_to_maven_local_if_modified.py"]
-        // Application-services doesn't build on native Windows. However, it still makes sense to
-        // enable these workflows on Windows, even if it isn't quote as automatic as elsewhere -
-        // specifically, you must run the build command on WSL, but after that you can happily build
-        // and debug directly from within Android Studio on native Windows - but only after following
-        // https://github.com/mozilla/application-services/blob/master/docs/howtos/setup-android-build-environment.md#using-windows
-        // So rather than fail we make noise...
+        // Windows can't execute .py files directly, so we assume a "manually installed" python,
+        // which comes with a "py" launcher and respects the shebang line to specify the version.
+        def publishAppServicesCmd = [];
         if (System.properties['os.name'].toLowerCase().contains('windows')) {
-            log('NOTE: The autoPublish workflows do not work on native windows.');
-            log('You must manually ensure that the following command has completed successfully in WSL:');
-            log("> $publishAppServicesCmd");
-            log("(from the '$appServicesLocalPath' directory)");
-            log('Then restart the build');
-        } else {
-            runCmd(publishAppServicesCmd, appServicesLocalPath, "Published application-services for local development.", false)
+            publishAppServicesCmd << "py";
         }
+        publishAppServicesCmd << "./automation/publish_to_maven_local_if_modified.py";
+        runCmd(publishAppServicesCmd, appServicesLocalPath, "Published application-services for local development.", false)
     } else {
         log("Disabled auto-publication of application-services. Enable it by settings '$settingAppServicesPath' in local.properties")
     }
@@ -68,10 +60,8 @@ if (localProperties != null) {
     String androidComponentsLocalPath = localProperties.getProperty(settingAndroidComponentsPath)
 
     if (androidComponentsLocalPath != null) {
-        // android-components does build on native windows, so it doesn't get the special Windows treatment above.
-        // But it doesn't like executing .py files directly. We assume a "manually installed" python,
-        // which comes with a "py" launcher and respects the shebang line to specify the version.
         log("Enabling automatic publication of android-components from: $androidComponentsLocalPath")
+        // As above, hacks to execute .py files on Windows.
         def publishAcCmd = [];
         if (System.properties['os.name'].toLowerCase().contains('windows')) {
             publishAcCmd << "py";