geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r476336 - in /geronimo/genesis/trunk/build-harness: installdeps maven maven.groovy verify
Date Fri, 17 Nov 2006 22:02:26 GMT
Author: jdillon
Date: Fri Nov 17 14:02:25 2006
New Revision: 476336

URL: http://svn.apache.org/viewvc?view=rev&rev=476336
Log:
new strategy, just soak up the local repo cache as output

Modified:
    geronimo/genesis/trunk/build-harness/installdeps
    geronimo/genesis/trunk/build-harness/maven
    geronimo/genesis/trunk/build-harness/maven.groovy
    geronimo/genesis/trunk/build-harness/verify

Modified: geronimo/genesis/trunk/build-harness/installdeps
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/build-harness/installdeps?view=diff&rev=476336&r1=476335&r2=476336
==============================================================================
--- geronimo/genesis/trunk/build-harness/installdeps (original)
+++ geronimo/genesis/trunk/build-harness/installdeps Fri Nov 17 14:02:25 2006
@@ -25,8 +25,12 @@
 DIRNAME=`dirname $0`
 PROGNAME=`basename $0`
 
-export GROOVY_HOME="$DIRNAME/groovy"
+BASEDIR=`cd "$DIRNAME" && pwd`
+
+export GROOVY_HOME="$BASEDIR/groovy"
 groovy="$GROOVY_HOME/bin/groovy"
+
+# Make sure we can exec it
 chmod +x "$groovy"
 
 # Use 1.5 for Groovy

Modified: geronimo/genesis/trunk/build-harness/maven
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/build-harness/maven?view=diff&rev=476336&r1=476335&r2=476336
==============================================================================
--- geronimo/genesis/trunk/build-harness/maven (original)
+++ geronimo/genesis/trunk/build-harness/maven Fri Nov 17 14:02:25 2006
@@ -25,8 +25,12 @@
 DIRNAME=`dirname $0`
 PROGNAME=`basename $0`
 
-export GROOVY_HOME="$DIRNAME/groovy"
+BASEDIR=`cd "$DIRNAME" && pwd`
+
+export GROOVY_HOME="$BASEDIR/groovy"
 groovy="$GROOVY_HOME/bin/groovy"
+
+# Make sure we can exec it
 chmod +x "$groovy"
 
 # Use 1.5 for Groovy

Modified: geronimo/genesis/trunk/build-harness/maven.groovy
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/build-harness/maven.groovy?view=diff&rev=476336&r1=476335&r2=476336
==============================================================================
--- geronimo/genesis/trunk/build-harness/maven.groovy (original)
+++ geronimo/genesis/trunk/build-harness/maven.groovy Fri Nov 17 14:02:25 2006
@@ -23,11 +23,11 @@
 
 class MavenBuilder
 {
-    def basedir = new File(".").getCanonicalFile()
+    def ant = new AntBuilder()
     
-    def outdir = new File(basedir, "output")
+    def basedir = new File(".").getCanonicalFile()
     
-    def ant = new AntBuilder()
+    def repodir = new File(basedir, "repository")
     
     def javaHome = System.getenv("JAVA_HOME")
     
@@ -65,9 +65,12 @@
                 node.setAttribute('timeout', "${millis}")
             }
             
-            arg(value: "--file")
+            arg(value: "-Dmaven.repo.local=${repodir}")
+            arg(value: '--batch-mode')
+            arg(value: '--errors')
+            
+            arg(value: '--file')
             arg(file: "${pom}")
-            arg(value: "-Doutput.dir=${outdir}")
             
             args.each {
                 arg(value: "${it}")
@@ -101,6 +104,10 @@
                     }
                     break
                 
+                //
+                // TODO: Add bits to pick off -P* so we can always insert a profile to activate
+                //
+                
                 case ~"-.*":
                     args.add(arg)
                     break
@@ -116,9 +123,6 @@
         if (pom == null) {
             throw new Exception("Missing pom")
         }
-        
-        // Mare sure outputdir is clean
-        ant.delete(dir: outdir)
         
         maven(pom, args)
     }

Modified: geronimo/genesis/trunk/build-harness/verify
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/build-harness/verify?view=diff&rev=476336&r1=476335&r2=476336
==============================================================================
--- geronimo/genesis/trunk/build-harness/verify (original)
+++ geronimo/genesis/trunk/build-harness/verify Fri Nov 17 14:02:25 2006
@@ -25,8 +25,12 @@
 DIRNAME=`dirname $0`
 PROGNAME=`basename $0`
 
-export GROOVY_HOME="$DIRNAME/groovy"
+BASEDIR=`cd "$DIRNAME" && pwd`
+
+export GROOVY_HOME="$BASEDIR/groovy"
 groovy="$GROOVY_HOME/bin/groovy"
+
+# Make sure we can exec it
 chmod +x "$groovy"
 
 # Use 1.5 for Groovy



Mime
View raw message