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

Timestamp:

2010-06-30T10:24:48+12:00 (14 years ago)

Author:

sjm84

Message:

Several upgrades to the release kits have been made including: optional Apache and the ability to create installers with extensions

File:

• main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml (modified) (3 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>
+        <math result="component.megabytesize.httpd" operand1="${component.bytesize.httpd}" operation="/" operand2="1048576" datatype="int"/>
+        <property name="component.size.httpd" value="${component.megabytesize.httpd} MB"/>
+        
         <!-- calculate the size of: tomcat -->
         <length property="component.bytesize.tomcat" mode="all"><fileset file="${basedir}/components/tomcat.comp"/></length>
@@ -88 +88 @@
         <property name="component.size.tomcat" value="${component.megabytesize.tomcat} MB"/>
 
+        <!-- EXT -->
+        <!-- calculate the size of: amp (and put it into the components directory) -->
+        <if><bool><and><equals arg1="${amp.enabled}" arg2="true"/><not><available file="${rk.home}/ext/amp.lzma"/></not></and></bool>
+          <fail>amp.lzma file not found in the release kit ext directory</fail>
+        </if>
+
+        <if><bool><and><equals arg1="${amp.enabled}" arg2="true"/></and></bool>
+          <echo>Copying amp.lzma to compontents directory</echo>
+          <copy file="${rk.home}/ext/amp.lzma" todir="${basedir}/components"/>
+          <property name="component.size.amp" value="257 MB"/>
+        </if>
+        <!-- /EXT -->
+
         <!-- make the installer descriptors relevant to the current os -->
         <dcff file="installer/antinstall-config.xml" startTag="&lt;!--\s*if\s*(?!.*${rk.os})[^ ]+\s*--&gt;" endTag="&lt;!--\s*/if\s*--&gt;" />
         <dcff file="installer/build.xml" startTag="&lt;!--\s*if\s*(?!.*${rk.os})[^ ]+\s*--&gt;" endTag="&lt;!--\s*/if\s*--&gt;" />
+
+        <!-- EXT -->
+        <if><bool><not><equals arg1="${amp.enabled}" arg2="true"/></not></bool>
+          
+          <dcff file="installer/antinstall-config.xml" startTag="&lt;!-- start amp --&gt;" endTag="&lt;!-- end amp --&gt;" />
+          <dcff file="installer/build.xml" startTag="&lt;!-- start amp --&gt;" endTag="&lt;!-- end amp --&gt;" />
+        </if>
+        <!-- /EXT -->
 
         <!-- put the concrete values of things in the config -->
@@ -100 +121 @@
             <job pattern="@component.size.imagemagick@" replacement="${component.size.imagemagick}"/>
             <job pattern="@component.size.ghostscript@" replacement="${component.size.ghostscript}"/>
+            <job pattern="@component.size.httpd@" replacement="${component.size.httpd}"/>
             <job pattern="@java.min.version@" replacement="${java.min.version}"/>
             <job pattern="@java.extracted@" replacement="${java.extracted}"/>
         </rsr>
+
+        <!-- EXT -->
+        <if><bool><equals arg1="${amp.enabled}" arg2="true"/></bool>
+          <rsr>
+            <fileset dir="${basedir}/installer" includes="*.xml"/>
+            <job pattern="@component.size.amp@" replacement="${component.size.amp}"/>
+          </rsr>
+        </if>
+        <!-- /EXT -->
 
         <!-- put the concrete values of things in the text -->