From: Rob M. <ro...@us...> - 2006-03-01 08:51:10
|
Update of /cvsroot/wix/wix/src/ui/wixui/featuretree In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21554/src/ui/wixui/featuretree Modified Files: WixUI_FeatureTree.wxs Log Message: DerekC: Fix a bug with duplicate section symbols (like two fragment with the same Id). DerekC: SFBUG:1427916 - Fix poor RemoveFile error message. DerekC: Two decompiler bugs: 1. Properly handle special sequence actions. 2. Handle registry value of "[~]". BobArnso: - Add WixUI_InstallDir dialog set (welcome > install dir > progress > finish) - Move dialog UI sequences out of WixUI_Common and into the dialogs themselves so custom sets can replace everything - Build a single wixui.wixlib instead of several separate .wixlibs (breaking change -- projects must now reference a particular WixUI set name) - Fix sfbug:1425869 (Controls extend beyond boundaries) DerekC: Require the RemoveFile/@Name attribute since RemoveFolder should cover the same functionality. BobArnso: To reduce localization effort, refactor common text (e.g., "Next" and "Cancel") to use global loc strings rather than dialog-specific loc strings. JRock: Cleaning up the RegisterVotive.bat file so that it doesn't need grep or sed. JRock: - Cleanup paths in the Votive project files. - Detect missing candle.exe and light.exe files in the build and give a more meaningful error. DerekC: Treat warnings as errors for all builds using wix tools. Also fix warnings related to recent changes. DerekC: Add support for auto-generated short file names in Shortcut elements. BobArnso: Add snskip target to wix.build to skip strong-name verification for just-built WiX binaries AaronSte: Create an exampleuuid type for use by Component GUID and UpgradeCode in wix.xsd AaronSte: Fix other instances of sfbug:1425869 (Controls extend beyond boundaries) RobMen: SFBUG:1429463 - allow empty strings in loc files RobMen: SFBUG:1432746 - loc path should be quoted in NAnt LightTask AaronSte: Updated wix.xsd to name GUID types consistently and disallow blank GUIDs for UpgradeCode DerekC: Random bug fixes: - Support binary columns in custom tables. - Support decompiling msi files with no _Validation table. - Properly decompile summary information values that have not been set. - Support nullable binary columns in the binder. DerekC: Fix SF1266391: spaces in preprocessor define statements may be lost RobMen: SFBUG:1427907 - Merge/@Language can be localized. SFBUG:1420851 - Merge Modules can have Error tables (with a warning). Correctly Modularize ActionText.Template and Error.Template RobMen: SFBUG:1366769 - require RemoveExistingProducts to be scheduled with Upgrade table. RobMen: SFBUG:1274075 - specify calling convention in public WiX headers BobArnso: - Fix faulty detection of VSIP and Extras SDKs - Update Votive installer to latest layout BobArnso: Add dutil.{h lib} and wcautil.{h lib} to binaries .zip Index: WixUI_FeatureTree.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ui/wixui/featuretree/WixUI_FeatureTree.wxs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** WixUI_FeatureTree.wxs 8 Nov 2005 02:21:04 -0000 1.4 --- WixUI_FeatureTree.wxs 1 Mar 2006 08:50:33 -0000 1.5 *************** *** 12,16 **** <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> ! <UI Id="WixUI"> <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> --- 12,16 ---- <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> ! <UI Id="WixUI_FeatureTree"> <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> *************** *** 20,32 **** <Property Id="WixUI_Mode" Value="FeatureTree" /> ! <DialogRef Id="LicenseAgreementDlg" /> <DialogRef Id="CustomizeDlg" /> <DialogRef Id="DiskCostDlg" /> ! <DialogRef Id="BrowseDlg" /> ! <DialogRef Id="VerifyReadyDlg" /> ! <DialogRef Id="MaintenanceWelcomeDlg" /> <DialogRef Id="MaintenanceTypeDlg" /> ! <DialogRef Id="VerifyRepairDlg" /> <DialogRef Id="VerifyRemoveDlg" /> <Property Id="WixUI_WelcomeDlg_Next" Value="LicenseAgreementDlg" /> --- 20,41 ---- <Property Id="WixUI_Mode" Value="FeatureTree" /> ! <DialogRef Id="BrowseDlg" /> <DialogRef Id="CustomizeDlg" /> <DialogRef Id="DiskCostDlg" /> ! <DialogRef Id="ErrorDlg" /> ! <DialogRef Id="ExitDialog" /> ! <DialogRef Id="FatalError" /> ! <DialogRef Id="FilesInUse" /> ! <DialogRef Id="LicenseAgreementDlg" /> <DialogRef Id="MaintenanceTypeDlg" /> ! <DialogRef Id="MaintenanceWelcomeDlg" /> ! <DialogRef Id="PrepareDlg" /> ! <DialogRef Id="ProgressDlg" /> ! <DialogRef Id="ResumeDlg" /> ! <DialogRef Id="UserExit" /> ! <DialogRef Id="VerifyReadyDlg" /> <DialogRef Id="VerifyRemoveDlg" /> + <DialogRef Id="VerifyRepairDlg" /> + <DialogRef Id="WelcomeDlg" /> <Property Id="WixUI_WelcomeDlg_Next" Value="LicenseAgreementDlg" /> *************** *** 56,67 **** <Property Id="WixUI_VerifyRemoveDlg_Back" Value="MaintenanceTypeDlg" /> <Property Id="WixUI_VerifyRepairDlg_Back" Value="MaintenanceTypeDlg" /> - - <InstallUISequence> - <Show Dialog="WelcomeDlg" After="MigrateFeatureStates">NOT Installed</Show> - <Show Dialog="ResumeDlg" After="WelcomeDlg">Installed AND (RESUME OR Preselected)</Show> - <Show Dialog="MaintenanceWelcomeDlg" After="ResumeDlg">Installed AND NOT RESUME AND NOT Preselected</Show> - <Show Dialog="ProgressDlg" After="MaintenanceWelcomeDlg" /> - <Show Dialog="PrepareDlg" After="LaunchConditions" /> - </InstallUISequence> </UI> --- 65,68 ---- |