Menu
▾
▴
[WiX-commits] wix/src/ct/setup ClickThrough.wxs,1.2,1.3 setup.build,1.1,1.2
|
From: Rob M. <ro...@us...> - 2006-03-01 08:51:10
|
Update of /cvsroot/wix/wix/src/ct/setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21554/src/ct/setup Modified Files: ClickThrough.wxs setup.build 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: ClickThrough.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ct/setup/ClickThrough.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ClickThrough.wxs 7 Dec 2005 07:29:24 -0000 1.2 --- ClickThrough.wxs 1 Mar 2006 08:50:32 -0000 1.3 *************** *** 14,19 **** <?include WixVer.wxi ?> ! <?define ProductCode A5660BB8-7926-4018-BFC9-847F996F2FFD ?> ! <?define UpgradeCode A5660BB9-7926-4018-BFC9-847F996F2FFD ?> <?if $(var.Flavor) = "debug" ?> --- 14,19 ---- <?include WixVer.wxi ?> ! <?define ProductCode = "A5660BB8-7926-4018-BFC9-847F996F2FFD" ?> ! <?define UpgradeCode = "A5660BB9-7926-4018-BFC9-847F996F2FFD" ?> <?if $(var.Flavor) = "debug" ?> *************** *** 49,65 **** <!-- Directories --> <DirectoryRef Id="ApplicationsFolder"> ! <Directory Id="ClickThroughFolder" Name="CTFolder" LongName="$(var.UpgradeCode)"> <Component Id="ClickThroughBinaries" DiskId="1" Guid="4CC16CF5-837F-44e5-9579-0B9CF03E40D0"> ! <File Id="ThisApplicationFile" Name="ct.exe" LongName="ClickThrough.exe" Source="$(var.ClickThroughDir)\ClickThrough.exe" Checksum="yes" KeyPath="yes" Vital="yes" /> ! <File Id="ThisApplicationConfigFile" Name="ctexe.cfg" LongName="ClickThrough.exe.config" Source="$(var.ClickThroughDir)\ClickThrough.exe.config" Vital="yes" /> </Component> <Component Id="AmbientBinaries" DiskId="1" Guid="639F8D92-CE42-4453-A5F6-52AC545F0243"> ! <File Id="ambient.dll" Name="ambient.dll" LongName="ambient.dll" Source="$(var.ClickThroughDir)\ambient.dll" Checksum="yes" KeyPath="yes" Vital="yes" /> </Component> <Component Id="ApplibBinaries" DiskId="1" Guid="488689AF-6CF2-4407-AAB8-A5E4EBB7719B"> ! <File Id="Applib.wixlib" Name="Applib.wlb" LongName="applib.wixlib" Source="$(var.ClickThroughDir)\applib.wixlib" Checksum="yes" KeyPath="yes" Vital="yes" /> </Component> <Component Id="UpdateBinaries" DiskId="1" Guid="E620C479-2BFF-4c7f-B6C8-A47E9FC02A62"> --- 49,65 ---- <!-- Directories --> <DirectoryRef Id="ApplicationsFolder"> ! <Directory Id="ClickThroughFolder" Name="$(var.UpgradeCode)"> <Component Id="ClickThroughBinaries" DiskId="1" Guid="4CC16CF5-837F-44e5-9579-0B9CF03E40D0"> ! <File Id="ThisApplicationFile" Name="ClickThrough.exe" Source="$(var.ClickThroughDir)\ClickThrough.exe" Checksum="yes" KeyPath="yes" Vital="yes" /> ! <File Id="ThisApplicationConfigFile" Name="ClickThrough.exe.config" Source="$(var.ClickThroughDir)\ClickThrough.exe.config" Vital="yes" /> </Component> <Component Id="AmbientBinaries" DiskId="1" Guid="639F8D92-CE42-4453-A5F6-52AC545F0243"> ! <File Id="ambient.dll" Name="ambient.dll" Source="$(var.ClickThroughDir)\ambient.dll" Checksum="yes" KeyPath="yes" Vital="yes" /> </Component> <Component Id="ApplibBinaries" DiskId="1" Guid="488689AF-6CF2-4407-AAB8-A5E4EBB7719B"> ! <File Id="Applib.wixlib" Name="applib.wixlib" Source="$(var.ClickThroughDir)\applib.wixlib" Checksum="yes" KeyPath="yes" Vital="yes" /> </Component> <Component Id="UpdateBinaries" DiskId="1" Guid="E620C479-2BFF-4c7f-B6C8-A47E9FC02A62"> *************** *** 71,75 **** </Component> <Component Id="SetupBuilderBinaries" DiskId="1" Guid="ABC668D9-EBC2-42f2-93D9-B9B8235C5F9F"> ! <File Id="SetupBuilder.dll" Name="setupbld.dll" LongName="SetupBuilder.dll" Source="$(var.ClickThroughDir)\SetupBuilder.dll" Checksum="yes" KeyPath="yes" Vital="yes" /> </Component> --- 71,75 ---- </Component> <Component Id="SetupBuilderBinaries" DiskId="1" Guid="ABC668D9-EBC2-42f2-93D9-B9B8235C5F9F"> ! <File Id="SetupBuilder.dll" Name="SetupBuilder.dll" Source="$(var.ClickThroughDir)\SetupBuilder.dll" Checksum="yes" KeyPath="yes" Vital="yes" /> </Component> *************** *** 92,99 **** <DirectoryRef Id="ProgramMenuFolder"> ! <Directory Id="ThisApplicationShortcutsFolder" Name="CT" LongName="Windows Installer XML Toolset"> <Component Id="ThisApplicationShortcutComponent" Guid="F90697B3-B274-41a4-AC09-5BE261EC1F25" KeyPath="yes"> <CreateFolder /> ! <Shortcut Id="ThisApplicationShortcut" Directory="ThisApplicationShortcutsFolder" Name="CT" LongName="ClickThrough" Target="[!SystemApplicationUpdateExeFile]" Arguments="-ac [UpgradeCode] -cl "[!ThisApplicationFile]"" /> </Component> </Directory> --- 92,99 ---- <DirectoryRef Id="ProgramMenuFolder"> ! <Directory Id="ThisApplicationShortcutsFolder" Name="Windows Installer XML Toolset"> <Component Id="ThisApplicationShortcutComponent" Guid="F90697B3-B274-41a4-AC09-5BE261EC1F25" KeyPath="yes"> <CreateFolder /> ! <Shortcut Id="ThisApplicationShortcut" Directory="ThisApplicationShortcutsFolder" Name="ClickThrough" Target="[!SystemApplicationUpdateExeFile]" Arguments="-ac [UpgradeCode] -cl "[!ThisApplicationFile]"" /> </Component> </Directory> *************** *** 113,116 **** --- 113,120 ---- <ComponentRef Id="ThisApplicationShortcutComponent" /> </Feature> + + <InstallExecuteSequence> + <RemoveExistingProducts After="InstallInitialize" /> + </InstallExecuteSequence> </Product> </Wix> Index: setup.build =================================================================== RCS file: /cvsroot/wix/wix/src/ct/setup/setup.build,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setup.build 7 Nov 2005 22:47:31 -0000 1.1 --- setup.build 1 Mar 2006 08:50:32 -0000 1.2 *************** *** 39,43 **** <!-- Build the ClickThrough.msi --> ! <candle out="${dir.build.ct.setup}\" exedir="${dir.target.wix}"> <defines> <define name="Flavor" value="${flavor}" /> --- 39,43 ---- <!-- Build the ClickThrough.msi --> ! <candle out="${dir.build.ct.setup}\" exedir="${dir.target.wix}" warningsaserrors="true"> <defines> <define name="Flavor" value="${flavor}" /> *************** *** 53,57 **** </includedirs> </candle> ! <light out="${setup.file.clickthrough.msi}" exedir="${dir.target.wix}"> <sources basedir="${dir.build.ct.setup}"> <include name="ClickThrough.wixobj" /> --- 53,57 ---- </includedirs> </candle> ! <light out="${setup.file.clickthrough.msi}" exedir="${dir.target.wix}" warningsaserrors="true"> <sources basedir="${dir.build.ct.setup}"> <include name="ClickThrough.wixobj" /> |