Index: main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
===================================================================
--- main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml	(revision 22699)
+++ main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml	(revision 22781)
@@ -54,5 +54,14 @@
 			<!-- unzip packages -->
 			<unzip src="${basedir}/compiled/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/compiled/common-src/packages/windows/crypt"/>
-			<unzip src="${basedir}/compiled/common-src/packages/windows/expat/expat.zip" dest="${basedir}/compiled/common-src/packages/windows/expat"/>
+			
+			<!-- unzip expat if the version is less that 2.84 -->
+			<if><bool><and>
+				<not><equals arg1="${branch.path}" arg2="trunk"/></not>
+				<not><equals arg1="${branch.path}" arg2="tags/stable"/></not>
+				<islessthan arg1="${branch.tag.version}" arg2="2.84"/>
+			</and></bool>
+				<unzip src="${basedir}/compiled/common-src/packages/windows/expat/expat.zip" dest="${basedir}/compiled/common-src/packages/windows/expat"/>
+			</if>
+			
 			<unzip src="${basedir}/compiled/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/compiled/common-src/packages/windows/stlport"/>
 			<unzip src="${basedir}/compiled/common-src/indexers/packages/windows/iconv/iconv.zip" dest="${basedir}/compiled/common-src/indexers/packages/windows/iconv"/>
@@ -61,12 +70,9 @@
 			<!-- get winbin from tags if the version is greater than 2.83 otherwise get it from trunk -->
 			<if><bool><not><available file="${basedir}/compiled/bin/windows"/></not></bool>
-				<if>
-					<bool>
-					<and>
-						<not><equals arg1="${branch.path}" arg2="trunk"/></not>
-						<not><equals arg1="${branch.path}" arg2="tags/stable"/></not>
-						<isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/>
-					</and>
-					</bool>
+				<if><bool><and>
+					<not><equals arg1="${branch.path}" arg2="trunk"/></not>
+					<not><equals arg1="${branch.path}" arg2="tags/stable"/></not>
+					<isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/>
+				</and></bool>
 					
 					<exec executable="svn">
@@ -314,38 +320,35 @@
 			<delete dir="compiled/bin/linux/wv"/>
 
-			<if>
-			  <bool>
-			    <and>
+			<if><bool><and>
 				<not><equals arg1="${branch.path}" arg2="trunk"/></not>
 				<not><equals arg1="${branch.path}" arg2="tags/stable"/></not>
 				<isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/>
-			    </and>
-			  </bool>
-
-			  <exec executable="svn">
-			    <arg value="export"/>
-			    <arg value="${svn.root}/main/${branch.path}/binaries/linux/imagemagick"/>
-			    <arg value="compiled/bin/linux/imagemagick"/>
-			  </exec>
-
-			  <exec executable="svn">
-			    <arg value="export"/>
-			    <arg value="${svn.root}/main/${branch.path}/binaries/linux/wv"/>
-			    <arg value="compiled/bin/linux/wv"/>
-			  </exec>
-
-			  <else>
-			    <exec executable="svn">
-			      <arg value="export"/>
-			      <arg value="${svn.root}/main/trunk/binaries/linux/imagemagick"/>
-			      <arg value="compiled/bin/linux/imagemagick"/>
-			    </exec>
-
-			    <exec executable="svn">
-			      <arg value="export"/>
-			      <arg value="${svn.root}/main/trunk/binaries/linux/wv"/>
-			      <arg value="compiled/bin/linux/wv"/>
-			    </exec>
-			  </else>
+			</and></bool>
+
+				<exec executable="svn">
+					<arg value="export"/>
+					<arg value="${svn.root}/main/${branch.path}/binaries/linux/imagemagick"/>
+					<arg value="compiled/bin/linux/imagemagick"/>
+				</exec>
+
+				<exec executable="svn">
+					<arg value="export"/>
+					<arg value="${svn.root}/main/${branch.path}/binaries/linux/wv"/>
+					<arg value="compiled/bin/linux/wv"/>
+				</exec>
+
+				<else>
+					<exec executable="svn">
+						<arg value="export"/>
+						<arg value="${svn.root}/main/trunk/binaries/linux/imagemagick"/>
+						<arg value="compiled/bin/linux/imagemagick"/>
+					</exec>
+
+					<exec executable="svn">
+						<arg value="export"/>
+						<arg value="${svn.root}/main/trunk/binaries/linux/wv"/>
+						<arg value="compiled/bin/linux/wv"/>
+					</exec>
+				</else>
 			</if>
 
@@ -363,38 +366,35 @@
 			<delete dir="compiled/bin/darwin/ghostscript"/>
 
-			<if>
-			  <bool>
-			    <and>
+			<if><bool><and>
 				<not><equals arg1="${branch.path}" arg2="trunk"/></not>
 				<not><equals arg1="${branch.path}" arg2="tags/stable"/></not>
 				<isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/>
-			    </and>
-			  </bool>
-
-			  <exec executable="svn">
-			    <arg value="export"/>
-			    <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/imagemagick"/>
-			    <arg value="compiled/bin/darwin/imagemagick"/>
-			  </exec>
+			</and></bool>
+
+				<exec executable="svn">
+					<arg value="export"/>
+					<arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/imagemagick"/>
+					<arg value="compiled/bin/darwin/imagemagick"/>
+				</exec>
 			  
-			  <exec executable="svn">
-			    <arg value="export"/>
-			    <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/ghostscript"/>
-			    <arg value="compiled/bin/darwin/ghostscript"/>
-			  </exec>
-
-			  <else>			    
-			    <exec executable="svn">
-			      <arg value="export"/>
-			      <arg value="${svn.root}/main/trunk/binaries/mac/intel/imagemagick"/>
-			      <arg value="compiled/bin/darwin/imagemagick"/>
-			    </exec>
+				<exec executable="svn">
+					<arg value="export"/>
+					<arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/ghostscript"/>
+					<arg value="compiled/bin/darwin/ghostscript"/>
+				</exec>
+
+				<else>			    
+					<exec executable="svn">
+						<arg value="export"/>
+						<arg value="${svn.root}/main/trunk/binaries/mac/intel/imagemagick"/>
+						<arg value="compiled/bin/darwin/imagemagick"/>
+					</exec>
 			    
-			    <exec executable="svn">
-			      <arg value="export"/>
-			      <arg value="${svn.root}/main/trunk/binaries/mac/intel/ghostscript"/>
-			      <arg value="compiled/bin/darwin/ghostscript"/>
-			    </exec>
-			  </else>
+					<exec executable="svn">
+						<arg value="export"/>
+						<arg value="${svn.root}/main/trunk/binaries/mac/intel/ghostscript"/>
+						<arg value="compiled/bin/darwin/ghostscript"/>
+					</exec>
+				</else>
 			</if>
 
@@ -418,19 +418,16 @@
 			<get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>
 
-			<if>
-			  <bool>
-			    <and>
+			<if><bool><and>
 				<not><equals arg1="${branch.path}" arg2="trunk"/></not>
+				<not><equals arg1="${branch.path}" arg2="tags/stable"/></not>
 				<isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/>
-			    </and>
-			  </bool>
-			  
-			  <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
-			  <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
-
-			  <else>
-			    <get src="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
-			    <get src="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
-			  </else>
+			</and></bool>
+				<get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
+				<get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
+
+				<else>
+					<get src="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
+					<get src="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
+				</else>
 			</if>
 		</if>
