Changeset 19938 for release-kits/lirk2

Timestamp:

2009-06-26T18:02:44+12:00 (15 years ago)

Author:

oranfry

Message:

it's all good stuff

Location:

release-kits/lirk2

Files:

• ant-scripts/create-cdrom-components.xml (modified) (1 diff)
• installer/build.xml (modified) (1 diff)

release-kits/lirk2/ant-scripts/create-cdrom-components.xml

@@ -52 +52 @@
         <!-- jre -->
         <mkdir dir="cdrom/dist/Java/Linux"/>
-        <copy file="${lirk2.home}/linux/jre_bin" todir="cdrom/dist/Java/Linux"/>
+        <exec executable="cp">
+            <arg value="${lirk2.home}/linux/jre_bin"/>
+            <arg value="cdrom/dist/Java/Linux"/>
+        </exec>
         <!--
         <exec dir="cdrom/dist/Java/Linux" executable="${lirk2.home}/linux/jre_bin"/>

release-kits/lirk2/installer/build.xml

@@ -19 +19 @@
 
     <condition property="bundled.java.exists">
-        <or>
-            <available file="../@linux-java.extracted@/bin/java"/>
-            <available file="${orig.dir}/Java/Linux/jre"/>
-        </or>
+        <available file="../@linux-java.extracted@/bin/java"/>
     </condition>
 
     <target name="Initialising" if="bundled.java.exists">
         <mkdir dir="${installDir}/packages"/>
-        <!-- start web -->
         <copy todir="${installDir}/packages/jre" failonerror="false">
             <fileset dir="../@linux-java.extracted@"/>
         </copy>
-        <!-- end web -->
-
-        <!-- start cdrom -->
-        <copy todir="${installDir}/packages/jre" failonerror="false">
-            <fileset dir="${orig.dir}/Java/Linux/jre"/>
-        </copy>
-        <!-- end cdrom -->
-
         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
     </target>