Changeset 15205 for release-kits/lirk3/installer

Timestamp:

2008-04-23T17:26:48+12:00 (16 years ago)

Author:

oranfry

Message:

some updates to make the release kit produce nicer installers

Location:

release-kits/lirk3/installer

Files:

• antinstall-config.xml (modified) (2 diffs)
• build.xml (modified) (5 diffs)
• cp/resources/LanguagePack.properties (added)
• cp/resources/LanguagePack_en_NZ.properties (deleted)
• cp/resources/gs3-small.png (added)
• cp/resources/makewavesdawn.png (modified) ( previous)

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

@@ -6 +6 @@
             debug="false"
             lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
-            name="Greenstone3Installer"
-            windowIcon="/resources/gkmain_inv.png"
+            name="Greenstone3 Installer"
+            windowIcon="/resources/gs3-small.png"
             defaultImageResource="/resources/makewavesdawn.png"
             minJavaVersion="1.4">
 
-    <!--  each page element represents a page of the installer -->
-    <page
-            type="input"
-            name="intro"
-            displayText="Welcome to the Greenstone3 installer">
+    <!--  simple intro page -->
+    <page type="input" name="intro" displayText="">
+        <comment name="welcome-message"/>
     </page>
 
     <!--  type="license" shows a license page to click through -->
-    <page
-            type="license"
-            name="license"
-            displayText="License conditions"
-            resource="/LICENSE.txt">
-    </page>
+    <page type="license" name="license" resource="/LICENSE.txt"  displayText="" />
 
-    <!--  type="input" shows a list of editable options for the installer -->
-    <page
-            type="input"
-            name="destination"
-            displayText="Install Destination">
+    <!--  install destination page -->
+    <page type="input" name="destination">
 
-        <directory
-                property="installDir"
-                defaultValue="/usr/local/Greenstone-@version@"
-                defaultValueWin="${env.ProgramFiles}\Greenstone-@version@"
-                displayText="Select an installation directory"
-                create="true"/>
+        <directory property="installDir"
+            defaultValue="/usr/local/Greenstone-@version@"
+            defaultValueWin="${env.ProgramFiles}\Greenstone-@version@"
+            create="true"
+            displayText="" />
 
     </page>
 
-    <page type="input" name="tomcatports" displayText="Tomcat Ports">
+    <page type="input" name="selector">
 
-        <comment name="tomcatportsdescription" displayText="Please select the ports which the web server (Apache Tomcat) will use  will use. It is usually safe to accept the defaults by just clicking Next. The exception is when you are running other services on these ports - if this is the case, select some free ports and click Next."/>
+        <comment name="choose-components"/>
 
-        <text property="tomcat.server" defaultValue="localhost" displayText="Tomcat Server"/>
-        <text property="tomcat.port" defaultValue="8080" displayText="Tomcat Port"/>
-        <text property="tomcat.shutdown.port" defaultValue="8005" displayText="Tomcat Shutdown Port"/>
+        <target target="install-core-components"    defaultValue="true" force="true" displayText="" />
+        <target target="install-java"               defaultValue="true" displayText="" /> <!-- bundled java only -->
+        <target target="install-tomcat"             defaultValue="true" displayText="" />
+        <target target="install-ant"                    defaultValue="true" displayText="" />
+        <target target="install-source-code"        defaultValue="false" displayText="" />
 
     </page>
 
+    <page type="input" name="tomcat-config" ifProperty="(${install-tomcat}==true)">
 
-    <page
-            type="input"
-            name="selector"
-            displayText="Components to install">
-
-        <comment name="choosecomponents" displayText="Choose the components you want to install" bold="true"/>
-        <target displayText="Core components" target="default" defaultValue="true" force="true"/>
-        <target displayText="Source code" target="tgsrc" defaultValue="false"/>
+        <text property="tomcat.server" defaultValue="localhost" displayText=""/>
+        <text property="tomcat.port" defaultValue="8080" displayText=""/>
+        <text property="tomcat.shutdown.port" defaultValue="8005" displayText=""/>
 
     </page>
@@ -66 +53 @@
             type="progress"
             name="progress"
-            displayText="Installation progress"
             showTargets="false"
             target="cleanuptarget">

release-kits/lirk3/installer/build.xml

@@ -4 +4 @@
 -->
 
-<project name="Installation" default="">
+<project name="Installation">
 
     <!-- this is required to pick up the properties generated during the install pages -->
@@ -21 +21 @@
 
 
-    <target name="default" depends="">
+    <target name="install-core-components" depends="">
 
         <!-- create the installation directory -->
@@ -134 +134 @@
 
     <!-- Source -->
-    <target name="tgsrc" depends="">
+    <target name="install-source-code" depends="">
         <echo message="Installing Source Code (src)"/>
         <mkdir dir="${installDir}/src"/>
@@ -144 +144 @@
     </target>
 
-    <target name="install-bundled-java" depends="" if="bundled.java.exists">
+    <target name="install-java">
         <echo message="Installing bundled java"/>
         <copy todir="${installDir}/packages/jre">
@@ -152 +152 @@
     </target>
 
-    <target name="cleanuptarget" depends="install-bundled-java">
+    <target name="install-tomcat">
+        <echo message="Installing Tomcat"/>
+    </target>
+
+    <target name="install-ant">
+        <echo message="Installing Ant"/>
+    </target>
+
+
+
+    <target name="cleanuptarget">
     </target>