[ofbiz-framework] branch trunk updated: Improved: Define ‘gradlew’ variable in “build.gradle” only once

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] branch trunk updated: Improved: Define ‘gradlew’ variable in “build.gradle” only once

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

mthl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 174b924  Improved: Define ‘gradlew’ variable in “build.gradle” only once
174b924 is described below

commit 174b92475f47997c9ee17fe9a3991ec813997169
Author: Mathieu Lirzin <[hidden email]>
AuthorDate: Mon Nov 18 18:31:47 2019 +0100

    Improved: Define ‘gradlew’ variable in “build.gradle” only once
---
 build.gradle | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6c8ac6c..e8d0f9d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,6 +74,7 @@ apply from: 'common.gradle'
 
 // global properties
 ext.os = System.getProperty('os.name').toLowerCase()
+ext.gradlew = os.contains('windows') ? 'gradlew.bat' : './gradlew'
 ext.pluginsDir = "${rootDir}/plugins"
 
 application {
@@ -1020,11 +1021,10 @@ def createOfbizBackgroundCommandTask(taskName) {
     def sourceTask = taskName.tokenize().first()
     def arguments = (taskName - sourceTask)
     def serverCommand = "ofbiz ${arguments}".toString()
-    def gradleRunner = os.contains('windows') ? 'gradlew.bat' : './gradlew'
 
     task (taskName) {
         doLast {
-            spawnProcess([gradleRunner, "--no-daemon", serverCommand])
+            spawnProcess([gradlew, "--no-daemon", serverCommand])
         }
     }
 }
@@ -1083,7 +1083,5 @@ def taskExistsInproject(fullyQualifiedProject, taskName) {
 }
 
 def gradlewSubprocess(commandList) {
-    def gradlew = os.contains('windows') ? 'gradlew.bat' : './gradlew'
     exec { commandLine(gradlew, "--no-daemon", *commandList) }
 }
-