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

Timestamp:

2010-10-26T15:12:23+13:00 (14 years ago)

Author:

sjm84

Message:

The uninstaller has been modified so that it no longer will delete files or folders in the top-level directory that do not belong to Greenstone

File:

• main/trunk/release-kits/shared/core/ant-scripts/shared.xml (modified) (5 diffs)

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

@@ -86 +86 @@
         <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
         <typedef name="dcff" classname="org.greenstone.anttasks.DeleteChunkFromFile" classpathref="project.classpath"/>
+        <typedef name="pstf" classname="org.greenstone.anttasks.PatternSetToFile" classpathref="project.classpath"/>
         <typedef name="rsplit" classname="org.greenstone.anttasks.SplitResource" classpathref="project.classpath"/>
         <typedef name="get-property-value" classname="org.greenstone.anttasks.GetPropertyValue" classpathref="project.classpath"/>
@@ -238 +239 @@
         <!-- create working build directory -->
         <mkdir dir="compiled/uninstaller/build/resources" />
-
+        <mkdir dir="compiled/uninstall"/>
+        
         <!-- copile to build -->
         <javac
@@ -252 +254 @@
         <!-- jar it all up -->
         <jar
-            destfile="compiled/uninst.jar"
+            destfile="compiled/uninstall/uninst.jar"
             manifest="${rk.home}/shared/core/uninstaller/manifest.mf"
             basedir="compiled/uninstaller/build" />
@@ -260 +262 @@
 
         <!-- put the associated script in place -->
-        <copy file="${rk.home}/shared/core/uninstaller/Uninstall.${os.script.format}" todir="compiled"/>
+        <copy file="${rk.home}/shared/core/uninstaller/Uninstall.${os.script.format}" todir="compiled/uninstall"/>
 
     </target>
@@ -377 +379 @@
     <!-- target to archive and compress a given component -->
     <target name="create-component">
-      <mkdir dir="components"/>
+        <mkdir dir="components"/>
       
-      <zip destfile="components/${component}.comp" compress="false">
-        <zipfileset dir="compiled">
-          <patternset refid="greenstone${version.major}.${component}.component"/>
-        </zipfileset>
-      </zip>
+        <pstf dir="compiled" outfile="compiled/uninstall/${component}.uninstall">
+            <patternset refid="greenstone${version.major}.${component}.component"/>
+        </pstf>
+      
+        <zip destfile="components/${component}.comp" compress="false">
+            <zipfileset dir="compiled">
+                <patternset refid="greenstone${version.major}.${component}.component"/>
+            </zipfileset>
+        </zip>
     
-      <!-- windows -->
-      <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+        <!-- windows -->
+        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
         <exec executable="${rk.home}/shared/windows/7za/7za.exe" dir="components"><arg line="a -t7z -mx=9 ${component}.lzma ${component}.comp"/></exec>