Changeset 22354

Show
Ignore:
Timestamp:
06.07.2010 14:27:58 (9 years ago)
Author:
sjm84
Message:

Re-added some code that was accidentally deleted during installer upgrades

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml

    r22325 r22354  
    7878        <property name="component.size.imagemagick" value="${component.megabytesize.imagemagick} MB"/> 
    7979 
     80        <!-- calculate the size of: ghostscript --> 
     81        <length property="component.bytesize.ghostscript" mode="all"><fileset file="${basedir}/components/ghostscript.comp"/></length> 
     82        <math result="component.megabytesize.ghostscript" operand1="${component.bytesize.ghostscript}" operation="/" operand2="1048576" datatype="int"/> 
     83        <property name="component.size.ghostscript" value="${component.megabytesize.ghostscript} MB"/> 
     84         
    8085        <!-- calculate the size of: apache httpd --> 
    8186        <length property="component.bytesize.httpd" mode="all"><fileset file="${basedir}/components/apachehttpd.comp"/></length> 
     
    112117        </if> 
    113118        <!-- /EXT --> 
    114  
     119        <echo>ANOTHER CHECK</echo> 
    115120        <!-- put the concrete values of things in the config --> 
    116121        <rsr> 
     
    125130            <job pattern="@java.extracted@" replacement="${java.extracted}"/> 
    126131        </rsr> 
     132        <echo>BEFORE AMP</echo> 
    127133 
    128134        <!-- EXT --> 
    129135        <if><bool><equals arg1="${amp.enabled}" arg2="true"/></bool> 
     136          <echo>IN AMP</echo> 
    130137          <rsr> 
    131138            <fileset dir="${basedir}/installer" includes="*.xml"/> 
     
    135142        <!-- /EXT --> 
    136143 
     144        <echo>NOT IN AMP</echo> 
    137145        <!-- put the concrete values of things in the text --> 
    138146        <rsr>