Changeset 17583

Timestamp:

2008-10-23T15:40:07+13:00 (15 years ago)

Author:

oranfry

Message:

HCI changes to installer for wirk2

Location:

release-kits/wirk2

Files:

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

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

@@ -9 +9 @@
         <antcall target="insert-perl" />
         <antcall target="compile-c-code" />
-        <antcall target="compile-search4j-windows" /> <!-- from rk2-targets -->
         <antcall target="compile-uninstaller" /> <!-- from rk2-targets -->
         <antcall target="build-demo-collection" />

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

@@ -36 +36 @@
             <fileset dir="${basedir}/gsdl/bin/windows" includes="**/*"/>
         </copy>
-        <copy todir="${basedir}/distributions/web/bin" file="${basedir}/gsdl/bin/search4j.exe"/>
         <copy todir="${basedir}/distributions/web" file="${basedir}/gsdl/bin/windows/server.exe"/>
     </target>

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

@@ -29 +29 @@
 
     <target name="compile-installer">
-        
+
+        <!-- binary installer -->
+        <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-binary.xml"/>
+        <dcff file="${basedir}/installer/antinstall-config-binary.xml" startTag=".*&lt;!-- start sourcecode --&gt;.*" endTag=".*&lt;!-- end sourcecode --&gt;.*" />     
         <installer file="${basedir}/installer/greenstone-${version}-win32.jar"
             compress="true"
             extractType="NonExtractor"
-            installConfig="${basedir}/installer/antinstall-config.xml"
+            installConfig="${basedir}/installer/antinstall-config-binary.xml"
             buildFile="${basedir}/installer/build.xml"
             antInstallLib="${wirk2.home}/packages/ant-installer/lib"
@@ -41 +44 @@
             
             <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
-            <zipfileset dir="${basedir}/components" includes="*.lzma" />
+            <zipfileset dir="${basedir}/components" includes="*.lzma" excludes="sourcecode.lzma" />
         </installer>
         
-        <dcff file="${basedir}/installer/antinstall-config.xml" startTag=".*&lt;!-- start full --&gt;.*" endTag=".*&lt;!-- end full --&gt;.*" />
-        
+        <!-- minimal installer -->
+        <copy file="${basedir}/installer/antinstall-config.xml" tofile="${basedir}/installer/antinstall-config-minimal.xml"/>
+        <dcff file="${basedir}/installer/antinstall-config-minimal.xml" startTag=".*&lt;!-- start bundled components --&gt;.*" endTag=".*&lt;!-- end bundled components --&gt;.*" />
+        <dcff file="${basedir}/installer/antinstall-config-minimal.xml" startTag=".*&lt;!-- start sourcecode --&gt;.*" endTag=".*&lt;!-- end sourcecode --&gt;.*" />
         <installer file="${basedir}/installer/Greenstone-${version}-win32-minimal.jar"
             compress="true"
             extractType="NonExtractor"
-            installConfig="${basedir}/installer/antinstall-config.xml"
+            installConfig="${basedir}/installer/antinstall-config-minimal.xml"
             buildFile="${basedir}/installer/build.xml"
             antInstallLib="${wirk2.home}/packages/ant-installer/lib"

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

@@ -46 +46 @@
 
         <target
+            target="Looking For Previous Installation"
+            diskRequirement="x"
+            defaultValue="true"
+            displayText="x"
+            force="true"
+            hidden="true"/>
+
+        <target
             target="Installing Core System"
             diskRequirement="@component.size.core@"
@@ -58 +66 @@
             displayText=""/>
 
-        <!-- start full -->
+        <!-- start bundled components -->
         <target
-            target="Install ImageMagick"
+            target="Installing ImageMagick"
             diskRequirement="@component.size.imagemagick@"
             defaultValue="true" 
             displayText=""/>
-
         <target
             target="Installing Ghostscript"
@@ -70 +77 @@
             defaultValue="true" 
             displayText=""/>
-
+        <!-- end bundled components -->
+        
+        <!-- start sourcecode -->
         <target
             target="Installing Source Code"
@@ -76 +85 @@
             defaultValue="false"
             displayText=""/>
-        <!-- end full -->
+        <!-- end sourcecode -->
             
     </page>
@@ -85 +94 @@
     </page>
 
-    <page type="progress" name="progress" showTargets="false" displayText=""></page>
+    <page type="progress" name="progress" showTargets="true" displayText=""></page>
 
 </installer>

release-kits/wirk2/installer/build.xml

@@ -29 +29 @@
     <property name="installDir.local" refid="installDir.path"/>
     
-    <target name="load-previous-props" if="is.overinstall">
+    <target name="Looking For Previous Installation" if="is.overinstall">
         <property file="${installDir}\etc\installation.properties"/>
     </target>
 
-    <target name="Installing Core System" depends="load-previous-props">
+    <target name="Installing Core System">
 
         <!-- figure out the start menu path (if not already set from previous installation) -->
@@ -63 +63 @@
         <!-- jre -->
         <mkdir dir="${installDir}/packages"/>
-        <copy todir="${installDir}/packages/jre">
+        <copy todir="${installDir}/packages/jre" failonerror="false">
             <fileset dir="../@windows-java.extracted@"/>
         </copy>
@@ -115 +115 @@
     </target>
 
-    <target name="Install ImageMagick">
+    <target name="Installing ImageMagick">
         <echo message="Installing ImageMagick"/>
         <unzip src="${antinstaller.jar}" dest="${basedir}"><patternset><include name="imagemagick.lzma"/></patternset></unzip>