geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r523119 - in /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild: config/projects/Geronimo_CTS/Controller.groovy system/commands/ExecCommand.groovy
Date Tue, 27 Mar 2007 23:58:24 GMT
Author: jdillon
Date: Tue Mar 27 16:58:24 2007
New Revision: 523119

URL: http://svn.apache.org/viewvc?view=rev&rev=523119
Log:
Set MAVEN_HOME to the local correct location of mvn from the harness

Modified:
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/commands/ExecCommand.groovy

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy?view=diff&rev=523119&r1=523118&r2=523119
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
Tue Mar 27 16:58:24 2007
@@ -151,6 +151,7 @@
         
         def exec = new ExecCommand(context)
         exec.executable = 'project/tck-testsuite/runtests'
+        exec.environment['MAVEN_HOME'] = new File('tools/maven').canonicalFile
         
         def args = []
         args << '--nocolor'

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/commands/ExecCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/commands/ExecCommand.groovy?view=diff&rev=523119&r1=523118&r2=523119
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/commands/ExecCommand.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/commands/ExecCommand.groovy
Tue Mar 27 16:58:24 2007
@@ -30,6 +30,8 @@
 {
     def executable
     
+    def environment = [:]
+    
     def ExecCommand(context) {
         super(context)
     }
@@ -52,6 +54,10 @@
             ant.exec(executable: executable, failonerror: true) {
                 args.each {
                     arg(line: "$it")
+                }
+                
+                environment.each { key, value ->
+                    env(key: key, value: value)
                 }
             }
         }



Mime
View raw message