[WiX-commits] wix/src/votive votive.build,1.7,1.8

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

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

Modified Files:
	votive.build 
Log Message:
DerekC: More strictly parse some Shortcut attribute values.

BobArnso: Added extension .XSDs to binaries .zip

JRock: Fixed a couple of issues with the public builds related to the
       MSBuild stuff and WixTasks. Also fixed a couple of issues on the
       public build when trying to build from a path that has spaces in it.

DerekC: Change the xml namespace URI for WiX 3.0 since the xml schema is now
        different from the xml schema for WiX 2.0.

ScotK: Fixing crash in ConfigureIIs when it runs into a malformed WebSite in 
       the metabase.

DerekC: - SFBUG:1445483 - No support for Long Filenames in COM Registry entries
        - Fix several issues related to COM registration elements
        - Properly parse more identifier attribute values
        - Move the creation of simple references closer to the places in the
          compiler code where the attribute's value is parsed
        - Change the PerfCounter element to use the formatted string for long
          file names to reflect the fact that the short file name format of
          [!FileId] actually resolves to long file names outside of the Registry
          table


Index: votive.build
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/votive.build,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** votive.build	12 May 2006 23:23:00 -0000	1.7
--- votive.build	19 Jul 2006 05:54:30 -0000	1.8
***************
*** 143,162 ****
          files that we need to a subdirectory which we can then reference without spaces.
        -->
!       <property name="votive.vsipinctemp" value="VSIP_INC_TEMP" readonly="true" />
!       <property name="votive.dir.vsipinctemp" value="${path::get-directory-name(votive.file.ctc.source)}\${votive.vsipinctemp}" readonly="true" />
!       <copy todir="${votive.dir.vsipinctemp}">
!         <fileset basedir="${dir.vsip.inc}">
!           <include name="**" />
!         </fileset>
!       </copy>
!       <exec program="${tool.ctc}" workingdir="${path::get-directory-name(votive.file.ctc.source)}" unless="${file::up-to-date(votive.file.ctc.source, votive.file.cto.target)}">
!         <arg value="-nologo" />
!         <arg path="${votive.file.ctc.source}" />
!         <arg path="${votive.file.cto.target}" />
!         <arg value="-Ccl" />
!         <arg value="-I${votive.vsipinctemp}" />
!         <arg value="-I${votive.vsipinctemp}\office10" />
!       </exec>
!       <delete dir="${votive.dir.vsipinctemp}" includeemptydirs="true" />
  
        <!-- Compile the votiveui.rc file -->
--- 143,164 ----
          files that we need to a subdirectory which we can then reference without spaces.
        -->
!       <if test="${not file::up-to-date(votive.file.ctc.source, votive.file.cto.target)}">
!         <property name="votive.vsipinctemp" value="VSIP_INC_TEMP" readonly="true" />
!         <property name="votive.dir.vsipinctemp" value="${path::get-directory-name(votive.file.ctc.source)}\${votive.vsipinctemp}" readonly="true" />
!         <copy todir="${votive.dir.vsipinctemp}">
!           <fileset basedir="${dir.vsip.inc}">
!             <include name="**" />
!           </fileset>
!         </copy>
!         <exec program="${tool.ctc}" workingdir="${path::get-directory-name(votive.file.ctc.source)}">
!           <arg value="-nologo" />
!           <arg path="${votive.file.ctc.source}" />
!           <arg path="${votive.file.cto.target}" />
!           <arg value="-Ccl" />
!           <arg value="-I${votive.vsipinctemp}" />
!           <arg value="-I${votive.vsipinctemp}\office10" />
!         </exec>
!         <delete dir="${votive.dir.vsipinctemp}" includeemptydirs="true" />
!       </if>
  
        <!-- Compile the votiveui.rc file -->