geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r509076 - in /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild: config/projects/Geronimo_CTS/Controller.groovy system/library/Library.groovy
Date Mon, 19 Feb 2007 03:18:33 GMT
Author: jdillon
Date: Sun Feb 18 19:18:33 2007
New Revision: 509076

URL: http://svn.apache.org/viewvc?view=rev&rev=509076
Log:
Drop perm bits from copy, use lock/unlock instead

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/library/Library.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=509076&r1=509075&r2=509076
==============================================================================
--- 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
Sun Feb 18 19:18:33 2007
@@ -133,14 +133,16 @@
         //       we only change a few files, which always get overwritten, so its okay to

         //       re-use, and it will save ~10 minutes of time to make the copy
         //
-        def tckLib = LibraryManager.getLibrary(repo, 'j2ee14-tck', '1.4.1b').copy('target/tck',
'u+w', '*.svn')
+        def tckLib = LibraryManager.getLibrary(repo, 'j2ee14-tck', '1.4.1b').copy('target/tck',
'*.svn')
+        tckLib.unlock()
         
         //
         // NOTE: We *must* copy the RI each time as its setup will change a bunch of files
         //       and once changed there is no going back.  This copy is relativly cheap,
so
         //       just copy it each time.
         //
-        def riLib = LibraryManager.getLibrary(repo, 'j2ee14-ri', '1.4.1-b05').copy('target/ri',
'u+w', '*.svn')
+        def riLib = LibraryManager.getLibrary(repo, 'j2ee14-ri', '1.4.1-b05').copy('target/ri',
'*.svn')
+        riLib.unlock()
         
         //
         // HACK: Show what processes and tmp we are starting with

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy?view=diff&rev=509076&r1=509075&r2=509076
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/Library.groovy
Sun Feb 18 19:18:33 2007
@@ -104,12 +104,12 @@
     /**
      * Make a copy of the library somewhere using an excludes list
      */
-    Library copy(targetPath, String perms, List excludes) {
+    Library copy(targetPath, List excludes) {
         assert targetPath
         
         def targetDir = new File("$targetPath").canonicalFile
         
-        log.info "Copying library to: $targetDir; w/perms: $perms"
+        log.info "Copying library to: $targetDir; w/excludes: $excludes"
         
         assert exists()
         
@@ -141,11 +141,6 @@
             exec('rsync', [ '-tr', "${baseDir}/", targetDir ])
         }
         
-        // If we have some perms, then set them
-        if (perms) {
-            chmod(targetDir, perms)
-        }
-        
         // Return new library instance, which is rooted to new dir
         def lib = createCloneForDir(targetDir)
         lib.isCopy = true
@@ -153,26 +148,19 @@
         return lib
     }
     
-    Library copy(targetPath, String perms, String excludes) {
+    protected abstract Library createCloneForDir(File targetDir)
+    
+    Library copy(targetPath, String excludes) {
         assert excludes
         
-        return copy(targetPath, perms, [ excludes ])
+        return copy(targetPath, [ excludes ])
     }
     
-    protected abstract Library createCloneForDir(File targetDir)
-    
     /**
      * Make a read-write copy of the library somewhere w/no excludes
      */
-    Library copy(targetPath, String perms) {
-        return copy(targetPath, perms, null)
-    }
-    
-    /**
-     * Make a read-write copy of the library somewhere.
-     */
     Library copy(targetPath) {
-        return copy(targetPath, 'u+rw')
+        return copy(targetPath, (List)null)
     }
     
     abstract void checkout()



Mime
View raw message