Changeset 23242

Timestamp:

2010-10-28T10:14:17+13:00 (13 years ago)

Author:

sjm84

Message:

A few minor updates to the uninstaller

Location:

main/trunk

Files:

• ant-tasks/src/org/greenstone/anttasks/PatternSetToFile.java (modified) (4 diffs)
• release-kits/shared/core/ant-scripts/shared.xml (modified) (1 diff)
• release-kits/shared/core/uninstaller/Uninstall.bat (modified) (1 diff)
• release-kits/shared/core/uninstaller/Uninstaller.java (modified) (2 diffs)

main/trunk/ant-tasks/src/org/greenstone/anttasks/PatternSetToFile.java

@@ -15 +15 @@
  * PatternSetToFile is an Ant task used to take an Ant PatternSet and output to a
  * file all the files that it encompasses
- * @author sjm84
+ * @author Sam McIntosh
  */
 public class PatternSetToFile extends Task
 {
+    //Sets whether or not only the top-level files and folders
+    //are stored in the output file
+    public boolean _toplevelonly = false;
+    
     //The file the set will be written to
     public File _outfile = null;
@@ -48 +52 @@
                 
                 String[] includedFiles = ds.getIncludedFiles();
+                
+                if(_toplevelonly)
+                {
+                    ArrayList toplevel = new ArrayList();
+                    
+                    for(int j = 0; j < includedFiles.length; j++)
+                    {
+                        int separatorIndex = includedFiles[j].indexOf(File.separator);
+                        
+                        if ( separatorIndex == -1 && includedFiles[j].length() > 0 && !toplevel.contains(toplevel)) {
+                            toplevel.add(includedFiles[j]);
+                        }
+                        else if ( separatorIndex > -1 && includedFiles[j].length() > 0) {
+                            String path = includedFiles[j].substring(0, separatorIndex);
+                            if ( !toplevel.contains(path) ) {
+                                toplevel.add(path);
+                            }
+                        }
+                    }
+                    includedFiles = (String[])toplevel.toArray(new String[0]);
+                }
+                
                 for (int j = 0; j < includedFiles.length; j++)
                 {
@@ -60 +86 @@
         }
     }
-    
+
+    public void setToplevelonly(boolean toplevelonly)
+    {
+        _toplevelonly = toplevelonly;
+    }
+
     public void setOutfile(File outfile)
     {
         _outfile = outfile;
     }
-    
+
     public void setDir(File dir)
     {
@@ -73 +104 @@
     public void addConfiguredPatternset(PatternSet patternset) 
     {
-        if (patternset == null || !(patternset instanceof PatternSet))
+        if (patternset == null)
         {
             return;

main/trunk/release-kits/shared/core/ant-scripts/shared.xml

@@ -381 +381 @@
         <mkdir dir="components"/>
       
-        <pstf dir="compiled" outfile="compiled/uninstall/${component}.uninstall">
+        <!-- the PatternSet To File task takes one or more patternsets and outputs to a file all of the files it includes -->
+        <pstf dir="compiled" outfile="compiled/uninstall/${component}.uninstall" toplevelonly="true">
             <patternset refid="greenstone${version.major}.${component}.component"/>
         </pstf>

main/trunk/release-kits/shared/core/uninstaller/Uninstall.bat

@@ -51 +51 @@
     del Uninstall.*
     del *.uninstall
-    del ..\bin
-    del ..\tmp
-    del ..\ext
+    rmdir /S /Q ..\bin
+    rmdir /S /Q ..\tmp
+    rmdir /S /Q ..\ext
+    rmdir /S /Q ..\uninstall
     
     cd ..

main/trunk/release-kits/shared/core/uninstaller/Uninstaller.java

@@ -443 +443 @@
         for ( int i=0; i < files.length; i++) {
             if( files[i].getAbsolutePath().endsWith(".uninstall") ) {
-                String[] paths = getRelevantPathsFromUninstallFile(files[i]);
+                String[] paths = getPathsFromUninstallFile(files[i]);
                 
                 for(int j=0; j < paths.length; j++) {
@@ -481 +481 @@
         return (String[]) paths.toArray(new String[0]);
     }
+    
+    public String[] getPathsFromUninstallFile ( File uninstallFile ) {
+        
+        ArrayList paths = new ArrayList();
+        try {
+            BufferedReader in = new BufferedReader(new FileReader(uninstallFile));
+            
+            String line;
+            while ( (line = in.readLine()) != null ) {
+                if (line.length() > 0 && !paths.contains(line)) {
+                    paths.add(line);
+                }
+            }
+            
+            in.close();
+        }
+        catch( Exception ex ) {
+            ex.printStackTrace();
+            return null;
+        }
+        return (String[]) paths.toArray(new String[0]);
+    }
 
     public void recursiveDelete( File f, File[] exceptions ) throws CancelledException {