Menu
▾
▴
[WiX-commits] wix/src/wix/Data messages.xml,1.23,1.24 tables.xml,1.26,1.27
|
From: Rob M. <ro...@us...> - 2005-12-26 12:06:49
|
Update of /cvsroot/wix/wix/src/wix/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14145/src/wix/Data Modified Files: messages.xml tables.xml Log Message: DerekC: Support a shorter syntax for specifying wix extensions on the command line. SBonev: Make PropertyRef extensible. DerekC: Update all internal WiX extensions to the latest "standards". DerekC: Lots of decompiler-related bug fixes: - warn when a table is decompiled as a custom table - Add decompiler support for the SecureObjects, ServiceConfig, ServiceControl, ServiceInstall, and XmlFile tables (and turn on the corresponding decompilation qtests) - Fix a canonicalization bug when extracting embedded cabinet files - Fix a dark and light bug related to showing the path to the temp working directory when binder or decompiler construction doesn't occur - Fix a problem with all extensions whereby each call to get a particular extension-type (like a CompilerExtension) would return a new instance of that extension instead of one - Move the User, UserGroup, and Group table definitions over to the sca extension where they belong (from the WiX core) - Setup the infrastructure for the ScaDecompiler extension - Rename the ScaExt project to ScaExtension to match other extensions - Fix an error message in the compilation of CustomTables - Remove unused code from the compilation of the ServiceInstall elements - Fix a bug in the linker related to handing of null values in the CustomTable support DerekC: Random decompiler and light fixes: - Fix decompilation of sequence tables when there are sequence number collisions - Read the dark option for suppressing relative action sequencing from the "sras" option instead of the "srs" option - Fix a decompilation bug with ensuring empty custom tables - Fix a binder bug with setting different compression levels on multiple cabinet files - Fix a binder bug with honoring the supress assemblies and suppress gathering file hash/version/language/size information options - Simplify the fix for the notidy option in light and dark - Implement decompilation for the ExecuteAction and InstallAdminPackage actions - Make the decompiler switch to absolute sequencing mode when it detect any action that will require absolute sequencing (this ensures that absolutely sequenced actions will always be in the proper locations in the final output). In real usage, this means that the AppSearch action will often trigger absolute sequencing mode - but its better to be safe then try to minimize authoring DerekC: Implement decompiler support for patch creation (pcp) files. DerekC: Embed the serverca binary wixlib file inside its extension (and add the necessary functionality to the WiX toolset to support completely self-contained extensions). DerekC: Stop nesting the Binary element inside the serverca schema and fix a recent regression with serverca error messages throwing an exception. DerekC: Add decompiler support for the remaining merge module tables ModuleAdvtUISequence, ModuleConfiguration, ModuleDependency, ModuleIgnoreTable, and ModuleSubstitution. Add compiler support for the ModuleIgnoreTable table. Fix a bug in the compiler for parsing of the ModuleDependency table. DerekC: Add support for hard-coding the Feature.Display column's value. Don't allow features to be simultaneously nested under a Product element and another element since a feature can only have one parent feature (or none). RGustin: Add MMC Snap-In registration extension. Move Compiler.GenerateIdentifier to CompilerCore.GenerateIdentifier to make it available to extensions. RobMen: Allow MsiAssembly table to be suppressed using -sma switch to light. BobArnso: Add back the ProgressText (ActionText) and Error loc strings; enabled their use by adding UIRef/@Id="WixUI_ErrorProgressText" to your source. ScotK: 4 ServerCA related fixes: - Fixing compiler support for rollback actions on SqlScript and SqlStrings. - Cleaning up usage of defines from Server CAs. - Adding support for RollbackOnReinstall support to compiler since CAs already supported it. - BREAKING CHANGE: Changed casing of ExecuteOnReInstall to ExecuteOnReinstall for SqlScript and SqlString. RobMen: Generate caerr.wxi Index: tables.xml =================================================================== RCS file: /cvsroot/wix/wix/src/wix/Data/tables.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** tables.xml 7 Dec 2005 07:29:25 -0000 1.26 --- tables.xml 26 Dec 2005 12:06:09 -0000 1.27 *************** *** 1131,1164 **** category="upperCase" description="The property to set when a product in this set is found."/> </tableDefinition> - <tableDefinition name="User"> - <columnDefinition name="User" type="string" length="72" primaryKey="yes" symbol="yes" modularize="column" - category="identifier" description="Primary key, non-localized token"/> - <columnDefinition name="Component_" type="string" length="72" nullable="yes" modularize="column" - keyTable="Component" keyColumn="1" category="text" description="Foreign key, Component used to determine install state"/> - <columnDefinition name="Name" type="string" length="255" modularize="property" - category="formatted" description="User name"/> - <columnDefinition name="Domain" type="string" length="255" nullable="yes" modularize="property" - category="formatted" description="User domain"/> - <columnDefinition name="Password" type="string" length="255" nullable="yes" modularize="property" - category="formatted" description="User password"/> - <columnDefinition name="Attributes" type="number" length="4" nullable="yes" - minValue="0" maxValue="65535" description="Attributes describing how to create the user"/> - </tableDefinition> - <tableDefinition name="UserGroup"> - <columnDefinition name="User_" type="string" length="72" primaryKey="yes" modularize="column" - keyTable="User" keyColumn="1" category="identifier" description="User to be joined to a Group."/> - <columnDefinition name="Group_" type="string" length="72" primaryKey="yes" modularize="column" - keyTable="Group" keyColumn="1" category="identifier" description="User to be joined to a Group."/> - </tableDefinition> - <tableDefinition name="Group"> - <columnDefinition name="Group" type="string" length="72" primaryKey="yes" symbol="yes" modularize="column" - category="identifier" description="Primary key, non-localized token"/> - <columnDefinition name="Component_" type="string" length="72" nullable="yes" modularize="column" - keyTable="Component" keyColumn="1" category="text" description="Foreign key, Component used to determine install state"/> - <columnDefinition name="Name" type="string" length="255" modularize="property" - category="formatted" description="Group name"/> - <columnDefinition name="Domain" type="string" length="255" nullable="yes" modularize="property" - category="formatted" description="Group domain"/> - </tableDefinition> <tableDefinition name="Verb"> <columnDefinition name="Extension_" type="string" length="255" primaryKey="yes" --- 1131,1134 ---- Index: messages.xml =================================================================== RCS file: /cvsroot/wix/wix/src/wix/Data/messages.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** messages.xml 7 Dec 2005 07:29:25 -0000 1.23 --- messages.xml 26 Dec 2005 12:06:09 -0000 1.24 *************** *** 801,808 **** </Message> <Message Id="MultiplePrimaryReferences" Level="Normal"> ! <Instance>Multiple primary references were found for {0} {1} in {2} and {3}. <Parameter Type="System.String" Name="crefChildType" /> <Parameter Type="System.String" Name="crefChildId" /> <Parameter Type="System.String" Name="crefParentType" /> <Parameter Type="System.String" Name="conflictParentId" /> </Instance> --- 801,810 ---- </Message> <Message Id="MultiplePrimaryReferences" Level="Normal"> ! <Instance>Multiple primary references were found for {0} '{1}' in {2} '{3}' and {4} '{5}'. <Parameter Type="System.String" Name="crefChildType" /> <Parameter Type="System.String" Name="crefChildId" /> <Parameter Type="System.String" Name="crefParentType" /> + <Parameter Type="System.String" Name="crefParentId" /> + <Parameter Type="System.String" Name="conflictParentType" /> <Parameter Type="System.String" Name="conflictParentId" /> </Instance> *************** *** 1311,1315 **** </Message> <Message Id="MissingTableDefinition" Level="Normal" SourceLineNumbers="no"> ! <Instance>Cannot find the table definitions for the '{0}' table. This is likely due to a typing error or missing schema extension. Please ensure all the necessary extensions are supplied on the command line with the -ext parameter. <Parameter Type="System.String" Name="tableName" /> </Instance> --- 1313,1317 ---- </Message> <Message Id="MissingTableDefinition" Level="Normal" SourceLineNumbers="no"> ! <Instance>Cannot find the table definitions for the '{0}' table. This is likely due to a typing error or missing extension. Please ensure all the necessary extensions are supplied on the command line with the -ext parameter. <Parameter Type="System.String" Name="tableName" /> </Instance> *************** *** 1356,1359 **** --- 1358,1366 ---- </Instance> </Message> + <Message Id="TableDecompilationUnimplemented" Level="Normal"> + <Instance>Decompilation of the {0} table has not been implemented by its extension. + <Parameter Type="System.String" Name="tableName" /> + </Instance> + </Message> </Class> <Class Name="WixWarnings" ContainerName="WixWarning" BaseContainerName="MessageEventArgs" LevelType="WarningLevel"> *************** *** 1439,1445 **** </Message> <Message Id="UnknownPermission" Level="Moderate" Number="1030"> ! <Instance>Ignoring unknown permission at bit position {0} of {1}. ! <Parameter Type="System.Int32" Name="value" /> ! <Parameter Type="System.String" Name="table" /> </Instance> </Message> --- 1446,1453 ---- </Message> <Message Id="UnknownPermission" Level="Moderate" Number="1030"> ! <Instance>The {0} table contains a row with primary key '{1}' which has an unknown permission at bit {2}. ! <Parameter Type="System.String" Name="tableName" /> ! <Parameter Type="System.String" Name="primaryKey" /> ! <Parameter Type="System.Int32" Name="bitPosition" /> </Instance> </Message> *************** *** 1576,1579 **** --- 1584,1619 ---- </Instance> </Message> + <Message Id="DecompilingAsCustomTable" Level="Minor" Number="1060"> + <Instance>The {0} table is being decompiled as a custom table. + <Parameter Type="System.String" Name="tableName" /> + </Instance> + </Message> + <Message Id="IllegalPatchCreationTable" Level="Moderate" Number="1061"> + <Instance>The {0} table is not legal in a patch creation file. The information in this table will be left out of the decompiled output. + <Parameter Type="System.String" Name="tableName" /> + </Instance> + </Message> + <Message Id="SkippingMergeModuleTable" Level="Moderate" Number="1062"> + <Instance>The {0} table can only be represented in WiX for merge modules. The information in this table will be left out of the decompiled output. + <Parameter Type="System.String" Name="tableName" /> + </Instance> + </Message> + <Message Id="SkippingPatchCreationTable" Level="Moderate" Number="1063"> + <Instance>The {0} table can only be represented in WiX for patch creation files. The information in this table will be left out of the decompiled output. + <Parameter Type="System.String" Name="tableName" /> + </Instance> + </Message> + <Message Id="UnrepresentableValue" Level="Moderate" Number="1064"> + <Instance>The {0}.{1} column has a value '{2}' which cannot currently be represented in the WiX schema. Please email the WiX team if this feature is required. + <Parameter Type="System.String" Name="tableName" /> + <Parameter Type="System.String" Name="columnName" /> + <Parameter Type="System.String" Name="value" /> + </Instance> + </Message> + <Message Id="DeprecatedTable" Level="Moderate" Number="1065"> + <Instance>The {0} table is not supported by the WiX toolset because it has been deprecated by the Windows Installer team. Any information in this table will be left out of the decompiled output. + <Parameter Type="System.String" Name="tableName" /> + </Instance> + </Message> </Class> <Class Name="WixVerboses" ContainerName="WixVerbose" BaseContainerName="MessageEventArgs" LevelType="VerboseLevel" StartNumber="2000"> *************** *** 1634,1637 **** --- 1674,1682 ---- <Instance>Laying out media.</Instance> </Message> + <Message Id="DecompilingTable" Level="Verbose"> + <Instance>Decompiling the {0} table. + <Parameter Type="System.String" Name="tableName" /> + </Instance> + </Message> </Class> </Messages> |