Changeset 17444 for release-kits/wirk3

Timestamp:

2008-10-02T09:36:25+13:00 (16 years ago)

Author:

oranfry

Message:

jre now part of core

Location:

release-kits/wirk3/installer

Files:

• antinstall-config.xml (modified) (1 diff)
• build.xml (modified) (3 diffs)

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

@@ -48 +48 @@
         <!-- start full -->
         <target
-            target="install-windows-jre"
-            diskRequirement="@component.size.windows-java@"
-            defaultValue="true"
-            displayText=""/>
-        
-        <target
             target="install-tomcat"
             diskRequirement="@component.size.tomcat@"

release-kits/wirk3/installer/build.xml

@@ -26 +26 @@
     <pathconvert targetos="unix" property="installDir.unix" refid="installDir.path"/>
     
-
     <!-- load windows properties -->
     <winprops/>
@@ -63 +62 @@
         <unzip src="${basedir}/core.comp" dest="${installDir}"/>
         <delete file="core.comp"/>
-        
+
+        <!-- jre -->
+        <mkdir dir="${installDir}/packages"/>
+        <move todir="${installDir}/packages/jre">
+            <fileset dir="../@windows-java.extracted@"/>
+        </move>
+
         <!-- rename greenstone3-build.xml back to build.xml -->
         <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
@@ -158 +163 @@
     </target>
     
-    <target name="install-windows-jre">
-        <echo>Installing Java Runtime Environment</echo>
-        <mkdir dir="${installDir}/packages"/>
-        <copy todir="${installDir}/packages/jre">
-            <fileset dir="../@windows-java.extracted@"/>
-        </copy>
-    </target>
-    
     <target name="cleanuptarget">
     </target>