Merged [9354] from 6.1 to 6.2: Do not calculate differences to previous release as...

svn changeset:9433/svn branch:6.2

diff --git a/build/build.xml b/build/build.xml
index 50aed8b059c3441b201e68c3ee8685af1bad592b..e74c43ddfafdf8d06100ddb6b3b2e1d458c80330 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -313,6 +313,10 @@
                 </patternset>
             </tarfileset>
         </tar>
+
+        <!-- Only the Linux package is currently required for calculating these. -->
+        <!-- Notice that the differences comparison is conditional.              -->
+        <antcall target="differences"/>
     </target>
 
     <target name="internal-package-oophm">
@@ -1260,11 +1264,13 @@
     <!-- Difference to previous release package.                            -->
     <!-- ================================================================== -->
 
-    <target name="differences" depends="init, internal-package-linux">
+    <!-- This should be called after the Linux package is ready. -->
+    <target name="differences" if="build.differences">
         <exec executable="python" searchpath="true" failonerror="true" output="${result-path}/differences-linux.txt">
             <arg value="build/bin/package-diff.py"/>
             <arg value="${version.full}"/>
         </exec>
+
         <echo>##teamcity[publishArtifacts '${result-path}/differences-linux.txt']</echo>
     </target>