Changeset 22354

Timestamp:

2010-07-06T14:27:58+12:00 (14 years ago)

Author:

sjm84

Message:

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

File:

• main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml (modified) (4 diffs)

main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml

@@ -78 +78 @@
         <property name="component.size.imagemagick" value="${component.megabytesize.imagemagick} MB"/>
 
+        <!-- calculate the size of: ghostscript -->
+        <length property="component.bytesize.ghostscript" mode="all"><fileset file="${basedir}/components/ghostscript.comp"/></length>
+        <math result="component.megabytesize.ghostscript" operand1="${component.bytesize.ghostscript}" operation="/" operand2="1048576" datatype="int"/>
+        <property name="component.size.ghostscript" value="${component.megabytesize.ghostscript} MB"/>
+        
         <!-- calculate the size of: apache httpd -->
         <length property="component.bytesize.httpd" mode="all"><fileset file="${basedir}/components/apachehttpd.comp"/></length>
@@ -112 +117 @@
         </if>
         <!-- /EXT -->
-
+        <echo>ANOTHER CHECK</echo>
         <!-- put the concrete values of things in the config -->
         <rsr>
@@ -125 +130 @@
             <job pattern="@java.extracted@" replacement="${java.extracted}"/>
         </rsr>
+        <echo>BEFORE AMP</echo>
 
         <!-- EXT -->
         <if><bool><equals arg1="${amp.enabled}" arg2="true"/></bool>
+          <echo>IN AMP</echo>
           <rsr>
             <fileset dir="${basedir}/installer" includes="*.xml"/>
@@ -135 +142 @@
         <!-- /EXT -->
 
+        <echo>NOT IN AMP</echo>
         <!-- put the concrete values of things in the text -->
         <rsr>