Changeset 17444 for release-kits/lirk3

Timestamp:

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

Author:

oranfry

Message:

jre now part of core

Location:

release-kits/lirk3/installer

Files:

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

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

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

release-kits/lirk3/installer/build.xml

@@ -53 +53 @@
         <echo/>
 
+        <!-- jre -->
+        <move todir="${installDir}/packages/jre">
+            <fileset dir="../@linux-java.extracted@"/>
+        </move>
+        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
+
+
         <echo>Renaming greenstone3-build.xml back to build.xml</echo>
         <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
@@ -105 +112 @@
     </target>
 
-    <target name="install-linux-java">
-        <echo>Installing bundled java</echo>
-        <copy todir="${installDir}/packages/jre">
-            <fileset dir="../@linux-java.extracted@"/>
-        </copy>
-        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
-        <echo/>
-    </target>
-
     <target name="install-tomcat">
         <echo>Installing Tomcat (packages/tomcat)</echo>