Changeset 17281 for release-kits/lirk3

Timestamp:

2008-09-12T14:43:32+12:00 (16 years ago)

Author:

oranfry

Message:

tidied up some xml files

Location:

release-kits/lirk3

Files:

• ant-scripts/create-installer.xml (modified) (1 diff)
• installer/antinstall-config.xml (modified) (3 diffs)

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

@@ -37 +37 @@
         </installer>
 
-        <!-- delete the 'bundled java only' lines from the installer config -->
-        <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/>
+        <!-- delete the bundled java lines from the installer config -->
+        <dcff
+            file="${basedir}/installer/antinstall-config.xml"
+            startTag=".*&lt;!-- start bundled java only --&gt;"
+            endTag=".*&lt;!-- end bundled java only --&gt;"/>
 
         <installer file="${basedir}/installer/greenstone3.jar"

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

@@ -7 +7 @@
             debug="false"
             lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
-            name="Greenstone3 @version@ Installer"
+            name="Greenstone@version@ Installer"
             windowIcon="/resources/icon.png"
             defaultImageResource="/resources/header.png"
@@ -24 +24 @@
 
         <directory property="installDir"
-            defaultValue="/usr/local/Greenstone-@version@"
-            defaultValueWin="${env.ProgramFiles}\Greenstone-@version@"
+            defaultValue="/usr/local/Greenstone3"
             create="true"
             displayText="" />
@@ -32 +31 @@
 
     <page type="input" name="selector" displayText="">
-
         <comment name="choose-components"/>
 
-        <target target="install-core-components"    diskRequirement="@component.size.core@"         defaultValue="true" displayText="" force="true" />
-        <target target="install-java"               diskRequirement="@component.size.linux-java@"   defaultValue="true" displayText="" /> <!-- bundled java only -->
-        <target target="install-tomcat"             diskRequirement="@component.size.tomcat@"           defaultValue="true" displayText="" />
-        <target target="install-ant"                diskRequirement="@component.size.ant@"              defaultValue="true" displayText="" />
-        <target target="install-source-code"        diskRequirement="@component.size.sourcecode@"   defaultValue="false"    displayText="" />
+        <target
+            target="install-core-components"
+            diskRequirement="@component.size.core@"
+            defaultValue="true"
+            displayText=""
+            force="true"/>
+
+        <!-- start bundled java only -->
+        <target
+            target="install-java"
+            diskRequirement="@component.size.linux-java@"
+            defaultValue="true"
+            displayText=""/>
+        <!-- end bundled java only -->
+
+        <target
+            target="install-tomcat"
+            diskRequirement="@component.size.tomcat@"
+            defaultValue="true"
+            displayText=""/>
+
+        <target
+            target="install-ant"
+            diskRequirement="@component.size.ant@"
+            defaultValue="true"
+            displayText=""/>
+
+        <target
+            target="install-source-code"
+            diskRequirement="@component.size.sourcecode@"
+            defaultValue="false"
+            displayText=""/>
 
     </page>