Changeset 23242
- Timestamp:
- 2010-10-28T10:14:17+13:00 (13 years ago)
- Location:
- main/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/ant-tasks/src/org/greenstone/anttasks/PatternSetToFile.java
r23211 r23242 15 15 * PatternSetToFile is an Ant task used to take an Ant PatternSet and output to a 16 16 * file all the files that it encompasses 17 * @author sjm8417 * @author Sam McIntosh 18 18 */ 19 19 public class PatternSetToFile extends Task 20 20 { 21 //Sets whether or not only the top-level files and folders 22 //are stored in the output file 23 public boolean _toplevelonly = false; 24 21 25 //The file the set will be written to 22 26 public File _outfile = null; … … 48 52 49 53 String[] includedFiles = ds.getIncludedFiles(); 54 55 if(_toplevelonly) 56 { 57 ArrayList toplevel = new ArrayList(); 58 59 for(int j = 0; j < includedFiles.length; j++) 60 { 61 int separatorIndex = includedFiles[j].indexOf(File.separator); 62 63 if ( separatorIndex == -1 && includedFiles[j].length() > 0 && !toplevel.contains(toplevel)) { 64 toplevel.add(includedFiles[j]); 65 } 66 else if ( separatorIndex > -1 && includedFiles[j].length() > 0) { 67 String path = includedFiles[j].substring(0, separatorIndex); 68 if ( !toplevel.contains(path) ) { 69 toplevel.add(path); 70 } 71 } 72 } 73 includedFiles = (String[])toplevel.toArray(new String[0]); 74 } 75 50 76 for (int j = 0; j < includedFiles.length; j++) 51 77 { … … 60 86 } 61 87 } 62 88 89 public void setToplevelonly(boolean toplevelonly) 90 { 91 _toplevelonly = toplevelonly; 92 } 93 63 94 public void setOutfile(File outfile) 64 95 { 65 96 _outfile = outfile; 66 97 } 67 98 68 99 public void setDir(File dir) 69 100 { … … 73 104 public void addConfiguredPatternset(PatternSet patternset) 74 105 { 75 if (patternset == null || !(patternset instanceof PatternSet))106 if (patternset == null) 76 107 { 77 108 return; -
main/trunk/release-kits/shared/core/ant-scripts/shared.xml
r23210 r23242 381 381 <mkdir dir="components"/> 382 382 383 <pstf dir="compiled" outfile="compiled/uninstall/${component}.uninstall"> 383 <!-- the PatternSet To File task takes one or more patternsets and outputs to a file all of the files it includes --> 384 <pstf dir="compiled" outfile="compiled/uninstall/${component}.uninstall" toplevelonly="true"> 384 385 <patternset refid="greenstone${version.major}.${component}.component"/> 385 386 </pstf> -
main/trunk/release-kits/shared/core/uninstaller/Uninstall.bat
r23210 r23242 51 51 del Uninstall.* 52 52 del *.uninstall 53 del ..\bin 54 del ..\tmp 55 del ..\ext 53 rmdir /S /Q ..\bin 54 rmdir /S /Q ..\tmp 55 rmdir /S /Q ..\ext 56 rmdir /S /Q ..\uninstall 56 57 57 58 cd .. -
main/trunk/release-kits/shared/core/uninstaller/Uninstaller.java
r23210 r23242 443 443 for ( int i=0; i < files.length; i++) { 444 444 if( files[i].getAbsolutePath().endsWith(".uninstall") ) { 445 String[] paths = get RelevantPathsFromUninstallFile(files[i]);445 String[] paths = getPathsFromUninstallFile(files[i]); 446 446 447 447 for(int j=0; j < paths.length; j++) { … … 481 481 return (String[]) paths.toArray(new String[0]); 482 482 } 483 484 public String[] getPathsFromUninstallFile ( File uninstallFile ) { 485 486 ArrayList paths = new ArrayList(); 487 try { 488 BufferedReader in = new BufferedReader(new FileReader(uninstallFile)); 489 490 String line; 491 while ( (line = in.readLine()) != null ) { 492 if (line.length() > 0 && !paths.contains(line)) { 493 paths.add(line); 494 } 495 } 496 497 in.close(); 498 } 499 catch( Exception ex ) { 500 ex.printStackTrace(); 501 return null; 502 } 503 return (String[]) paths.toArray(new String[0]); 504 } 483 505 484 506 public void recursiveDelete( File f, File[] exceptions ) throws CancelledException {
Note:
See TracChangeset
for help on using the changeset viewer.