From: Rob M. <ro...@us...> - 2006-03-01 08:51:08
|
Update of /cvsroot/wix/wix/src/NAntTasks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21554/src/NAntTasks Modified Files: LightTask.cs WixTask.cs 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: WixTask.cs =================================================================== RCS file: /cvsroot/wix/wix/src/NAntTasks/WixTask.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WixTask.cs 5 Dec 2005 22:52:41 -0000 1.2 --- WixTask.cs 1 Mar 2006 08:50:31 -0000 1.3 *************** *** 42,45 **** --- 42,46 ---- private string responseFile; private FileSet sources; + private bool warningsAsErrors; #endregion *************** *** 121,124 **** --- 122,135 ---- set { this.sources = value; } } + + /// <summary> + /// Gets or sets the option to treat warnings as errors. + /// </summary> + [TaskAttribute("warningsaserrors")] + public bool WarningsAsErrors + { + get { return this.warningsAsErrors; } + set { this.warningsAsErrors = value; } + } #endregion *************** *** 222,225 **** --- 233,241 ---- { writer.WriteLine("-nologo"); + + if (this.warningsAsErrors) + { + writer.WriteLine("-wx"); + } } #endregion Index: LightTask.cs =================================================================== RCS file: /cvsroot/wix/wix/src/NAntTasks/LightTask.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LightTask.cs 5 Dec 2005 22:52:41 -0000 1.2 --- LightTask.cs 1 Mar 2006 08:50:31 -0000 1.3 *************** *** 83,87 **** if (this.LocFile != null) { ! writer.WriteLine("-loc {0}", this.LocFile); } } --- 83,87 ---- if (this.LocFile != null) { ! writer.WriteLine("-loc \"{0}\"", this.LocFile); } } |