Menu
▾
▴
[WiX-commits] wix3.5/src/wix/Data messages.xml, 1.6, 1.7 tables.xml, 1.4, 1.5
|
From: Rob M. <ro...@us...> - 2010-01-29 11:40:37
|
Update of /cvsroot/wix/wix3.5/src/wix/Data In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18774/src/wix/Data Modified Files: messages.xml tables.xml Log Message: JaredR: Added UX/Payload/PayloadGroup to Bundle language schema. Added Parsing for Payload/PayloadGroup(Ref) to Compiler. Added flattening of UX payloads to Linker. Added binding of UX payloads into output in Binder Added "just enough" of burnexe into Binder to start generation of bundle output (stub exe with attached UX container). JaredR: Created BurnWriter to replace SectionWriter and handle PE re-writing in safe code. Modified Binder to use BurnWriter for creating Bundles. Removed SectionWriter. Removed "Allow unsafe code" from Wix.csproj JaredR: Changed Bundle to require one UX element. Added simple Chain/MsiPackage/ExePackage to Bundle language schema. Updated Binder bundle code to generate chain/package information in Burn manifest and ParameterInfo to create a basic chainer. APaloma: Changed heat to use the new MSBuild API when harvesting VS 2010 projects. Fixed WiX projects being detected as non-MSBuildable in VS 2010. Fixed discrepancies between what projects were referenced in the new generated file and which ones heat actually generated authoring for. Fixed problems with missing or wrong project information being defined in project reference variables for VS 2010. Fixed build action not being changable on the property grid in VS 2010. Fixed heat generating Directory/@Name attributes containing "..". JaredR: Changed Bundle Chain to require one package element, and updated a failing unit test to include the now-required element. Refactored Binder.ChainPackageInfo.PackageType to Compiler.ChainPackageType so that hard-coded in order to remove some hard-coded strings. Changed Payload and *Package ID generation to use deterministic CompilerCore.GenerateIdentifier() method. Added end-to-end support for Variables in Bundles. CAraman: fixes for /W4 and static analysis APaloma: Added ability for heat to harvest projects to PayloadGroups. Added better error messages for when heat is unable to build targets in an MSBuild project when harvesting projects. Fixed heat generating Ids with invalid characters when project names contain characters that aren't valid for identifiers. APaloma: Added enforcing of valid identifer characters on ComponentGroup and ComponentGroupRef. MikeHo: Fix issue with DoesShareExist code, fix static analysis errors in IIS7 CAs APaloma: Added property for project references in Votive to completely disable automatic harvesting for a reference. APaloma: SFBUG:2940161 - Fixed heat generating ComponentGroups with duplicate Ids when using the -cg switch. MiCarls: Fix some issues found by static analysis MiCarls: Fix a scenario related to website locators, broken from previous fix RobMen: introduce buxutil.lib, Burn User Experience Utility library. Index: tables.xml =================================================================== RCS file: /cvsroot/wix/wix3.5/src/wix/Data/tables.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tables.xml 22 Jan 2010 10:05:13 -0000 1.4 --- tables.xml 29 Jan 2010 11:40:29 -0000 1.5 *************** *** 1559,1578 **** <columnDefinition name="Attributes" type="number" length="4"/> </tableDefinition> - <tableDefinition name="UX" unreal="yes"> - <columnDefinition name="Name" type="object" length="0" nullable="yes"/> - <columnDefinition name="SourceFile" type="object" length="0"/> - </tableDefinition> <tableDefinition name="Container" createSymbols="yes" unreal="yes"> <columnDefinition name="Container" type="string" length="0" category="identifier" primaryKey="yes"/> <columnDefinition name="Name" type="string" length="0"/> </tableDefinition> <tableDefinition name="Payload" createSymbols="yes" unreal="yes"> <columnDefinition name="Payload" type="string" length="0" category="identifier" primaryKey="yes"/> - <columnDefinition name="Container_" type="string" length="0" nullable="yes" - keyTable="Container" keyColumn="1" - description="Reference to the container for this payload. Well-known identifiers: 'WixUXContainer' represents UX container, 'WixAttachedContainer' is the attached container."/> <columnDefinition name="Name" type="string" length="0" nullable="yes"/> <columnDefinition name="SourceFile" type="object" length="0"/> </tableDefinition> <tableDefinition name="WixLayoutDirectory" createSymbols="yes" unreal="yes"> <columnDefinition name="Id" type="string" length="72" category="identifier" primaryKey="yes"/> --- 1559,1588 ---- <columnDefinition name="Attributes" type="number" length="4"/> </tableDefinition> <tableDefinition name="Container" createSymbols="yes" unreal="yes"> <columnDefinition name="Container" type="string" length="0" category="identifier" primaryKey="yes"/> <columnDefinition name="Name" type="string" length="0"/> </tableDefinition> + <tableDefinition name="PayloadGroup" createSymbols="yes" unreal="yes"> + <columnDefinition name="PayloadGroup" type="string" length="0" category="identifier" primaryKey="yes"/> + </tableDefinition> <tableDefinition name="Payload" createSymbols="yes" unreal="yes"> <columnDefinition name="Payload" type="string" length="0" category="identifier" primaryKey="yes"/> <columnDefinition name="Name" type="string" length="0" nullable="yes"/> <columnDefinition name="SourceFile" type="object" length="0"/> </tableDefinition> + <tableDefinition name="ChainPackage" createSymbols="yes" unreal="yes"> + <columnDefinition name="ChainPackage" type="string" length="0" category="identifier" primaryKey="yes"/> + <columnDefinition name="PackageType" type="string" length="0" /> + <columnDefinition name="Name" type="string" length="0" nullable="yes"/> + <columnDefinition name="SourceFile" type="object" length="0"/> + <columnDefinition name="InstallCommand" type="string" length="0" nullable="yes"/> + <columnDefinition name="RepairCommand" type="string" length="0" nullable="yes"/> + <columnDefinition name="UninstallCommand" type="string" length="0" nullable="yes"/> + </tableDefinition> + <tableDefinition name="Variable" createSymbols="yes" unreal="yes"> + <columnDefinition name="Variable" type="string" length="0" category="identifier" primaryKey="yes" /> + <columnDefinition name="Value" type="string" length="0" /> + <columnDefinition name="Type" type="string" length="0" nullable="yes" /> + </tableDefinition> <tableDefinition name="WixLayoutDirectory" createSymbols="yes" unreal="yes"> <columnDefinition name="Id" type="string" length="72" category="identifier" primaryKey="yes"/> Index: messages.xml =================================================================== RCS file: /cvsroot/wix/wix3.5/src/wix/Data/messages.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** messages.xml 22 Jan 2010 10:05:13 -0000 1.6 --- messages.xml 29 Jan 2010 11:40:28 -0000 1.7 *************** *** 754,757 **** --- 754,778 ---- <Parameter Type="System.String" Name="childName" /> </Instance> + <Instance> + A {0} element must have at least one child element of type {1} or {2}. + <Parameter Type="System.String" Name="elementName" /> + <Parameter Type="System.String" Name="childName1" /> + <Parameter Type="System.String" Name="childName2" /> + </Instance> + <Instance> + A {0} element must have at least one child element of type {1}, {2}, or {3}. + <Parameter Type="System.String" Name="elementName" /> + <Parameter Type="System.String" Name="childName1" /> + <Parameter Type="System.String" Name="childName2" /> + <Parameter Type="System.String" Name="childName3" /> + </Instance> + <Instance> + A {0} element must have at least one child element of type {1}, {2}, {3}, or {4}. + <Parameter Type="System.String" Name="elementName" /> + <Parameter Type="System.String" Name="childName1" /> + <Parameter Type="System.String" Name="childName2" /> + <Parameter Type="System.String" Name="childName3" /> + <Parameter Type="System.String" Name="childName4" /> + </Instance> </Message> <Message Id="RegistryRootInvalid" Number="64"> *************** *** 2542,2545 **** --- 2563,2599 ---- </Instance> </Message> + <Message Id="InvalidStubExe" Number="338" SourceLineNumbers="no"> + <Instance> + Stub executable '{0}' is not a valid Win32 executable. + <Parameter Type="System.String" Name="filename" /> + </Instance> + </Message> + <Message Id="StubMissingWixburnSection" Number="339" SourceLineNumbers="no"> + <Instance> + Stub executable '{0}' does not contain a .wixburn data section. + <Parameter Type="System.String" Name="filename" /> + </Instance> + </Message> + <Message Id="StubWixburnSectionTooSmall" Number="340" SourceLineNumbers="no"> + <Instance> + Stub executable '{0}' .wixburn data section is too small to store the Burn container header. + <Parameter Type="System.String" Name="filename" /> + </Instance> + </Message> + <Message Id="MissingBundleInformation" Number="341" SourceLineNumbers="no"> + <Instance> + The Bundle is missing '{0}' data, and cannot continue. + <Parameter Type="System.String" Name="data" /> + </Instance> + </Message> + <Message Id="UnexpectedGroupChild" Number="342" SourceLineNumbers="no"> + <Instance> + A group parent ('{0}'/'{1}') had an unexpected child ('{2}'/'{3}'). + <Parameter Type="System.String" Name="parentType" /> + <Parameter Type="System.String" Name="parentId" /> + <Parameter Type="System.String" Name="childType" /> + <Parameter Type="System.String" Name="childId" /> + </Instance> + </Message> </Class> <Class Name="WixWarnings" ContainerName="WixWarningEventArgs" BaseContainerName="MessageEventArgs" Level="Warning"> *************** *** 3339,3342 **** --- 3393,3442 ---- </Instance> </Message> + <Message Id="GeneratingBundle" Number="9023" SourceLineNumbers="no"> + <Instance> + Generating Burn bundle '{0}' from stub '{1}'. + <Parameter Type="System.String" Name="bundleFile" /> + <Parameter Type="System.String" Name="stubFile" /> + </Instance> + </Message> + <Message Id="ResolvingManifest" Number="9024" SourceLineNumbers="no"> + <Instance> + Generating resolved manifest '{0}'. + <Parameter Type="System.String" Name="manifestFile" /> + </Instance> + </Message> + <Message Id="LoadingPayload" Number="9025" SourceLineNumbers="no"> + <Instance> + Loading payload '{0}' into container. + <Parameter Type="System.String" Name="payload" /> + </Instance> + </Message> + <Message Id="BundleGuid" Number="9026" SourceLineNumbers="no"> + <Instance> + Assigning bundle GUID '{0}'. + <Parameter Type="System.String" Name="bundleGuid" /> + </Instance> + </Message> + <Message Id="CopyingExternalPayload" Number="9027" SourceLineNumbers="no"> + <Instance> + Copying external payload from '{0}' to '{1}'. + <Parameter Type="System.String" Name="payload" /> + <Parameter Type="System.String" Name="outputDirectory" /> + </Instance> + </Message> + <Message Id="EmbeddingContainer" Number="9028" SourceLineNumbers="no"> + <Instance> + Embedding container '{0}' ({1} bytes) with '{2}' compression. + <Parameter Type="System.String" Name="container" /> + <Parameter Type="System.Int64" Name="size" /> + <Parameter Type="System.String" Name="compression" /> + </Instance> + </Message> + <Message Id="SwitchingToPerUserPackage" Number="9029" SourceLineNumbers="no"> + <Instance> + Bundle switching from per-machine to per-user due to addition of per-user package: '{0}'. + <Parameter Type="System.String" Name="path" /> + </Instance> + </Message> </Class> </Messages> |