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

jts21 - Removed unused installer targets and variables, renamed some java variables, made installing a JRE an optional installation component

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r28695 r28717  
    6161
    6262        <!-- calculate the size of: core -->
    63         <length property="component.bytesize.core-without-jre" mode="all"><fileset file="${basedir}/components/core.comp"/></length>
    64         <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
    65             <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.windows-java}" datatype="int"/>
    66         <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
    67             <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.linux-java}" datatype="int"/>
    68         <else>
    69             <property name="component.bytesize.core" value="${component.bytesize.core-without-jre}"/>
    70         </else></if></else></if>
     63        <length property="component.bytesize.core" mode="all"><fileset file="${basedir}/components/core.comp"/></length>
    7164        <math result="component.megabytesize.core" operand1="${component.bytesize.core}" operation="/" operand2="1048576" datatype="int"/>
    7265        <property name="component.size.core" value="${component.megabytesize.core} MB"/>
    7366
    74         <!-- calculate the size of: imagemagick -->
    75         <length property="component.bytesize.imagemagick" mode="all"><fileset file="${basedir}/components/imagemagick.comp"/></length>
    76         <math result="component.megabytesize.imagemagick" operand1="${component.bytesize.imagemagick}" operation="/" operand2="1048576" datatype="int"/>
    77         <property name="component.size.imagemagick" value="${component.megabytesize.imagemagick} MB"/>
     67        <!-- calculate the size of: jre -->
     68        <math result="component.megabytesize.java" operand1="${component.bytesize.java}" operation="/" operand2="1048576" datatype="int"/>
     69        <property name="component.size.java" value="${component.megabytesize.java} MB"/>
    7870
    79         <!-- calculate the size of: ghostscript -->
    80         <length property="component.bytesize.ghostscript" mode="all"><fileset file="${basedir}/components/ghostscript.comp"/></length>
    81         <math result="component.megabytesize.ghostscript" operand1="${component.bytesize.ghostscript}" operation="/" operand2="1048576" datatype="int"/>
    82         <property name="component.size.ghostscript" value="${component.megabytesize.ghostscript} MB"/>
    83        
    84         <!-- calculate the size of: apache httpd -->
    85         <length property="component.bytesize.httpd" mode="all"><fileset file="${basedir}/components/apachehttpd.comp"/></length>
    86         <math result="component.megabytesize.httpd" operand1="${component.bytesize.httpd}" operation="/" operand2="1048576" datatype="int"/>
    87         <property name="component.size.httpd" value="${component.megabytesize.httpd} MB"/>
    88        
    89         <!-- calculate the size of: tomcat -->
    90         <length property="component.bytesize.tomcat" mode="all"><fileset file="${basedir}/components/tomcat.comp"/></length>
    91         <math result="component.megabytesize.tomcat" operand1="${component.bytesize.tomcat}" operation="/" operand2="1048576" datatype="int"/>
    92         <property name="component.size.tomcat" value="${component.megabytesize.tomcat} MB"/>
    93 
    94         <!-- EXT -->
    95         <!-- calculate the size of: amp (and put it into the components directory) -->
    96         <if><bool><and><equals arg1="${amp.enabled}" arg2="true"/><not><available file="${rk.home}/ext/amp.lzma"/></not></and></bool>
    97           <fail>amp.lzma file not found in the release kit ext directory</fail>
    98         </if>
    99 
    100         <if><bool><and><equals arg1="${amp.enabled}" arg2="true"/></and></bool>
    101           <echo>Copying amp.lzma to compontents directory</echo>
    102           <copy file="${rk.home}/ext/amp.lzma" todir="${basedir}/components"/>
    103           <property name="component.size.amp" value="257 MB"/>
    104         </if>
    105         <!-- /EXT -->
    10671
    10772        <echo>**** OS: ${rk.os}</echo>
    … …  
    11176        <dcff file="installer/build.xml" startTag="&lt;!--\s*if\s*(?!.*${rk.os})[^ ]+\s*--&gt;" endTag="&lt;!--\s*/if\s*--&gt;" />
    11277
    113         <!-- EXT -->
    114         <if><bool><not><equals arg1="${amp.enabled}" arg2="true"/></not></bool>
    115          
    116           <dcff file="installer/antinstall-config.xml" startTag="&lt;!-- start amp --&gt;" endTag="&lt;!-- end amp --&gt;" />
    117           <dcff file="installer/build.xml" startTag="&lt;!-- start amp --&gt;" endTag="&lt;!-- end amp --&gt;" />
    118         </if>
    119         <!-- /EXT -->
    12078        <!-- put the concrete values of things in the config -->
    12179        <rsr>
    12280            <fileset dir="${basedir}/installer" includes="*.xml"/>
    123 <!--            <job pattern="@projectname@" replacement="${projectname}"/>
    124 -->
     81            <job pattern="@projectname@" replacement="${projectname}"/>
    12582            <job pattern="@version@" replacement="${version}${version-extra}"/>
    12683            <job pattern="@component.size.core@" replacement="${component.size.core}"/>
    127             <job pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/>
    128             <job pattern="@component.size.imagemagick@" replacement="${component.size.imagemagick}"/>
    129             <job pattern="@component.size.ghostscript@" replacement="${component.size.ghostscript}"/>
    130             <job pattern="@component.size.httpd@" replacement="${component.size.httpd}"/>
     84            <job pattern="@component.size.java@" replacement="${component.size.java}"/>
    13185            <job pattern="@java.min.version@" replacement="${java.min.version}"/>
    13286            <job pattern="@java.extracted@" replacement="${java.extracted}"/>
    … …  
    149103        </if>   
    150104
    151         <!-- EXT -->
    152         <if><bool><equals arg1="${amp.enabled}" arg2="true"/></bool>
    153           <rsr>
    154             <fileset dir="${basedir}/installer" includes="*.xml"/>
    155             <job pattern="@component.size.amp@" replacement="${component.size.amp}"/>
    156           </rsr>
    157         </if>
    158         <!-- /EXT -->
    159 
    160105        <!-- put the concrete values of things in the text -->
    161106        <rsr>
    … …  
    165110            <job pattern="@version.major@" replacement="${version.major}"/>
    166111            <job pattern="@java.min.version@" replacement="${java.min.version}"/>
    167             <job pattern="@bundled.version.imagemagick@" replacement="${bundled.version.imagemagick}"/>
    168             <job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/>
    169             <job pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    170112            <job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/>
    171113            <job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/>
Note: See TracChangeset for help on using the changeset viewer.