You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/02/01 08:18:13 UTC
svn commit: r502141 -
/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
Author: jdillon
Date: Wed Jan 31 23:18:11 2007
New Revision: 502141
URL: http://svn.apache.org/viewvc?view=rev&rev=502141
Log:
Drop todo bits, will impl in a few
Modified:
geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.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=502141&r1=502140&r2=502141
==============================================================================
--- 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 Wed Jan 31 23:18:11 2007
@@ -67,6 +67,12 @@
def repoDir = new File('repository').canonicalFile
args << "-Dmaven.repo.local=$repoDir"
+ //
+ // NOTE: Once library support is hooked up, we can probably avoid this
+ // (and the builk repo collection too) by running gproxy
+ // with a cache dir which is shared between builds
+ //
+
// If offline is not set or it set but not true, then run offline
if (params.offline == null || !params.offline) {
args << '--offline'
@@ -214,124 +220,9 @@
def collectResults = {
// TODO
-
- /*
- class postprocess
- extends CommandSupport
- {
- int iteration
-
- int workflowId
-
- def sourceDir
-
- def targetDir
-
- def execute() {
- iteration = context.getRequiredAsInt('iteration')
- println "Iteration: ${iteration}"
-
- workflowId = context.getRequiredAsInt('workflow_id')
- println "Using workflow ID: ${workflowId}"
-
- sourceDir = context.getRequiredAsFile('source_dir')
- println "Using source dir: ${sourceDir}"
- assert sourceDir.exists() : "Missing source dir: ${sourceDir}"
-
- targetDir = context.resolveFile("reports/tck/${workflowId}/${iteration}")
- println "Using target dir: ${targetDir}"
- ant.mkdir(dir: targetDir)
-
- // Copy test output to be saved/remoted
- ant.copy(todir: targetDir) {
- fileset(dir: sourceDir) {
- include(name: 'logs/**')
- include(name: 'summary.properties')
-
- //
- // TODO: Shall we also include the javatest output too?
- //
- }
- }
- }
- }
- */
}
def generateReport = {
// TODO
-
- /*
- int workflowId
-
- def sections
-
- def inputDir
-
- def reportDir
-
- def execute() {
- workflowId = context.getRequiredAsInt('workflow_id')
- println "Using workflow ID: ${workflowId}"
-
- sections = context.getRequiredAsFile('sections')
- println "Using sections file: ${sections}"
- assert sections.exists() : "Missing sections file: ${sections}"
-
- inputDir = context.resolveFile("reports/tck/${workflowId}")
- println "Using input dir: ${inputDir}"
- assert inputDir.exists() : "Missing report input dir: ${inputDir}"
-
- reportDir = context.resolveFile('reports/tck/html')
- println "Generating reports in dir: ${reportDir}"
- ant.mkdir(dir: reportDir)
-
- // Setup the repository
- def repoDir = context.resolveFile('repository')
- println "Using repository: ${repoDir}"
-
- // Copy all summary properties to a tempdir for soaking up
- def summariesDir = context.resolveFile('temp/summaries')
- ant.mkdir(dir: summariesDir)
-
- def scanner = ant.fileScanner {
- fileset(dir: inputDir) {
- include(name: '\*/summary.properties')
- }
- }
- for (file in scanner) {
- def uuid = UUID.randomUUID()
- ant.copy(file: file, tofile: "${summariesDir}/${uuid}.properties")
- }
-
- //
- // FIXME: Forward to maven command instead
- //
-
- def mavenHome = context.resolveFile('tools/maven')
- println "Using MAVEN_HOME: ${mavenHome}"
-
- // Generate a report from captured TCK output
- def runDir = sections.getParentFile() // must run from the dir where sections props lives
- ant.exec(executable: "${mavenHome}/bin/mvn", dir: runDir, failonerror: true) {
- env(key: 'MAVEN_HOME', value: mavenHome)
- env(key: 'M2_HOME', value: mavenHome)
-
- // Assume that our repo is filled with the right bits
- arg(value: '--offline')
-
- arg(value: '--batch-mode')
- arg(value: '--errors')
- arg(value: "-Dmaven.repo.local=${repoDir}")
-
- arg(value: 'j2eetck:generate-report')
-
- arg(value: "-DsectionsFile=${sections}")
- arg(value: "-DsummariesDirectory=${summariesDir}")
- arg(value: "-DreportsDirectory=ignored")
- arg(value: "-DoutputDirectory=${reportDir}")
- }
- }
- */
}
}