Menu
▾
▴
[WiX-commits] wix/src/ct/ClickThrough FilesControl.cs,1.1,1.2 PackageBuilder.cs,1.2,1.3
|
From: Rob M. <ro...@us...> - 2005-12-26 12:06:57
|
Update of /cvsroot/wix/wix/src/ct/ClickThrough In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14145/src/ct/ClickThrough Modified Files: FilesControl.cs PackageBuilder.cs 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: PackageBuilder.cs =================================================================== RCS file: /cvsroot/wix/wix/src/ct/ClickThrough/PackageBuilder.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PackageBuilder.cs 8 Dec 2005 01:02:32 -0000 1.2 --- PackageBuilder.cs 26 Dec 2005 12:05:45 -0000 1.3 *************** *** 476,480 **** WixSerialize.Feature childFeature = new WixSerialize.Feature(); childFeature.Id = "ApplicationFeature"; ! childFeature.Display = WixSerialize.Feature.DisplayType.expand; childFeature.Level = 1; childFeature.Absent = WixSerialize.Feature.AbsentType.disallow; --- 476,480 ---- WixSerialize.Feature childFeature = new WixSerialize.Feature(); childFeature.Id = "ApplicationFeature"; ! childFeature.Display = "expand"; childFeature.Level = 1; childFeature.Absent = WixSerialize.Feature.AbsentType.disallow; Index: FilesControl.cs =================================================================== RCS file: /cvsroot/wix/wix/src/ct/ClickThrough/FilesControl.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FilesControl.cs 7 Nov 2005 22:47:30 -0000 1.1 --- FilesControl.cs 26 Dec 2005 12:05:45 -0000 1.2 *************** *** 313,316 **** --- 313,326 ---- /// <summary> + /// Return true if a string is null or zero length + /// </summary> + /// <param name="s"></param> + /// <returns></returns> + private static bool IsNullOrEmpty(string s) + { + return s == null || s.Length == 0; + } + + /// <summary> /// Called after a node in the tree view is selected. /// </summary> *************** *** 359,373 **** // set the file details FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(fileInfo.FullName); ! if (fileVersionInfo.Comments.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Comments", fileVersionInfo.Comments })); } ! if (fileVersionInfo.CompanyName.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Company Name", fileVersionInfo.CompanyName })); } ! if (fileVersionInfo.FileDescription.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Description", fileVersionInfo.FileDescription })); --- 369,384 ---- // set the file details FileVersionInfo fileVersionInfo = FileVersionInfo.GetVersionInfo(fileInfo.FullName); ! ! if (!IsNullOrEmpty(fileVersionInfo.Comments)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Comments", fileVersionInfo.Comments })); } ! if (!IsNullOrEmpty(fileVersionInfo.CompanyName)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Company Name", fileVersionInfo.CompanyName })); } ! if (!IsNullOrEmpty(fileVersionInfo.FileDescription)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Description", fileVersionInfo.FileDescription })); *************** *** 376,385 **** this.fileListView.Items.Add(new ListViewItem(new string[] { "File Size", GetFileSize(fileInfo) })); ! if (fileVersionInfo.FileVersion.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "File Version", fileVersionInfo.FileVersion })); } ! if (fileVersionInfo.InternalName.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Internal Name", fileVersionInfo.InternalName })); --- 387,396 ---- this.fileListView.Items.Add(new ListViewItem(new string[] { "File Size", GetFileSize(fileInfo) })); ! if (!IsNullOrEmpty(fileVersionInfo.FileVersion)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "File Version", fileVersionInfo.FileVersion })); } ! if (!IsNullOrEmpty(fileVersionInfo.InternalName)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Internal Name", fileVersionInfo.InternalName })); *************** *** 411,450 **** } ! if (fileVersionInfo.Language.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Language", fileVersionInfo.Language })); } ! if (fileVersionInfo.LegalCopyright.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Legal Copyright", fileVersionInfo.LegalCopyright })); } ! if (fileVersionInfo.LegalTrademarks.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Legal Trademarks", fileVersionInfo.LegalTrademarks })); } ! if (fileVersionInfo.OriginalFilename.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Original Filename", fileVersionInfo.OriginalFilename })); } ! if (fileVersionInfo.PrivateBuild.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Private Build Version", fileVersionInfo.PrivateBuild })); } ! if (fileVersionInfo.ProductName.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Product Name", fileVersionInfo.ProductName })); } ! if (fileVersionInfo.ProductVersion.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Product Version", fileVersionInfo.ProductVersion })); } ! if (fileVersionInfo.SpecialBuild.Length > 0) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Special Build", fileVersionInfo.SpecialBuild })); --- 422,461 ---- } ! if (!IsNullOrEmpty(fileVersionInfo.Language)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Language", fileVersionInfo.Language })); } ! if (!IsNullOrEmpty(fileVersionInfo.LegalCopyright)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Legal Copyright", fileVersionInfo.LegalCopyright })); } ! if (!IsNullOrEmpty(fileVersionInfo.LegalTrademarks)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Legal Trademarks", fileVersionInfo.LegalTrademarks })); } ! if (!IsNullOrEmpty(fileVersionInfo.OriginalFilename)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Original Filename", fileVersionInfo.OriginalFilename })); } ! if (!IsNullOrEmpty(fileVersionInfo.PrivateBuild)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Private Build Version", fileVersionInfo.PrivateBuild })); } ! if (!IsNullOrEmpty(fileVersionInfo.ProductName)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Product Name", fileVersionInfo.ProductName })); } ! if (!IsNullOrEmpty(fileVersionInfo.ProductVersion)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Product Version", fileVersionInfo.ProductVersion })); } ! if (!IsNullOrEmpty(fileVersionInfo.SpecialBuild)) { this.fileListView.Items.Add(new ListViewItem(new string[] { "Special Build", fileVersionInfo.SpecialBuild })); |