Changeset 28716


Ignore:
Timestamp:
2013-11-28T17:44:15+13:00 (10 years ago)
Author:
ak19
Message:

jts21 - Update init.xml to remove unused (Greenstone-specific) components and update java variables

File:
1 edited

Legend:

Unmodified
Added
Removed

  • other-projects/expeditee-release-kits/kits/rke/ant-scripts/init.xml

    r28695 r28716  
    11<project name="rke-init">
    2     <!-- CHECK PRE-CONDITIONS  -->
     2    <!-- CHECK PRE-CONDITIONS   -->
    33    <target name="init">
    44
    … …  
    4343
    4444        <!-- the minimum version of java which the installer should be run with (this gets used in search4j) -->
    45         <property name="java.min.version" value="1.4.0_00"/>
     45        <property name="java.min.version" value="1.6.0_00"/>
    4646
    4747        <!-- create a localised basedir property -->
    … …  
    5353
    5454        <!-- the extra space for the dmg image in KB (mac wrapper) -->
    55             <property name="dmg.overhead" value="4096"/>
     55                    <property name="dmg.overhead" value="4096"/>
    5656
    5757        <!-- current date and time -->
    … …  
    6363
    6464        <if>
    65           <bool><equals arg1="${x64}" arg2="true"/></bool>
    66           <property name="extension-x64" value="-x64" />
    67           <property name="extension_x64" value="_x64" />
    68           <else>
    69             <property name="extension-x64" value="" />
    70             <property name="extension_x64" value="" />
    71           </else>
     65            <bool><equals arg1="${x64}" arg2="true"/></bool>
     66            <property name="extension-x64" value="-x64" />
     67            <property name="extension_x64" value="_x64" />
     68            <else>
     69                <property name="extension-x64" value="" />
     70                <property name="extension_x64" value="" />
     71            </else>
    7272        </if>
    7373
    74         <!-- BUNDLED JAVA INFO -->
    75         <!-- the bundled javas are kept in shared/linux/wrapper and shared/windows/wrapper in the repository -->
    76         <!-- change this info when the bundled version changes -->
    77         <property name="java.extracted" value="jre"/> <!-- set this to the name of the top level directory in the above archive -->
    78 
    79         <!-- linux -->
    80         <property name="linux-java.installer" value="jre_bin${extension_x64}"/>
    81         <property name="bundled.version.linux-java" value="1.6.0_05"/> <!-- set this to the version number of java in the above archive -->
    82         <property name="component.bytesize.linux-java" value="101245987"/> <!-- set this to the size of the extract archive -->
    83 
    84         <!-- windows -->
    85         <property name="windows-java.installer" value="jre.exe"/>
    86         <property name="bundled.version.windows-java" value="1.6.0_07"/> <!-- set this to the version number of java in the above archive -->
    87         <property name="component.bytesize.windows-java" value="75000000"/> <!-- set this to the size of the extract archive -->
    88 
    89         <!-- version numbers of other bundled things -->
    90         <property name="bundled.version.imagemagick" value="6.4.3"/>
    91         <property name="bundled.version.ghostscript" value="8.63"/>
    92         <property name="bundled.version.tomcat" value="6.0.20"/>
    93    
    9474        <!-- default revision and branch path -->
    9575        <property name="branch.revision" value="HEAD" />
    9676        <property name="branch.path" value="trunk" />
    97            
     77               
    9878       
    9979
    … …  
    160140            <property name="os.script.format" value="bat"/>
    161141        </if></else></if>
     142       
     143       
     144        <!-- BUNDLED JAVA INFO -->
     145        <!-- the bundled javas are kept in shared/linux/wrapper and shared/windows/wrapper in the repository -->
     146        <!-- change this info when the bundled version changes -->
     147        <property name="java.extracted" value="jre"/> <!-- set this to the name of the top level directory in the above archive -->
     148
     149        <property name="bundled.version.java" value="1.8.0"/> <!-- set this to the version number of java in the above archive -->
     150        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
     151            <property name="java.installer" value="jre_bin${extension_x64}"/>
     152            <if>
     153                <bool><equals arg1="${x64}" arg2="true"/></bool>
     154                    <property name="component.bytesize.java" value="158123846"/> <!-- set this to the size of the x64 extracted archive -->
     155                <else>
     156                    <property name="component.bytesize.java" value="161601299"/> <!-- set this to the size of the x32 extracted archive -->
     157                </else>
     158            </if>
     159            <else>
     160                <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
     161                    <property name="java.installer" value="jre.exe"/>
     162                    <property name="component.bytesize.java" value="75000000"/> <!-- set this to the size of the extract archive -->
     163                <else>
     164                    <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
     165                        <echo>Mac has no java</echo>
     166                    </if>
     167                </else>
     168                </if>
     169            </else>
     170        </if>
     171
    162172
    163173        <!-- show important properties -->
Note: See TracChangeset for help on using the changeset viewer.