* xbuild/Microsoft.Common.targets (PostBuildEvent): If

$(RunPostBuildEvent) is empty, treat it as OnBuildSuccess.
Simplify condition.

svn path=/trunk/mcs/; revision=146947

diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog
index a54c7a2a713394460c39035df6431b71c6f9da7a..678a6b55fc956359eff9373971a743b9fc61f106 100644 (file)
--- a/mcs/tools/xbuild/ChangeLog
+++ b/mcs/tools/xbuild/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-26  Ankit Jain  <jankit@novell.com>
+
+       * xbuild/Microsoft.Common.targets (PostBuildEvent): If
+       $(RunPostBuildEvent) is empty, treat it as OnBuildSuccess.
+       Simplify condition.
+
 2009-11-25  Ankit Jain  <jankit@novell.com>
 
        * xbuild/Microsoft.Common.targets: Emit list of files written

diff --git a/mcs/tools/xbuild/xbuild/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
index 94c1315d41ef8aafcf72d0ac44bc780cfca66bea..0fc3faed53f46e0c23f5f03e5f7e0d4eb81ea7a1 100644 (file)
--- a/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
@@ -557,13 +557,12 @@
 
        <!-- this gets invoked in two cases, from CoreBuildDependsOn, if the build completes
             successfully, OR from OnError in CoreBuild, if the build failed and $(RunPostBuildEvent)
-            is 'Always' or 'OnOutputUpdated' -->
+            is 'Always' or 'OnOutputUpdated'. Invoke $(PostBuildEvent) if its either Empty (== OnBuildSuccess)
+            or OnBuildSuccess or Always OR (OnOutputUpdated and output assembly got updated) -->
        <Target Name="PostBuildEvent"
                Condition="'$(PostBuildEvent)' != '' and
-                       ('$(RunPostBuildEvent)' == 'Always' or '$(RunPostBuildEvent)' == 'OnBuildSuccess' or
-                         ('$(RunPostBuildEvent)' == 'OnOutputUpdated' and
-                           '$(_AssemblyModifiedTimeBeforeCompile)' != '$(_AssemblyModifiedTimeAfterCompile)')
-                       )"
+                       ('$(RunPostBuildEvent)' != 'OnOutputUpdated' or
+                         '$(_AssemblyModifiedTimeBeforeCompile)' != '$(_AssemblyModifiedTimeAfterCompile)')"
                DependsOnTargets="$(PostBuildEventDependsOn)">
 
                <Exec WorkingDirectory="$(OutDir)" Command="$(PostBuildEvent)" />