Changeset 16927

Timestamp:

2008-08-21T11:01:04+12:00 (16 years ago)

Author:

oranfry

Message:

changes to a few custom tasks

Location:

release-kits/shared/ant-tasks/orans

Files:

• GetFreePath.class (modified) ( previous)
• GetFreePath.java (modified) (2 diffs)
• RegexSearchReplace.class (modified) ( previous)
• RegexSearchReplace.java (modified) (3 diffs)

release-kits/shared/ant-tasks/orans/GetFreePath.java

@@ -19 +19 @@
      */
     public static void main( String[] args ) {
-
         GetFreePath gfp = new GetFreePath();
         gfp.setPath( new File(args[0]) );
         gfp.setProperty( args[1] );
         gfp.execute();
-
     }
 
@@ -46 +44 @@
         //set the found path in the project
         Project pr = getProject();
-        if ( pr != null ) {
-            pr.setProperty( "property", returnPath.getPath() );
+        if ( pr != null && pr.getProperty(property) == null ) {
+            pr.setProperty( property, returnPath.getPath() );
         }
         System.out.println(returnPath.getPath());

release-kits/shared/ant-tasks/orans/RegexSearchReplace.java

@@ -10 +10 @@
     private String pattern = null;
     private String replacement = null;
+    private boolean winPath = false;
     
 
@@ -36 +37 @@
         }
 
-        if (replacement == null) {
+        if ( replacement == null ) {
             throw new BuildException( "Error - No replacement specified !!" );
         }
 
+        if ( winPath ) {
+            replacement = replacement.replaceAll("\\\\","\\\\\\\\");
+        }
+        
         System.out.println( "File: " + file );
         System.out.println( "Pattern: " + pattern );
@@ -148 +153 @@
    
     public void setFile(File file) {
-            this.file = file;
+        this.file = file;
     }
 
     public void setPattern(String pattern) {
-            this.pattern = pattern;
+        this.pattern = pattern;
     }
 
     public void setReplacement(String replacement) {
-            this.replacement = replacement.replaceAll( "\\\\", "\\\\\\\\" );
+        this.replacement = replacement.replaceAll( "\\\\", "\\\\\\\\" );
+    }
+
+    public void setWinPath( boolean isWinPath ) {
+        this.winPath = isWinPath;
     }