Changeset 17754


Ignore:
Timestamp:
11/06/08 15:11:37 (12 years ago)
Author:
oranfry
Message:

dont fail if jre is not bundled

Location:
release-kits
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release-kits/lirk2/installer/build.xml

    r17700 r17754  
    2222    </condition>
    2323
     24    <target name="bootstrap" if="bundled.java.exists">
     25        <mkdir dir="${installDir}"/>
     26        <copy todir="${installDir}/packages/jre" failonerror="false">
     27            <fileset dir="../@linux-java.extracted@"/>
     28        </copy>
     29        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
     30    </target>
    2431
    2532    <!-- core system -->
    26     <target name="Installing Core System">
     33    <target name="Installing Core System" depends="bootstrap">
    2734
    28         <echo>basedir: ${basedir}</echo>
    29         <echo>installDir: ${installDir}</echo>
    30         <echo>antinstaller.jar: ${antinstaller.jar}</echo>
    31 
    32         <echo>Creating Installation directory</echo>
    3335        <mkdir dir="${installDir}"/>
    3436
     
    4345        <copy tofile="${installDir}/cgi-bin/oaiserver" file="${installDir}/bin/linux/oaiserver"/>
    4446        <copy tofile="${installDir}/cgi-bin/library" file="${installDir}/bin/linux/library"/>
    45 
    46         <!-- jre -->
    47         <copy todir="${installDir}/packages/jre" failonerror="false">
    48             <fileset dir="../@linux-java.extracted@"/>
    49         </copy>
    50         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
    5147
    5248        <echo>Setting Binaries to Executable</echo>
  • release-kits/lirk3/installer/build.xml

    r17699 r17754  
    1717    <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
    1818
    19     <target name="Installing Core System" depends="">
     19    <condition property="bundled.java.exists">
     20        <available file="../@linux-java.extracted@/bin/java"/>
     21    </condition>
     22
     23    <target name="bootstrap" if="bundled.java.exists">
     24        <mkdir dir="${installDir}"/>
     25        <copy todir="${installDir}/packages/jre" failonerror="false">
     26            <fileset dir="../@linux-java.extracted@"/>
     27        </copy>
     28        <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
     29    </target>
     30
     31    <target name="Installing Core System" depends="bootstrap">
    2032
    2133        <!-- create the installation directory -->
    22         <echo>Creating Installation directory</echo>
    23         <echo>basedir: ${basedir}</echo>
    24         <echo>installDir: ${installDir}</echo>
    25         <echo>antinstaller.jar: ${antinstaller.jar}</echo>
    2634        <mkdir dir="${installDir}"/>
    27 
    2835
    2936        <!-- install files -->
     
    3441        <unzip src="${basedir}/core.comp" dest="${installDir}"/>
    3542        <delete file="core.comp"/>
    36 
    37         <!-- jre -->
    38         <mkdir dir="packages"/>
    39         <copy todir="${installDir}/packages/jre" failonerror="false">
    40             <fileset dir="../@linux-java.extracted@"/>
    41         </copy>
    42         <chmod dir="${installDir}/packages/jre/bin" includes="*" perm="775"/>       
    4343
    4444        <echo>Setting Binaries to Executable</echo>
  • release-kits/mark2/installer/build.xml

    r17716 r17754  
    1818    <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
    1919
    20     <condition property="bundled.java.exists">
    21         <available file="../@java.extracted@/bin/java"/>
    22     </condition>
    23 
    24 
    2520    <target name="Installing Core System" depends="">
    2621
     
    3227        <echo message="Creating Installation directory"/>
    3328        <mkdir dir="${installDir}"/>
    34 
    3529
    3630        <echo>Installing Core Files</echo>
Note: See TracChangeset for help on using the changeset viewer.