svn commit: r1756407 - /ofbiz/trunk/build.gradle

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

svn commit: r1756407 - /ofbiz/trunk/build.gradle

Taher Alkhateeb
Author: taher
Date: Mon Aug 15 18:53:15 2016
New Revision: 1756407

URL: http://svn.apache.org/viewvc?rev=1756407&view=rev
Log:
fix os property regression related to OFBIZ-7951

The property used to be hidden from certain functions in the build
script making the system crash. Changing the definition from def to
ext.os fixes the issue and renders all functions operational. Thank
you Jacques Le Roux for reporting this.

Modified:
    ofbiz/trunk/build.gradle

Modified: ofbiz/trunk/build.gradle
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.gradle?rev=1756407&r1=1756406&r2=1756407&view=diff
==============================================================================
--- ofbiz/trunk/build.gradle (original)
+++ ofbiz/trunk/build.gradle Mon Aug 15 18:53:15 2016
@@ -28,7 +28,7 @@ apply plugin: 'eclipse'
 apply from: 'common.gradle'
 
 // operating system property
-def os = System.getProperty('os.name').toLowerCase()
+ext.os = System.getProperty('os.name').toLowerCase()
 
 // java settings
 def jvmArguments = ['-Xms128M', '-Xmx1024M',
@@ -252,7 +252,7 @@ jar {
         attributes(
             "Implementation-Title": project.name,
             "Main-Class": ofbizMainClass,
-            "Class-Path": getJarManifestClasspathForCurrentOs(os)
+            "Class-Path": getJarManifestClasspathForCurrentOs()
         )
     }
 }
@@ -731,8 +731,7 @@ tasks.addRule('Pattern: ofbizDebug <Comm
 
 tasks.addRule('Pattern: ofbizBackground <Commands>: Execute OFBiz startup commands in background and output to console.log') { String taskName ->
     if(taskName ==~ /^ofbizBackground\s.*/ || taskName == 'ofbizBackground') {
-        def arguments = (taskName - 'ofbizBackground').toLowerCase().tokenize(' ')
-        createOfbizCommandTask(taskName, arguments, jvmArguments, false)
+        createOfbizBackgroundCommandTask(taskName)
     }
 }
 
@@ -819,7 +818,7 @@ def generateFileFromTemplate(templateFil
     }
 }
 
-def getJarManifestClasspathForCurrentOs(os) {
+def getJarManifestClasspathForCurrentOs() {
     def osClassPath = ''
     if(os.contains('windows')) {
         configurations.runtime.files.each { cpEntry ->