Changeset 17576 for release-kits/wirk2/installer

Timestamp:

2008-10-23T10:57:32+13:00 (15 years ago)

Author:

oranfry

Message:

more HCI changes to the installer: an animated activity indicator during install, better target names for the greenstone2 installers

Location:

release-kits/wirk2/installer

Files:

• antinstall-config.xml (modified) (4 diffs)
• build.xml (modified) (6 diffs)

release-kits/wirk2/installer/antinstall-config.xml

@@ -46 +46 @@
 
         <target
-            target="install-core-components"
+            target="Installing Core System"
             diskRequirement="@component.size.core@"
             defaultValue="true"
@@ -53 +53 @@
 
         <target
-            target="install-start-menu-shortcuts"
+            target="Installing Start Menu Shortcuts"
             diskRequirement="~10 KB"
             defaultValue="true"
@@ -60 +60 @@
         <!-- start full -->
         <target
-            target="install-imagemagick"
-            diskRequirement="@component.size.windows-java@"
-            defaultValue="true" 
-            displayText=""/>
-        <target
-            target="install-ghostscript"
-            diskRequirement="@component.size.windows-java@"
+            target="Install ImageMagick"
+            diskRequirement="@component.size.imagemagick@"
             defaultValue="true" 
             displayText=""/>
 
         <target
-            target="install-source-code"
+            target="Installing Ghostscript"
+            diskRequirement="@component.size.ghostscript@"
+            defaultValue="true" 
+            displayText=""/>
+
+        <target
+            target="Installing Source Code"
             diskRequirement="@component.size.sourcecode@"
             defaultValue="false"
@@ -84 +85 @@
     </page>
 
-    <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText=""></page>
+    <page type="progress" name="progress" showTargets="false" displayText=""></page>
 
 </installer>

release-kits/wirk2/installer/build.xml

@@ -33 +33 @@
     </target>
 
-    <target name="install-core-components" depends="load-previous-props">
+    <target name="Installing Core System" depends="load-previous-props">
 
         <!-- figure out the start menu path (if not already set from previous installation) -->
@@ -105 +105 @@
 
     <!-- Source -->
-    <target name="install-source-code" depends="">
+    <target name="Installing Source Code">
         <echo message="Installing Source Code"/>
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="sourcecode.lzma"/></patternset></unzip>
@@ -115 +115 @@
     </target>
 
-    <target name="install-imagemagick">
+    <target name="Install ImageMagick">
         <echo message="Installing ImageMagick"/>
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>
@@ -125 +125 @@
     </target>
 
-    <target name="install-ghostscript">
+    <target name="Installing Ghostscript">
         <echo message="Installing GhostScript"/>
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="ghostscript.lzma"/></patternset></unzip>
@@ -136 +136 @@
     
     <!-- Start menu shortcuts -->
-    <target name="install-start-menu-shortcuts">
+    <target name="Installing Start Menu Shortcuts">
 
         <mkdir dir="${startmenu.path}\Documentation"/>
@@ -181 +181 @@
     </target>
 
-    <target name="cleanuptarget"></target>
-    
-
 </project>