[WiX-commits] wix WixBuild.Common.targets, 1.13, 1.14 directories.include, 1.12, 1.13 history.txt, 1.66, 1.67 make.bat, 1.14, 1.15 wix.build, 1.27, 1.28

[Rob M. <ro...@us...>]

Update of /cvsroot/wix/wix
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17775

Modified Files:
	WixBuild.Common.targets directories.include history.txt 
	make.bat wix.build 
Log Message:
WixBuild: Version 3.0.4422.0


MiCarls: SFBug:1848752 - NativeImage CA detects GAC'd assemblies incorrectly
         Also fix a regression that occured in the bugfix for SFBug:1848762

RobMen: SFBUG:1591591 - don't fail when there is no data for
        ScaWebSvcExtCommit().

BobArnso: Expose MSBuild /verbosity switch from make.bat and wix.build

EricStJ: Allow CloseApps to send close messages to apps with multiple top-most
         windows.

a-DaMans: SFBUG:2041989 - Candle exception when inculding an invalid wxi file.

BobArnso: Integrate fix for sfbug:2010047

RobMen: SFBUG:1741663 - don't always fail products with AppPools on XP.

BobArnso: Fix sfbug:2077095 [Firewall Extension fails] by adding
    abort/retry/ignore dialog like WixIIsExtension.

AaronSte: Add WixExitEarlyWithSuccess custom action to provide an option to
          exit early in major upgrade out of order installs but not fail the
          install process.

AaronSte: Adding VS 2008 SP1 detection properties to WixVSExtension.

CandyC: CHM Updates.

Index: history.txt
===================================================================
RCS file: /cvsroot/wix/wix/history.txt,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** history.txt	22 Aug 2008 09:41:59 -0000	1.66
--- history.txt	29 Aug 2008 09:52:43 -0000	1.67
***************
*** 3151,3153 ****
           ERROR_INSTALL_USEREXIT appropriately
  
! a-DaMans: SFUBG:2041989 - Candle exception when inculding an invalid wxi file.
\ No newline at end of file
--- 3151,3182 ----
           ERROR_INSTALL_USEREXIT appropriately
  
! WixBuild: Version 3.0.4422.0
! 
! 
! MiCarls: SFBug:1848752 - NativeImage CA detects GAC'd assemblies incorrectly
!          Also fix a regression that occured in the bugfix for SFBug:1848762
! 
! RobMen: SFBUG:1591591 - don't fail when there is no data for
!         ScaWebSvcExtCommit().
! 
! BobArnso: Expose MSBuild /verbosity switch from make.bat and wix.build
! 
! EricStJ: Allow CloseApps to send close messages to apps with multiple top-most
!          windows.
! 
! a-DaMans: SFBUG:2041989 - Candle exception when inculding an invalid wxi file.
! 
! BobArnso: Integrate fix for sfbug:2010047
! 
! RobMen: SFBUG:1741663 - don't always fail products with AppPools on XP.
! 
! BobArnso: Fix sfbug:2077095 [Firewall Extension fails] by adding 
!     abort/retry/ignore dialog like WixIIsExtension.
! 
! AaronSte: Add WixExitEarlyWithSuccess custom action to provide an option to
!           exit early in major upgrade out of order installs but not fail the
!           install process.
! 
! AaronSte: Adding VS 2008 SP1 detection properties to WixVSExtension.
! 
! CandyC: CHM Updates.

Index: WixBuild.Common.targets
===================================================================
RCS file: /cvsroot/wix/wix/WixBuild.Common.targets,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** WixBuild.Common.targets	25 Jul 2008 08:04:22 -0000	1.13
--- WixBuild.Common.targets	29 Aug 2008 09:52:43 -0000	1.14
***************
*** 190,194 ****
        <Output TaskParameter="Value" PropertyName="PlatformSdkBinPath"/>
      </CreateProperty>
!     <Message Text="PlatformSdkIncludePath=$(PlatformSdkIncludePath)" />
      <Error
        Condition=" '$(PlatformSdkIncludePath)' == '' or !Exists('$(PlatformSdkIncludePath)') or '$(PlatformSdkBinPath)' == '' or !Exists('$(PlatformSdkBinPath)')"
--- 190,194 ----
        <Output TaskParameter="Value" PropertyName="PlatformSdkBinPath"/>
      </CreateProperty>
!     <Message Importance="low" Text="PlatformSdkIncludePath=$(PlatformSdkIncludePath)" />
      <Error
        Condition=" '$(PlatformSdkIncludePath)' == '' or !Exists('$(PlatformSdkIncludePath)') or '$(PlatformSdkBinPath)' == '' or !Exists('$(PlatformSdkBinPath)')"

Index: wix.build
===================================================================
RCS file: /cvsroot/wix/wix/wix.build,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** wix.build	22 Aug 2008 08:17:22 -0000	1.27
--- wix.build	29 Aug 2008 09:52:43 -0000	1.28
***************
*** 155,158 ****
--- 155,159 ----
        <arg value="/property:Configuration=Debug" if="${debug}" />
        <arg value="/property:Configuration=Release" if="${ship}" />
+       <arg value="/verbosity:${msbuildverbosity}" />
        <arg value="/target:TrustMSBuildTargetsFiles" />
        <arg file="${dir.wixroot}\WixBuild.Common.targets" />
***************
*** 185,188 ****
--- 186,190 ----
        <arg value="/property:Configuration=Debug" if="${debug}" />
        <arg value="/property:Configuration=Release" if="${ship}" />
+       <arg value="/verbosity:${msbuildverbosity}" />
        <arg value="/target:Rebuild" />
        <arg file="${dir.src.toolsrc}\Toolsrc.sln" />
***************
*** 213,216 ****
--- 215,219 ----
        <arg value="/property:Configuration=Release" if="${ship}" />
        <arg value="/property:NantPath=&quot;${NantPath}&quot;" />
+       <arg value="/verbosity:${msbuildverbosity}" />
        <arg value="/target:Rebuild" />
        <arg file="${dir.wixroot.src}\core.sln" />
***************
*** 223,226 ****
--- 226,230 ----
        <arg value="/property:Configuration=Release" if="${ship}" />
        <arg value="/property:BuildIA64=${ia64}" />
+       <arg value="/verbosity:${msbuildverbosity}" />
        <arg value="/target:Rebuild" />
        <arg file="${dir.src.exe}\ext.sln" />
***************
*** 233,236 ****
--- 237,241 ----
        <arg value="/property:Configuration=Debug" if="${debug}" />
        <arg value="/property:Configuration=Release" if="${ship}" />
+       <arg value="/verbosity:${msbuildverbosity}" />
        <arg value="/target:Clean" />
        <arg file="${dir.src.toolsrc}\Toolsrc.sln" />
***************
*** 255,258 ****
--- 260,264 ----
        <arg value="/property:Configuration=Debug" if="${debug}" />
        <arg value="/property:Configuration=Release" if="${ship}" />
+       <arg value="/verbosity:${msbuildverbosity}" />
        <arg value="/target:Clean" />
        <arg file="${dir.wixroot.src}\core.sln" />
***************
*** 265,268 ****
--- 271,275 ----
        <arg value="/property:Configuration=Release" if="${ship}" />
        <arg value="/property:BuildIA64=${ia64}" />
+       <arg value="/verbosity:${msbuildverbosity}" />
        <arg value="/target:Clean" />
        <arg file="${dir.src.ext}\ext.sln" />
***************
*** 275,278 ****
--- 282,286 ----
        <arg value="/property:Configuration=Debug" if="${debug}" />
        <arg value="/property:Configuration=Release" if="${ship}" />
+       <arg value="/verbosity:${msbuildverbosity}" />
        <arg value="/target:Build" />
        <arg file="${dir.src.toolsrc}\Toolsrc.sln" />
***************
*** 295,298 ****
--- 303,307 ----
        <arg value="/property:Configuration=Release" if="${ship}" />
        <arg value="/property:NantPath=&quot;${NantPath}&quot;" />
+       <arg value="/verbosity:${msbuildverbosity}" />
        <arg value="/target:Build" />
        <arg file="${dir.wixroot.src}\core.sln" />
***************
*** 305,308 ****
--- 314,318 ----
        <arg value="/property:Configuration=Release" if="${ship}" />
        <arg value="/property:BuildIA64=${ia64}" />
+       <arg value="/verbosity:${msbuildverbosity}" />
        <arg value="/target:Build" />
        <arg file="${dir.src.ext}\ext.sln" />

Index: directories.include
===================================================================
RCS file: /cvsroot/wix/wix/directories.include,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** directories.include	30 May 2008 07:20:39 -0000	1.12
--- directories.include	29 Aug 2008 09:52:43 -0000	1.13
***************
*** 63,66 ****
--- 63,67 ----
  
    <property name="language" value="lang-neutral" overwrite="false" />
+   <property name="msbuildverbosity" value="minimal" overwrite="false" />
  
    <!-- Platform and flavor properties -->

Index: make.bat
===================================================================
RCS file: /cvsroot/wix/wix/make.bat,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** make.bat	30 May 2008 07:20:39 -0000	1.14
--- make.bat	29 Aug 2008 09:52:43 -0000	1.15
***************
*** 39,42 ****
--- 39,43 ----
  set ACTION=
  set VERBOSE=
+ set MSBUILDVERBOSITY=minimal
  
  :ParseArgs
***************
*** 46,50 ****
  if /i "%1"=="-h"      goto Syntax
  if /i "%1"=="-help"   goto Syntax
! if /i "%1"=="-v"      (set VERBOSE=-v)           & shift & goto ParseArgs
  if /i "%1"=="debug"   (set FLAVOR=debug)         & shift & goto ParseArgs
  if /i "%1"=="ship"    (set FLAVOR=ship)          & shift & goto ParseArgs
--- 47,51 ----
  if /i "%1"=="-h"      goto Syntax
  if /i "%1"=="-help"   goto Syntax
! if /i "%1"=="-v"      (set VERBOSE=-v & set MSBUILDVERBOSITY=detailed) & shift & goto ParseArgs
  if /i "%1"=="debug"   (set FLAVOR=debug)         & shift & goto ParseArgs
  if /i "%1"=="ship"    (set FLAVOR=ship)          & shift & goto ParseArgs
***************
*** 59,63 ****
  pushd %WIX_ROOT%
  
! nant.exe -buildfile:"%WIX_ROOT%wix.build" %ACTION% -D:flavor=%FLAVOR% %VERBOSE%
  
  popd
--- 60,64 ----
  pushd %WIX_ROOT%
  
! nant.exe -buildfile:"%WIX_ROOT%wix.build" %ACTION% -D:flavor=%FLAVOR% -D:msbuildverbosity=%MSBUILDVERBOSITY% %VERBOSE%
  
  popd