Changeset 17754 for release-kits/lirk3

Timestamp:

2008-11-06T15:11:37+13:00 (15 years ago)

Author:

oranfry

Message:

dont fail if jre is not bundled

File:

• release-kits/lirk3/installer/build.xml (modified) (2 diffs)

release-kits/lirk3/installer/build.xml

@@ -17 +17 @@
     <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
 
-    <target name="Installing Core System" depends="">
+    <condition property="bundled.java.exists">
+        <available file="../@linux-java.extracted@/bin/java"/>
+    </condition>
+
+    <target name="bootstrap" if="bundled.java.exists">
+        <mkdir dir="${installDir}"/>
+        <copy todir="${installDir}/packages/jre" failonerror="false">
+            <fileset dir="../@linux-java.extracted@"/>
+        </copy>
+        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
+    </target>
+
+    <target name="Installing Core System" depends="bootstrap">
 
         <!-- create the installation directory -->
-        <echo>Creating Installation directory</echo>
-        <echo>basedir: ${basedir}</echo>
-        <echo>installDir: ${installDir}</echo>
-        <echo>antinstaller.jar: ${antinstaller.jar}</echo>
         <mkdir dir="${installDir}"/>
-
 
         <!-- install files -->
@@ -34 +41 @@
         <unzip src="${basedir}/core.comp" dest="${installDir}"/>
         <delete file="core.comp"/>
-
-        <!-- jre -->
-        <mkdir dir="packages"/>
-        <copy todir="${installDir}/packages/jre" failonerror="false">
-            <fileset dir="../@linux-java.extracted@"/>
-        </copy>
-        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
 
         <echo>Setting Binaries to Executable</echo>