Changeset 17257 for release-kits/lirk3

Timestamp:

2008-09-11T16:58:26+12:00 (16 years ago)

Author:

oranfry

Message:

added the uninstaller to all release kits

Location:

release-kits/lirk3

Files:

• ant-scripts/compile.xml (modified) (1 diff)
• ant-scripts/create-distribution.xml (modified) (1 diff)
• ant-scripts/create-installer.xml (modified) (3 diffs)
• installer/build.xml (modified) (3 diffs)

release-kits/lirk3/ant-scripts/compile.xml

@@ -26 +26 @@
 
         <!-- uninstaller -->
-        <antcall target="compile-uninstaller" />
+        <antcall target="compile-uninstaller" /> <!-- from global-targets -->
 
         <!-- documentation -->

release-kits/lirk3/ant-scripts/create-distribution.xml

@@ -29 +29 @@
         <antcall target="insert-user-manual"/>
         <antcall target="insert-compiled-binaries"/>
-        <antcall target="insert-uninstaller"/>
+        <antcall target="insert-uninstaller"/> <!-- from rk3-targets -->
         <antcall target="rename-build-xml-for-transit"/>
     </target>

release-kits/lirk3/ant-scripts/create-installer.xml

@@ -21 +21 @@
 
     <target name="compile-installer">
+
         <installer file="${basedir}/installer/greenstone3-with-java.jar"
                 compress="true"
@@ -29 +30 @@
                 antLib="${lirk3.home}/packages/ant/lib"
                 validateConfig="true"
-                failOnError="false"
                 icons="bluecurve">
 
-            <!-- copy all the important files into the archive to be extracted for install -->
             <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes -->
             <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
@@ -54 +53 @@
             <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
         </installer>
+
     </target>
 

release-kits/lirk3/installer/build.xml

@@ -19 +19 @@
 
         <!-- create the installation directory -->
-        <echo message="Creating Installation directory"/>
+        <echo>Creating Installation directory</echo>
         <echo>basedir: ${basedir}</echo>
         <echo>installDir: ${installDir}</echo>
@@ -83 +83 @@
         <delete file="${installDir}/resources/*.png"/>
 
+        <echo>Creating installation properties file</echo>
+        <echo file="${installDir}/installation.properties">#this file is just a placeholder for now</echo>
+
         <echo>Finished</echo>
 
@@ -90 +93 @@
     <target name="install-source-code" depends="">
 
-        <echo>Installing Source Code<echo>
+        <echo>Installing Source Code</echo>
         <mkdir dir="${installDir}/src"/>
         <unzip src="${antinstaller.jar}" dest="${installDir}">