From: Marko Grönroos <magi@iki.fi>
Date: Wed, 28 Oct 2009 14:55:21 +0000 (+0000)
Subject: Merged [9354] from 6.1 to 6.2: Do not calculate differences to previous release as... 
X-Git-Tag: 6.7.0.beta1~2367
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8948f74389f84fd43bdd83ac3e2ff6e4a59960f6;p=vaadin-framework.git

Merged [9354] from 6.1 to 6.2: Do not calculate differences to previous release as a target, but automatically after building Linux package, if build.differences property is defined.

svn changeset:9433/svn branch:6.2
---

diff --git a/build/build.xml b/build/build.xml
index 50aed8b059..e74c43ddfa 100644
--- 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>