Changeset 23811 for main/trunk/release-kits/shared

Timestamp:

2011-03-24T11:21:42+13:00 (13 years ago)

Author:

sjm84

Message:

Several changes to integrate FLAX release building as an option in the release kits

Location:

main/trunk/release-kits/shared/core/ant-scripts

Files:

• create-installer.xml (modified) (1 diff)
• shared.xml (modified) (3 diffs)

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

@@ -130 +130 @@
         </rsr>
 
+        <!-- If this is a FLAX installer then we need to change a few things -->
+        <if><bool><equals arg1="${forward.install.flax}" arg2="true"/></bool>
+            <dcff file="installer/build.xml" startTag="&lt;!-- NO FLAX START --&gt;" endTag="&lt;!-- NO FLAX END --&gt;" />
+        <else>
+            <dcff file="installer/build.xml" startTag="&lt;!-- FLAX START --&gt;" endTag="&lt;!-- FLAX END --&gt;" />
+        </else>
+        </if>
+
         <!-- EXT -->
         <if><bool><equals arg1="${amp.enabled}" arg2="true"/></bool>

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

@@ -61 +61 @@
 
         <!-- the extra space for the dmg image in KB (mac wrapper) -->
-            <property name="dmg.overhead" value="2048"/>
+            <property name="dmg.overhead" value="4096"/>
 
         <!-- current date and time -->
@@ -347 +347 @@
     <!-- target to set version numbers in gli -->
     <target name="gli-set-version-numbers">
-
+        <if><bool><not><equals arg1="${with.gli.and.gems}" arg2="false"/></not></bool>
             <!-- DICTIOANRY FILES (AboutDialog.Date) -->
             <echo level="info">Changing AboutDialog.Date in all dictionaries</echo>
@@ -374 +374 @@
             <echo level="info">Changing configuration version in gli/classes/xml/configRemote.xml</echo>
             <rsr file="${glibasedir}/classes/xml/configRemote.xml" pattern="^(\s*&lt;Configuration.* version=&quot;)[^&quot;]*(&quot;.*&gt;)" replacement="$1${version}${version-extra}$2"/>
-
+        </if>
     </target>