geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r543039 - /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/config/projects/Geronimo_CTS/Controller.groovy
Date Thu, 31 May 2007 03:45:21 GMT
Author: jdillon
Date: Wed May 30 20:45:20 2007
New Revision: 543039

URL: http://svn.apache.org/viewvc?view=rev&rev=543039
Log:
Use the new codestation-based libraries for the TCK and RI crap

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=543039&r1=543038&r2=543039
==============================================================================
--- 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 May 30 20:45:20 2007
@@ -165,66 +165,20 @@
         args << "-Djava.io.tmpdir=$tmpDir"
         
         // Fetch the required libraries and make copies (prevent unwanted side-effects)
-        def repo = new gbuild.config.libraries.GBuildRepository()
+        def repo = new gbuild.config.libraries.CodestationRepository()
         
         def getLibrary = { name, version, dir ->
             def lib = LibraryManager.getLibrary(repo, name, version)
             
-            def watch = new StopWatch()
-            watch.start()
-            
             println "Synchronizing library to workspace: $dir"
             
-            dir.parentFile.mkdirs()
-            
-            //
-            // TODO: Use svn export (or don't use svn at all for libraries)
-            //       so we don't need to get those damn .svn files which really
-            //       slow down rsync/cp/delete operations
-            //
-            
-            //
-            // TODO: Look into using AH codestation's Ant tasks to resolve artifacts
-            //       for library originals, then rsync like below for workspace copies
-            //
-            
-            //
-            // HACK: Use custom copy to use a shared working copy for libraries
-            //       to reduce I/O on build agents.
-            //
-            
-            def excludesFile = File.createTempFile('rsync-excludes', '.txt')
-            excludesFile.deleteOnExit()
-            excludesFile.withPrintWriter { writer ->
-                writer.println('*.svn')
-            }
-            
-            ant.exec(executable: 'rsync') {
-                arg(value: '--archive')
-                arg(value: '--recursive')
-                arg(value: '--delete')
-                arg(value: '--whole-file')
-                arg(value: "--exclude-from=$excludesFile")
-                arg(value: '--no-perms')
-                arg(value: '--chmod=u+w')
-                arg(value: '--stats')
-                arg(value: '--human-readable')
-                arg(value: "${lib.baseDir}/")
-                arg(value: "${dir}/")
-            }
-            
-            excludesFile.delete()
+            lib.mirror(dir)
             
             println "Workspace sychronized in $watch"
             
             return lib
         }
         
-        //
-        // HACK: Root the TCK & RI working copies out of the projects build space
-        //       to re-use between iterations
-        //
-        
         def workspaceDir = new File("${System.properties['user.home']}/gbuild/workspace/$baseVersion").canonicalFile
         def tckDir = new File(workspaceDir, 'tck')
         def riDir = new File(workspaceDir, 'ri')
@@ -235,8 +189,8 @@
                 // HACK: When retrying, libs are already there... will puke if we ask for
them again
                 //
                 if (!params.retry) {
-                    getLibrary('j2ee14-tck', '1.4.1b', tckDir)
-                    getLibrary('j2ee14-ri', '1.4.1-b05', riDir)
+                    getLibrary('JavaEE TCK/build - 1.4/Image', '1.4*', tckDir)
+                    getLibrary('JavaEE RI/build - 1.4/Image', '1.4*', riDir)
                 }
                 
                 args << "-Dj2eetck.home=$tckDir"
@@ -248,8 +202,8 @@
                 // HACK: When retrying, libs are already there... will puke if we ask for
them again
                 //
                 if (!params.retry) {
-                    getLibrary('javaee5-tck', 'CTS5-04_21_07_temp_patch', tckDir)
-                    getLibrary('javaee5-ri', '5.0-ur1-b13', riDir)
+                    getLibrary('JavaEE TCK/build - 5/Image', '5*', tckDir)
+                    getLibrary('JavaEE RI/build - 5/Image', '5*', riDir)
                 }
                 
                 args << "-Djavaee5.cts.home=$tckDir"



Mime
View raw message