[WiX-commits] wix directories.include, 1.9, 1.10 history.txt, 1.46, 1.47 wix.build, 1.19, 1.20

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

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

Modified Files:
	directories.include history.txt wix.build 
Log Message:
AaronSte: Creating separate Votive and Sconce DLLs for VS 2005 and VS 2008.
          Adding the VS 2008 SDK source code that is needed to build the VS
          2008 Votive and Sconce dlls.

HeathS: SFBUG:1789825 - CreationTimeUTC documents wrong format
        SFFEATURE:1768845 - Patch element should support MinorUpdateTargetRTM
        attribute
        SFFEATURE:1735295 - Patch build should add PATCHNEW* properties to
        patch transform
        Added support for ignorables to CompareUnit in WixUnit

HeathS: SFBUG:1768842 - PatchProperty does not allow Company

RobMen: Ensure RegistryKey element never ends up as KeyPath because MSI SDK
        says it isn't allowed.

RobMen: Component guid generation.

RobMen: SFBUG:1795309 - respect the rollback flag for the last SQL string like
                        all the other strings.

RobMen: SFBUG:1787888 - correctly handle certificates that are in Components
                        that are conditioned out.

RobMen: SFBUG:1675194 - loop through all server bindings when searching for a
                        match.

Index: history.txt
===================================================================
RCS file: /cvsroot/wix/wix/history.txt,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** history.txt	3 Sep 2007 21:53:26 -0000	1.46
--- history.txt	21 Sep 2007 07:58:33 -0000	1.47
***************
*** 1844,1845 ****
--- 1844,1872 ----
  
  RobMen: Support new MSI 4.5 Embedded UI/Chainer tables.
+ 
+ AaronSte: Creating separate Votive and Sconce DLLs for VS 2005 and VS 2008.
+           Adding the VS 2008 SDK source code that is needed to build the VS
+           2008 Votive and Sconce dlls.
+ 
+ HeathS: SFBUG:1789825 - CreationTimeUTC documents wrong format
+         SFFEATURE:1768845 - Patch element should support MinorUpdateTargetRTM
+         attribute
+         SFFEATURE:1735295 - Patch build should add PATCHNEW* properties to 
+         patch transform
+         Added support for ignorables to CompareUnit in WixUnit
+ 
+ HeathS: SFBUG:1768842 - PatchProperty does not allow Company
+ 
+ RobMen: Ensure RegistryKey element never ends up as KeyPath because MSI SDK
+         says it isn't allowed.
+ 
+ RobMen: Component guid generation.
+ 
+ RobMen: SFBUG:1795309 - respect the rollback flag for the last SQL string like
+                         all the other strings.
+ 
+ RobMen: SFBUG:1787888 - correctly handle certificates that are in Components
+                         that are conditioned out.
+ 
+ RobMen: SFBUG:1675194 - loop through all server bindings when searching for a
+                         match.

Index: wix.build
===================================================================
RCS file: /cvsroot/wix/wix/wix.build,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wix.build	10 Aug 2007 09:58:33 -0000	1.19
--- wix.build	21 Sep 2007 07:58:33 -0000	1.20
***************
*** 68,72 ****
    <include buildfile="${dir.src.smoke}\smoke.build" />
    <include buildfile="${dir.src.torch}\torch.build" />
!   <include buildfile="${dir.src.votive}\votive.build" />
    <include buildfile="${dir.src.wcautil}\wcautil.build" />
    <include buildfile="${dir.wixroot.src}\wconsole\wconsole.build" />
--- 68,73 ----
    <include buildfile="${dir.src.smoke}\smoke.build" />
    <include buildfile="${dir.src.torch}\torch.build" />
!   <include buildfile="${dir.src.votive}\votive2005.build" />
!   <include buildfile="${dir.src.votive}\votive2008.build" />
    <include buildfile="${dir.src.wcautil}\wcautil.build" />
    <include buildfile="${dir.wixroot.src}\wconsole\wconsole.build" />
***************
*** 111,115 ****
                     toolsrc.clean,
                     torch.clean,
!                    votive.clean,
                     wcautil.clean,
                     wconsole.clean,
--- 112,117 ----
                     toolsrc.clean,
                     torch.clean,
!                    votive2005.clean,
!                    votive2008.clean,
                     wcautil.clean,
                     wconsole.clean,
***************
*** 147,151 ****
                     toolsrc,
                     torch,
!                    votive,
                     wcautil,
                     wconsole,
--- 149,154 ----
                     toolsrc,
                     torch,
!                    votive2005,
!                    votive2008,
                     wcautil,
                     wconsole,
***************
*** 197,205 ****
    <target name="pyro" depends="wconsole, pyro.inc" />
    <target name="serverca" depends="dutil, nanttasks, wcautil, wixca, serverca.inc" />
!   <target name="setup" depends="ambient, candle, chm, ct, dark, ext, light, lit, melt, nanttasks, pyro, serverca, smoke, toolsrc, torch, votive, wcautil, winterop, wixbuild, wixca, wixdll, wixtasks, wixunit, setup.inc" />
    <target name="smoke" depends="wconsole, smoke.inc" />
    <target name="toolsrc" depends="initbuildenv, wixbuild, toolsrc.inc" />
    <target name="torch" depends="wixdll, torch.inc" />
!   <target name="votive" depends="candle, chm, dark, ext, light, lit, melt, nanttasks, pyro, serverca, toolsrc, torch, wcautil, winterop, wixbuild, wixca, wixdll, wixtasks, votive.inc" />
    <target name="wcautil" depends="wcautil.inc" />
    <target name="wconsole" depends="wixdll, wconsole.inc" />
--- 200,209 ----
    <target name="pyro" depends="wconsole, pyro.inc" />
    <target name="serverca" depends="dutil, nanttasks, wcautil, wixca, serverca.inc" />
!   <target name="setup" depends="ambient, candle, chm, ct, dark, ext, light, lit, melt, nanttasks, pyro, serverca, smoke, toolsrc, torch, votive2005, votive2008, wcautil, winterop, wixbuild, wixca, wixdll, wixtasks, wixunit, setup.inc" />
    <target name="smoke" depends="wconsole, smoke.inc" />
    <target name="toolsrc" depends="initbuildenv, wixbuild, toolsrc.inc" />
    <target name="torch" depends="wixdll, torch.inc" />
!   <target name="votive2005" depends="candle, chm, dark, ext, light, lit, melt, nanttasks, pyro, serverca, toolsrc, torch, wcautil, winterop, wixbuild, wixca, wixdll, wixtasks, votive2005.inc" />
!   <target name="votive2008" depends="candle, chm, dark, ext, light, lit, melt, nanttasks, pyro, serverca, toolsrc, torch, wcautil, winterop, wixbuild, wixca, wixdll, wixtasks, votive2008.inc" />
    <target name="wcautil" depends="wcautil.inc" />
    <target name="wconsole" depends="wixdll, wconsole.inc" />

Index: directories.include
===================================================================
RCS file: /cvsroot/wix/wix/directories.include,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** directories.include	27 Jun 2007 05:35:33 -0000	1.9
--- directories.include	21 Sep 2007 07:58:33 -0000	1.10
***************
*** 27,32 ****
      * HTML Help SDK 1.4 or higher
  
!   To build Sconce and Votive, you must have the following SDKs installed:
      * Visual Studio 2005 SDK September 2006
    -->
  
--- 27,35 ----
      * HTML Help SDK 1.4 or higher
  
!   To build VS 2005 versions of Sconce and Votive, you must have the following SDKs installed:
      * Visual Studio 2005 SDK September 2006
+ 
+   To build VS 2008 versions of Sconce and Votive, you must have the following SDKs installed:
+     * Visual Studio 2008 SDK August 2007 CTP
    -->
  
***************
*** 83,96 ****
    </if>
  
!   <readregistry property="dir.vsip" key="SOFTWARE\Microsoft\VisualStudio\VSIP\8.0.60912\InstallDir" hive="LocalMachine" failonerror="false" />
!   <property name="vsip.installed" value="${property::exists('dir.vsip') and directory::exists(dir.vsip)}" readonly="true" />
!   <if test="${not vsip.installed}">
!     <echo level="Warning" message="Visual Studio 2005 SDK September 2006 not detected; Sconce and Votive will not be built." />
    </if>
  
    <echo level="Verbose" message="PlatformSDK directory (dir.platformsdk) = ${dir.platformsdk}" />
    <echo level="Verbose" message="VC8 directory (dir.vc8) = ${dir.vc8}" />
!   <if test="${property::exists('dir.vsip')}">
!     <echo level="Verbose" message="VSIP SDK 2003 directory (dir.vsip) = ${dir.vsip}" />
    </if>
    <echo level="Verbose" message=".NET Framework 1.1 SDK directory (dir.netfxsdk1.1) = ${dir.netfxsdk1.1}" />
--- 86,108 ----
    </if>
  
!   <readregistry property="dir.vsip2005" key="SOFTWARE\Microsoft\VisualStudio\VSIP\8.0.60912\InstallDir" hive="LocalMachine" failonerror="false" />
!   <property name="vsip2005.installed" value="${property::exists('dir.vsip2005') and directory::exists(dir.vsip2005)}" readonly="true" />
!   <if test="${not vsip2005.installed}">
!     <echo level="Warning" message="Visual Studio 2005 SDK September 2006 not detected; VS 2005 versions of Sconce and Votive will not be built." />
!   </if>
! 
!   <readregistry property="dir.vsip2008" key="SOFTWARE\Microsoft\VisualStudio\VSIP\9.0\InstallDir" hive="LocalMachine" failonerror="false" />
!   <property name="vsip2008.installed" value="${property::exists('dir.vsip2008') and directory::exists(dir.vsip2008)}" readonly="true" />
!   <if test="${not vsip2008.installed}">
!     <echo level="Warning" message="Visual Studio 2008 SDK not detected; VS 2008 versions of Sconce and Votive will not be built." />
    </if>
  
    <echo level="Verbose" message="PlatformSDK directory (dir.platformsdk) = ${dir.platformsdk}" />
    <echo level="Verbose" message="VC8 directory (dir.vc8) = ${dir.vc8}" />
!   <if test="${property::exists('dir.vsip2005')}">
!     <echo level="Verbose" message="VS SDK 2005 directory (dir.vsip2005) = ${dir.vsip2005}" />
!   </if>
!   <if test="${property::exists('dir.vsip2008')}">
!     <echo level="Verbose" message="VS SDK 2008 directory (dir.vsip2008) = ${dir.vsip2008}" />
    </if>
    <echo level="Verbose" message=".NET Framework 1.1 SDK directory (dir.netfxsdk1.1) = ${dir.netfxsdk1.1}" />
***************
*** 133,145 ****
    <property name="dir.target.dutil" value="${dir.target.project}" readonly="true" />
    
!   <!-- Directories related to VSIP -->
!   <if test="${vsip.installed}">
!     <property name="dir.vsip.lib.x86" value="${path::combine(dir.vsip, 'VisualStudioIntegration\Common\Lib\x86')}" readonly="true" if="${property::exists('dir.vsip')}" />
      <if test="${x86}">
!         <property name="dir.vsip.lib" value="${dir.vsip.lib.x86}" readonly="true" if="${property::exists('dir.vsip')}" />
      </if>
!     <property name="dir.vsip.inc" value="${path::combine(dir.vsip, 'VisualStudioIntegration\Common\Inc')}" readonly="true" if="${property::exists('dir.vsip')}" />
      <!-- The path to the Visual Studio interop assemblies -->
!     <property name="dir.vsip.interopassemblies" value="${path::combine(dir.vsip, 'VisualStudioIntegration\Common\Assemblies')}" readonly="true" if="${property::exists('dir.vsip')}" />
    </if>
    
--- 145,168 ----
    <property name="dir.target.dutil" value="${dir.target.project}" readonly="true" />
    
!   <!-- Directories related to VS 2005 SDK -->
!   <if test="${vsip2005.installed}">
!     <property name="dir.vsip2005.lib.x86" value="${path::combine(dir.vsip2005, 'VisualStudioIntegration\Common\Lib\x86')}" readonly="true" if="${property::exists('dir.vsip2005')}" />
      <if test="${x86}">
!         <property name="dir.vsip2005.lib" value="${dir.vsip2005.lib.x86}" readonly="true" if="${property::exists('dir.vsip2005')}" />
      </if>
!     <property name="dir.vsip2005.inc" value="${path::combine(dir.vsip2005, 'VisualStudioIntegration\Common\Inc')}" readonly="true" if="${property::exists('dir.vsip2005')}" />
      <!-- The path to the Visual Studio interop assemblies -->
!     <property name="dir.vsip2005.interopassemblies" value="${path::combine(dir.vsip2005, 'VisualStudioIntegration\Common\Assemblies')}" readonly="true" if="${property::exists('dir.vsip2005')}" />
!   </if>
! 
!   <!-- Directories related to VS 2008 SDK -->
!   <if test="${vsip2008.installed}">
!     <property name="dir.vsip2008.lib.x86" value="${path::combine(dir.vsip2008, 'VisualStudioIntegration\Common\Lib\x86')}" readonly="true" if="${property::exists('dir.vsip2008')}" />
!     <if test="${x86}">
!         <property name="dir.vsip2008.lib" value="${dir.vsip2008.lib.x86}" readonly="true" if="${property::exists('dir.vsip2008')}" />
!     </if>
!     <property name="dir.vsip2008.inc" value="${path::combine(dir.vsip2008, 'VisualStudioIntegration\Common\Inc')}" readonly="true" if="${property::exists('dir.vsip2008')}" />
!     <!-- The path to the Visual Studio interop assemblies -->
!     <property name="dir.vsip2008.interopassemblies" value="${path::combine(dir.vsip2008, 'VisualStudioIntegration\Common\Assemblies')}" readonly="true" if="${property::exists('dir.vsip2008')}" />
    </if>