Thread: [Winmerge-svn] SF.net SVN: winmerge:[6627] trunk/Installer/WiX
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2009-04-01 18:57:40
|
Revision: 6627 http://winmerge.svn.sourceforge.net/winmerge/?rev=6627&view=rev Author: gerundt Date: 2009-04-01 18:57:37 +0000 (Wed, 01 Apr 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Add GUI Modified Paths: -------------- trunk/Installer/WiX/WinMerge.wxs Added Paths: ----------- trunk/Installer/WiX/WixUI_WinMerge.wxs Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-01 15:41:29 UTC (rev 6626) +++ trunk/Installer/WiX/WinMerge.wxs 2009-04-01 18:57:37 UTC (rev 6627) @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + candleArgs: "WinMerge.wxs" "WixUI_WinMerge.wxs" <extensions> + lightArgs: "WinMerge.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> +--> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <!-- TODO: @@ -604,6 +608,10 @@ <![CDATA[( VersionNT <= 500 ) OR ( Version9x <> 0 )]]> </Condition> + <WixVariable Id="WixUILicenseRtf" Value="..\..\Docs\users\GPL.rtf" /> + + <UIRef Id="WixUI_WinMerge" /> + <UI /> </Product> Added: trunk/Installer/WiX/WixUI_WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WixUI_WinMerge.wxs (rev 0) +++ trunk/Installer/WiX/WixUI_WinMerge.wxs 2009-04-01 18:57:37 UTC (rev 6627) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Copyright (c) Microsoft Corporation. All rights reserved. + + The use and distribution terms for this software are covered by the + Common Public License 1.0 (http://opensource.org/licenses/cpl.php) + which can be found in the file CPL.TXT at the root of this distribution. + By using this software in any fashion, you are agreeing to be bound by + the terms of this license. + + You must not remove this notice, or any other, from this software. +--> +<!-- +First-time install dialog sequence: Maintenance dialog sequence: + - WixUI_WelcomeDlg - WixUI_MaintenanceWelcomeDlg + - WixUI_LicenseAgreementDlg - WixUI_MaintenanceTypeDlg + - WixUI_SetupTypeDlg - WixUI_CustomizeDlg + - WixUI_VerifyReadyDlg - WixUI_VerifyReadyDlg + - WixUI_CustomizeDlg + - WixUI_DiskCostDlg + - WixUI_BrowseDlg +--> + +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Fragment> + <UI Id="WixUI_WinMerge"> + <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> + <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> + <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" /> + + <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" /> + <Property Id="WixUI_Mode" Value="Mondo" /> + + <DialogRef Id="ErrorDlg" /> + <DialogRef Id="FatalError" /> + <DialogRef Id="FilesInUse" /> + <DialogRef Id="MsiRMFilesInUse" /> + <DialogRef Id="PrepareDlg" /> + <DialogRef Id="ProgressDlg" /> + <DialogRef Id="ResumeDlg" /> + <DialogRef Id="UserExit" /> + + <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> + + <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish> + + <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish> + <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish> + + <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish> + <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish> + <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + + <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish> + <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish> + <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish> + + <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> + + <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish> + </UI> + + <UIRef Id="WixUI_Common" /> + </Fragment> +</Wix> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-04-01 20:12:52
|
Revision: 6631 http://winmerge.svn.sourceforge.net/winmerge/?rev=6631&view=rev Author: gerundt Date: 2009-04-01 20:12:51 +0000 (Wed, 01 Apr 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Add own bitmap files Modified Paths: -------------- trunk/Installer/WiX/WinMerge.wxs Added Paths: ----------- trunk/Installer/WiX/Bitmaps/ trunk/Installer/WiX/Bitmaps/banner.bmp trunk/Installer/WiX/Bitmaps/dialog.bmp Property changes on: trunk/Installer/WiX/Bitmaps ___________________________________________________________________ Added: bugtraq:url + http://sourceforge.net/support/tracker.php?aid=%BUGID% Added: bugtraq:logregex + (\d{6,}) Added: trunk/Installer/WiX/Bitmaps/banner.bmp =================================================================== (Binary files differ) Property changes on: trunk/Installer/WiX/Bitmaps/banner.bmp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/Installer/WiX/Bitmaps/dialog.bmp =================================================================== (Binary files differ) Property changes on: trunk/Installer/WiX/Bitmaps/dialog.bmp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-01 19:49:55 UTC (rev 6630) +++ trunk/Installer/WiX/WinMerge.wxs 2009-04-01 20:12:51 UTC (rev 6631) @@ -11,7 +11,6 @@ * Register shell extension * Create start menu items * Mutli-language support - * GUI * ... --> <Product Id="055366D2-F7D1-4888-A923-C3DC004E55E4" @@ -609,6 +608,8 @@ </Condition> <WixVariable Id="WixUILicenseRtf" Value="..\..\Docs\users\GPL.rtf" /> + <WixVariable Id="WixUIBannerBmp" Value="Bitmaps\banner.bmp" /> + <WixVariable Id="WixUIDialogBmp" Value="Bitmaps\dialog.bmp" /> <UIRef Id="WixUI_WinMerge" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-04-16 21:38:26
|
Revision: 6668 http://winmerge.svn.sourceforge.net/winmerge/?rev=6668&view=rev Author: gerundt Date: 2009-04-16 21:38:09 +0000 (Thu, 16 Apr 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Move some properties to own config file Modified Paths: -------------- trunk/Installer/WiX/WinMerge.wxs Added Paths: ----------- trunk/Installer/WiX/Config.wxi Added: trunk/Installer/WiX/Config.wxi =================================================================== --- trunk/Installer/WiX/Config.wxi (rev 0) +++ trunk/Installer/WiX/Config.wxi 2009-04-16 21:38:09 UTC (rev 6668) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<Include> + <!-- --> + <?define Manufacturer = "Thingamahoochie Software" ?> + <?define ProductName = "WinMerge" ?> + <?define ProductVersion = "0.0.1" ?> + + <?define PackageDescription = "WinMerge Installer" ?> + <?define PackageKeywords = "Installer" ?> + <?define PackageComments = "WinMerge" ?> + + <?define ProductGuid = "055366D2-F7D1-4888-A923-C3DC004E55E4" ?> + <?define UpgradeGuid = "3C974FF6-9076-46EB-A65F-A53931EAF942" ?> +</Include> \ No newline at end of file Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-16 21:21:46 UTC (rev 6667) +++ trunk/Installer/WiX/WinMerge.wxs 2009-04-16 21:38:09 UTC (rev 6668) @@ -4,6 +4,7 @@ lightArgs: "WinMerge.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> --> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include Config.wxi ?> <!-- TODO: * Install all files @@ -13,22 +14,22 @@ * Mutli-language support * ... --> - <Product Id="055366D2-F7D1-4888-A923-C3DC004E55E4" + <Product Id="$(var.ProductGuid)" Codepage="1252" Language="1033" - Manufacturer="Thingamahoochie Software" - Name="WinMerge" - UpgradeCode="3C974FF6-9076-46EB-A65F-A53931EAF942" - Version="0.0.1"> + Manufacturer="$(var.Manufacturer)" + Name="$(var.ProductName)" + UpgradeCode="$(var.UpgradeGuid)" + Version="$(var.ProductVersion)"> <Package Id="*" - Comments="WinMerge" + Comments="$(var.PackageComments)" Compressed="yes" - Description="WinMerge Installer" + Description="$(var.Manufacturer)" InstallerVersion="200" - Keywords="Installer" + Keywords="$(var.PackageKeywords)" Languages="1033" - Manufacturer="Thingamahoochie Software" + Manufacturer="$(var.PackageDescription)" SummaryCodepage="1252" /> <Media Id="1" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-04-20 06:43:13
|
Revision: 6676 http://winmerge.svn.sourceforge.net/winmerge/?rev=6676&view=rev Author: gerundt Date: 2009-04-20 06:43:10 +0000 (Mon, 20 Apr 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Use auto-generated product id Modified Paths: -------------- trunk/Installer/WiX/Config.wxi trunk/Installer/WiX/WinMerge.wxs Modified: trunk/Installer/WiX/Config.wxi =================================================================== --- trunk/Installer/WiX/Config.wxi 2009-04-19 22:11:34 UTC (rev 6675) +++ trunk/Installer/WiX/Config.wxi 2009-04-20 06:43:10 UTC (rev 6676) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <Include> - <!-- --> <?define Manufacturer = "Thingamahoochie Software" ?> <?define ProductName = "WinMerge" ?> <?define ProductVersion = "0.0.1" ?> @@ -9,6 +8,5 @@ <?define PackageKeywords = "Installer" ?> <?define PackageComments = "WinMerge" ?> - <?define ProductGuid = "055366D2-F7D1-4888-A923-C3DC004E55E4" ?> <?define UpgradeGuid = "3C974FF6-9076-46EB-A65F-A53931EAF942" ?> </Include> \ No newline at end of file Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-19 22:11:34 UTC (rev 6675) +++ trunk/Installer/WiX/WinMerge.wxs 2009-04-20 06:43:10 UTC (rev 6676) @@ -14,7 +14,7 @@ * Mutli-language support * ... --> - <Product Id="$(var.ProductGuid)" + <Product Id="*" Codepage="1252" Language="1033" Manufacturer="$(var.Manufacturer)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-04-20 19:43:16
|
Revision: 6679 http://winmerge.svn.sourceforge.net/winmerge/?rev=6679&view=rev Author: gerundt Date: 2009-04-20 19:43:12 +0000 (Mon, 20 Apr 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Build own setups for 32 and 64 bit Modified Paths: -------------- trunk/Installer/WiX/Config.wxi trunk/Installer/WiX/WinMerge.wxs Modified: trunk/Installer/WiX/Config.wxi =================================================================== --- trunk/Installer/WiX/Config.wxi 2009-04-20 17:45:33 UTC (rev 6678) +++ trunk/Installer/WiX/Config.wxi 2009-04-20 19:43:12 UTC (rev 6679) @@ -8,5 +8,11 @@ <?define PackageKeywords = "Installer" ?> <?define PackageComments = "WinMerge" ?> - <?define UpgradeGuid = "3C974FF6-9076-46EB-A65F-A53931EAF942" ?> + <?if $(var.Platform) = "x64" ?> + <?define PackagePlatform = "x64" ?> + <?define UpgradeGuid = "79F16C51-8485-426E-BF23-F4D3D0D431D7" ?> + <?else ?> + <?define PackagePlatform = "x86" ?> + <?define UpgradeGuid = "3C974FF6-9076-46EB-A65F-A53931EAF942" ?> + <?endif ?> </Include> \ No newline at end of file Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-20 17:45:33 UTC (rev 6678) +++ trunk/Installer/WiX/WinMerge.wxs 2009-04-20 19:43:12 UTC (rev 6679) @@ -30,6 +30,7 @@ Keywords="$(var.PackageKeywords)" Languages="1033" Manufacturer="$(var.PackageDescription)" + Platform="$(var.PackagePlatform)" SummaryCodepage="1252" /> <Media Id="1" @@ -45,6 +46,11 @@ <Directory Id="PLUGINSDIR" Name="MergePlugins" /> </Directory> </Directory> + <?if $(var.Platform) = "x64" ?> + <Directory Id="ProgramFiles64Folder"> + <Directory Id="INSTALLDIR64" Name="WinMerge" /> + </Directory> + <?endif ?> </Directory> <DirectoryRef Id="INSTALLDIR"> @@ -55,22 +61,6 @@ Vital="yes" /> </Component> - <!--TODO: Windows 32bit --> - <Component Id="ShellExtension" Guid="*" Win64="no"> - <File Id="ShellExtensionUDLL" - Name="ShellExtensionU.dll" - Source="..\..\Build\MergeUnicodeRelease\ShellExtensionU.dll" - Vital="yes" /> - </Component> - - <!--TODO: Windows 64bit --> - <Component Id="ShellExtensionX64" Guid="*"> - <File Id="ShellExtensionX64DLL" - Name="ShellExtensionX64.dll" - Source="..\..\Build\ShellExtensionX64\ShellExtensionX64.dll" - Vital="yes" /> - </Component> - <Component Id="libexpat" Guid="*" Win64="no"> <File Id="libexpatDLL" Name="libexpat.dll" @@ -107,6 +97,26 @@ </Component> </DirectoryRef> + <?if $(var.Platform) = "x64" ?> + <DirectoryRef Id="INSTALLDIR64"> + <Component Id="ShellExtension" Guid="*" Win64="yes"> + <File Id="ShellExtensionX64DLL" + Name="ShellExtensionX64.dll" + Source="..\..\Build\ShellExtensionX64\ShellExtensionX64.dll" + Vital="yes" /> + </Component> + </DirectoryRef> + <?else ?> + <DirectoryRef Id="INSTALLDIR"> + <Component Id="ShellExtension" Guid="*" Win64="no"> + <File Id="ShellExtensionUDLL" + Name="ShellExtensionU.dll" + Source="..\..\Build\MergeUnicodeRelease\ShellExtensionU.dll" + Vital="yes" /> + </Component> + </DirectoryRef> + <?endif ?> + <DirectoryRef Id="DOCSDIR"> <Component Id="ReadMe" Guid="*" Win64="no"> <File Id="ReadMeTXT" @@ -526,7 +536,6 @@ Title="WinMerge"> <ComponentRef Id="WinMergeU" /> <ComponentRef Id="ShellExtension" /> - <ComponentRef Id="ShellExtensionX64" /> <ComponentRef Id="libexpat" /> <ComponentRef Id="pcre" /> <ComponentRef Id="MergeLang" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-04-23 17:45:15
|
Revision: 6695 http://winmerge.svn.sourceforge.net/winmerge/?rev=6695&view=rev Author: gerundt Date: 2009-04-23 17:45:13 +0000 (Thu, 23 Apr 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Move component build dirs to config file Modified Paths: -------------- trunk/Installer/WiX/Config.wxi trunk/Installer/WiX/WinMerge.wxs Modified: trunk/Installer/WiX/Config.wxi =================================================================== --- trunk/Installer/WiX/Config.wxi 2009-04-23 14:14:28 UTC (rev 6694) +++ trunk/Installer/WiX/Config.wxi 2009-04-23 17:45:13 UTC (rev 6695) @@ -11,8 +11,16 @@ <?if $(var.Platform) = "x64" ?> <?define PackagePlatform = "x64" ?> <?define UpgradeGuid = "79F16C51-8485-426E-BF23-F4D3D0D431D7" ?> + + <?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?> + <?define ExpatBuildDir = "..\..\Build\expat" ?> + <?define PcreBuildDir = "..\..\Build\pcre" ?> <?else ?> <?define PackagePlatform = "x86" ?> <?define UpgradeGuid = "3C974FF6-9076-46EB-A65F-A53931EAF942" ?> + + <?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?> + <?define ExpatBuildDir = "..\..\Build\expat" ?> + <?define PcreBuildDir = "..\..\Build\pcre" ?> <?endif ?> </Include> \ No newline at end of file Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-23 14:14:28 UTC (rev 6694) +++ trunk/Installer/WiX/WinMerge.wxs 2009-04-23 17:45:13 UTC (rev 6695) @@ -56,28 +56,28 @@ <Component Id="WinMergeU" Guid="*" Win64="no"> <File Id="WinMergeUEXE" Name="WinMergeU.exe" - Source="..\..\Build\MergeUnicodeRelease\WinMergeU.exe" + Source="$(var.MergeBuildDir)\WinMergeU.exe" Vital="yes" /> </Component> <Component Id="libexpat" Guid="*" Win64="no"> <File Id="libexpatDLL" Name="libexpat.dll" - Source="..\..\Build\expat\libexpat.dll" + Source="$(var.ExpatBuildDir)\libexpat.dll" Vital="yes" /> </Component> <Component Id="pcre" Guid="*" Win64="no"> <File Id="pcreDLL" Name="pcre.dll" - Source="..\..\Build\pcre\pcre.dll" + Source="$(var.PcreBuildDir)\pcre.dll" Vital="yes" /> </Component> <Component Id="MergeLang" Guid="*" Win64="no"> <File Id="MergeLangDLL" Name="MergeLang.dll" - Source="..\..\Build\MergeUnicodeRelease\MergeLang.dll" + Source="$(var.MergeBuildDir)\MergeLang.dll" Vital="yes" /> </Component> @@ -112,7 +112,7 @@ <File Id="ShellExtensionUDLL" Name="ShellExtensionU.dll" SelfRegCost="1" - Source="..\..\Build\MergeUnicodeRelease\ShellExtensionU.dll" + Source="$(var.MergeBuildDir)\ShellExtensionU.dll" Vital="yes" /> </Component> </DirectoryRef> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-04-23 17:53:22
|
Revision: 6696 http://winmerge.svn.sourceforge.net/winmerge/?rev=6696&view=rev Author: gerundt Date: 2009-04-23 17:53:12 +0000 (Thu, 23 Apr 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Move Win64 parameter to config file Modified Paths: -------------- trunk/Installer/WiX/Config.wxi trunk/Installer/WiX/WinMerge.wxs Modified: trunk/Installer/WiX/Config.wxi =================================================================== --- trunk/Installer/WiX/Config.wxi 2009-04-23 17:45:13 UTC (rev 6695) +++ trunk/Installer/WiX/Config.wxi 2009-04-23 17:53:12 UTC (rev 6696) @@ -9,6 +9,7 @@ <?define PackageComments = "WinMerge" ?> <?if $(var.Platform) = "x64" ?> + <?define Win64 = "no" ?> <?define PackagePlatform = "x64" ?> <?define UpgradeGuid = "79F16C51-8485-426E-BF23-F4D3D0D431D7" ?> @@ -16,6 +17,7 @@ <?define ExpatBuildDir = "..\..\Build\expat" ?> <?define PcreBuildDir = "..\..\Build\pcre" ?> <?else ?> + <?define Win64 = "no" ?> <?define PackagePlatform = "x86" ?> <?define UpgradeGuid = "3C974FF6-9076-46EB-A65F-A53931EAF942" ?> Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-23 17:45:13 UTC (rev 6695) +++ trunk/Installer/WiX/WinMerge.wxs 2009-04-23 17:53:12 UTC (rev 6696) @@ -53,42 +53,42 @@ </Directory> <DirectoryRef Id="INSTALLDIR"> - <Component Id="WinMergeU" Guid="*" Win64="no"> + <Component Id="WinMergeU" Guid="*" Win64="$(var.Win64)"> <File Id="WinMergeUEXE" Name="WinMergeU.exe" Source="$(var.MergeBuildDir)\WinMergeU.exe" Vital="yes" /> </Component> - <Component Id="libexpat" Guid="*" Win64="no"> + <Component Id="libexpat" Guid="*" Win64="$(var.Win64)"> <File Id="libexpatDLL" Name="libexpat.dll" Source="$(var.ExpatBuildDir)\libexpat.dll" Vital="yes" /> </Component> - <Component Id="pcre" Guid="*" Win64="no"> + <Component Id="pcre" Guid="*" Win64="$(var.Win64)"> <File Id="pcreDLL" Name="pcre.dll" Source="$(var.PcreBuildDir)\pcre.dll" Vital="yes" /> </Component> - <Component Id="MergeLang" Guid="*" Win64="no"> + <Component Id="MergeLang" Guid="*" Win64="$(var.Win64)"> <File Id="MergeLangDLL" Name="MergeLang.dll" Source="$(var.MergeBuildDir)\MergeLang.dll" Vital="yes" /> </Component> - <Component Id="Files" Guid="*" Win64="no"> + <Component Id="Files" Guid="*" Win64="$(var.Win64)"> <File Id="FilesTXT" Name="Files.txt" Source="..\..\Docs\Users\Files.txt" Vital="no" /> </Component> - <Component Id="Contributors" Guid="*" Win64="no"> + <Component Id="Contributors" Guid="*" Win64="$(var.Win64)"> <File Id="ContributorsTXT" Name="Contributors.txt" Source="..\..\Docs\Users\Contributors.txt" @@ -108,7 +108,7 @@ </DirectoryRef> <?else ?> <DirectoryRef Id="INSTALLDIR"> - <Component Id="ShellExtension" Guid="*" Win64="no"> + <Component Id="ShellExtension" Guid="*" Win64="$(var.Win64)"> <File Id="ShellExtensionUDLL" Name="ShellExtensionU.dll" SelfRegCost="1" @@ -119,28 +119,28 @@ <?endif ?> <DirectoryRef Id="DOCSDIR"> - <Component Id="ReadMe" Guid="*" Win64="no"> + <Component Id="ReadMe" Guid="*" Win64="$(var.Win64)"> <File Id="ReadMeTXT" Name="ReadMe.txt" Source="..\..\Docs\Users\ReadMe.txt" Vital="no" /> </Component> - <Component Id="ReleaseNotes" Guid="*" Win64="no"> + <Component Id="ReleaseNotes" Guid="*" Win64="$(var.Win64)"> <File Id="ReleaseNotesHTML" Name="ReleaseNotes.html" Source="..\..\Docs\Users\ReleaseNotes.html" Vital="no" /> </Component> - <Component Id="ChangeLog" Guid="*" Win64="no"> + <Component Id="ChangeLog" Guid="*" Win64="$(var.Win64)"> <File Id="ChangeLogTXT" Name="ChangeLog.txt" Source="..\..\Docs\Users\ChangeLog.txt" Vital="no" /> </Component> - <Component Id="WinMergeHelp" Guid="*" Win64="no"> + <Component Id="WinMergeHelp" Guid="*" Win64="$(var.Win64)"> <File Id="WinMergeCHM" Name="WinMerge.chm" Source="..\..\Build\Manual\htmlhelp\WinMerge.chm" @@ -149,91 +149,91 @@ </DirectoryRef> <DirectoryRef Id="FILTERSDIR"> - <Component Id="ADAMulti" Guid="*" Win64="no"> + <Component Id="ADAMulti" Guid="*" Win64="$(var.Win64)"> <File Id="ADAMultiFLT" Name="ADAMulti.flt" Source="..\..\Filters\ADAMulti.flt" Vital="no" /> </Component> - <Component Id="ASPNET" Guid="*" Win64="no"> + <Component Id="ASPNET" Guid="*" Win64="$(var.Win64)"> <File Id="ASPNETFLT" Name="ASPNET.flt" Source="..\..\Filters\ASPNET.flt" Vital="no" /> </Component> - <Component Id="CSharp_loose" Guid="*" Win64="no"> + <Component Id="CSharp_loose" Guid="*" Win64="$(var.Win64)"> <File Id="CSharp_looseFLT" Name="CSharp_loose.flt" Source="..\..\Filters\CSharp_loose.flt" Vital="no" /> </Component> - <Component Id="Delphi" Guid="*" Win64="no"> + <Component Id="Delphi" Guid="*" Win64="$(var.Win64)"> <File Id="DelphiFLT" Name="Delphi.flt" Source="..\..\Filters\Delphi.flt" Vital="no" /> </Component> - <Component Id="FileFilter" Guid="*" Win64="no"> + <Component Id="FileFilter" Guid="*" Win64="$(var.Win64)"> <File Id="FileFilterTMPL" Name="FileFilter.tmpl" Source="..\..\Filters\FileFilter.tmpl" Vital="no" /> </Component> - <Component Id="Frontpage" Guid="*" Win64="no"> + <Component Id="Frontpage" Guid="*" Win64="$(var.Win64)"> <File Id="FrontpageFLT" Name="Frontpage.flt" Source="..\..\Filters\Frontpage.flt" Vital="no" /> </Component> - <Component Id="MASM" Guid="*" Win64="no"> + <Component Id="MASM" Guid="*" Win64="$(var.Win64)"> <File Id="MASMFLT" Name="MASM.flt" Source="..\..\Filters\MASM.flt" Vital="no" /> </Component> - <Component Id="Merge_GnuC_loose" Guid="*" Win64="no"> + <Component Id="Merge_GnuC_loose" Guid="*" Win64="$(var.Win64)"> <File Id="Merge_GnuC_looseFLT" Name="Merge_GnuC_loose.flt" Source="..\..\Filters\Merge_GnuC_loose.flt" Vital="no" /> </Component> - <Component Id="Merge_VB_loose" Guid="*" Win64="no"> + <Component Id="Merge_VB_loose" Guid="*" Win64="$(var.Win64)"> <File Id="Merge_VB_looseFLT" Name="Merge_VB_loose.flt" Source="..\..\Filters\Merge_VB_loose.flt" Vital="no" /> </Component> - <Component Id="Merge_VC_loose" Guid="*" Win64="no"> + <Component Id="Merge_VC_loose" Guid="*" Win64="$(var.Win64)"> <File Id="Merge_VC_looseFLT" Name="Merge_VC_loose.flt" Source="..\..\Filters\Merge_VC_loose.flt" Vital="no" /> </Component> - <Component Id="SourceControl" Guid="*" Win64="no"> + <Component Id="SourceControl" Guid="*" Win64="$(var.Win64)"> <File Id="SourceControlFLT" Name="SourceControl.flt" Source="..\..\Filters\SourceControl.flt" Vital="no" /> </Component> - <Component Id="Symbian" Guid="*" Win64="no"> + <Component Id="Symbian" Guid="*" Win64="$(var.Win64)"> <File Id="SymbianFLT" Name="Symbian.flt" Source="..\..\Filters\Symbian.flt" Vital="no" /> </Component> - <Component Id="XML_html" Guid="*" Win64="no"> + <Component Id="XML_html" Guid="*" Win64="$(var.Win64)"> <File Id="XML_htmlFLT" Name="XML_html.flt" Source="..\..\Filters\XML_html.flt" @@ -242,196 +242,196 @@ </DirectoryRef> <DirectoryRef Id="LANGDIR"> - <Component Id="Brazilian" Guid="*" Win64="no"> + <Component Id="Brazilian" Guid="*" Win64="$(var.Win64)"> <File Id="BrazilianPO" Name="Brazilian.po" Source="..\..\Src\Languages\Brazilian.po" Vital="no" /> </Component> - <Component Id="Bulgarian" Guid="*" Win64="no"> + <Component Id="Bulgarian" Guid="*" Win64="$(var.Win64)"> <File Id="BulgarianPO" Name="Bulgarian.po" Source="..\..\Src\Languages\Bulgarian.po" Vital="no" /> </Component> - <Component Id="Catalan" Guid="*" Win64="no"> + <Component Id="Catalan" Guid="*" Win64="$(var.Win64)"> <File Id="CatalanPO" Name="Catalan.po" Source="..\..\Src\Languages\Catalan.po" Vital="no" /> </Component> - <Component Id="ChineseSimplified" Guid="*" Win64="no"> + <Component Id="ChineseSimplified" Guid="*" Win64="$(var.Win64)"> <File Id="ChineseSimplifiedPO" Name="ChineseSimplified.po" Source="..\..\Src\Languages\ChineseSimplified.po" Vital="no" /> </Component> - <Component Id="ChineseTraditional" Guid="*" Win64="no"> + <Component Id="ChineseTraditional" Guid="*" Win64="$(var.Win64)"> <File Id="ChineseTraditionalPO" Name="ChineseTraditional.po" Source="..\..\Src\Languages\ChineseTraditional.po" Vital="no" /> </Component> - <Component Id="Croatian" Guid="*" Win64="no"> + <Component Id="Croatian" Guid="*" Win64="$(var.Win64)"> <File Id="CroatianPO" Name="Croatian.po" Source="..\..\Src\Languages\Croatian.po" Vital="no" /> </Component> - <Component Id="Czech" Guid="*" Win64="no"> + <Component Id="Czech" Guid="*" Win64="$(var.Win64)"> <File Id="CzechPO" Name="Czech.po" Source="..\..\Src\Languages\Czech.po" Vital="no" /> </Component> - <Component Id="Danish" Guid="*" Win64="no"> + <Component Id="Danish" Guid="*" Win64="$(var.Win64)"> <File Id="DanishPO" Name="Danish.po" Source="..\..\Src\Languages\Danish.po" Vital="no" /> </Component> - <Component Id="Dutch" Guid="*" Win64="no"> + <Component Id="Dutch" Guid="*" Win64="$(var.Win64)"> <File Id="DutchPO" Name="Dutch.po" Source="..\..\Src\Languages\Dutch.po" Vital="no" /> </Component> - <Component Id="French" Guid="*" Win64="no"> + <Component Id="French" Guid="*" Win64="$(var.Win64)"> <File Id="FrenchPO" Name="French.po" Source="..\..\Src\Languages\French.po" Vital="no" /> </Component> - <Component Id="Galician" Guid="*" Win64="no"> + <Component Id="Galician" Guid="*" Win64="$(var.Win64)"> <File Id="GalicianPO" Name="Galician.po" Source="..\..\Src\Languages\Galician.po" Vital="no" /> </Component> - <Component Id="German" Guid="*" Win64="no"> + <Component Id="German" Guid="*" Win64="$(var.Win64)"> <File Id="GermanPO" Name="German.po" Source="..\..\Src\Languages\German.po" Vital="no" /> </Component> - <Component Id="Greek" Guid="*" Win64="no"> + <Component Id="Greek" Guid="*" Win64="$(var.Win64)"> <File Id="GreekPO" Name="Greek.po" Source="..\..\Src\Languages\Greek.po" Vital="no" /> </Component> - <Component Id="Hungarian" Guid="*" Win64="no"> + <Component Id="Hungarian" Guid="*" Win64="$(var.Win64)"> <File Id="HungarianPO" Name="Hungarian.po" Source="..\..\Src\Languages\Hungarian.po" Vital="no" /> </Component> - <Component Id="Italian" Guid="*" Win64="no"> + <Component Id="Italian" Guid="*" Win64="$(var.Win64)"> <File Id="ItalianPO" Name="Italian.po" Source="..\..\Src\Languages\Italian.po" Vital="no" /> </Component> - <Component Id="Japanese" Guid="*" Win64="no"> + <Component Id="Japanese" Guid="*" Win64="$(var.Win64)"> <File Id="JapanesePO" Name="Japanese.po" Source="..\..\Src\Languages\Japanese.po" Vital="no" /> </Component> - <Component Id="Korean" Guid="*" Win64="no"> + <Component Id="Korean" Guid="*" Win64="$(var.Win64)"> <File Id="KoreanPO" Name="Korean.po" Source="..\..\Src\Languages\Korean.po" Vital="no" /> </Component> - <Component Id="Norwegian" Guid="*" Win64="no"> + <Component Id="Norwegian" Guid="*" Win64="$(var.Win64)"> <File Id="NorwegianPO" Name="Norwegian.po" Source="..\..\Src\Languages\Norwegian.po" Vital="no" /> </Component> - <Component Id="Polish" Guid="*" Win64="no"> + <Component Id="Polish" Guid="*" Win64="$(var.Win64)"> <File Id="PolishPO" Name="Polish.po" Source="..\..\Src\Languages\Polish.po" Vital="no" /> </Component> - <Component Id="Portuguese" Guid="*" Win64="no"> + <Component Id="Portuguese" Guid="*" Win64="$(var.Win64)"> <File Id="PortuguesePO" Name="Portuguese.po" Source="..\..\Src\Languages\Portuguese.po" Vital="no" /> </Component> - <Component Id="Romanian" Guid="*" Win64="no"> + <Component Id="Romanian" Guid="*" Win64="$(var.Win64)"> <File Id="RomanianPO" Name="Romanian.po" Source="..\..\Src\Languages\Romanian.po" Vital="no" /> </Component> - <Component Id="Russian" Guid="*" Win64="no"> + <Component Id="Russian" Guid="*" Win64="$(var.Win64)"> <File Id="RussianPO" Name="Russian.po" Source="..\..\Src\Languages\Russian.po" Vital="no" /> </Component> - <Component Id="Slovak" Guid="*" Win64="no"> + <Component Id="Slovak" Guid="*" Win64="$(var.Win64)"> <File Id="SlovakPO" Name="Slovak.po" Source="..\..\Src\Languages\Slovak.po" Vital="no" /> </Component> - <Component Id="Slovenian" Guid="*" Win64="no"> + <Component Id="Slovenian" Guid="*" Win64="$(var.Win64)"> <File Id="SlovenianPO" Name="Slovenian.po" Source="..\..\Src\Languages\Slovenian.po" Vital="no" /> </Component> - <Component Id="Spanish" Guid="*" Win64="no"> + <Component Id="Spanish" Guid="*" Win64="$(var.Win64)"> <File Id="SpanishPO" Name="Spanish.po" Source="..\..\Src\Languages\Spanish.po" Vital="no" /> </Component> - <Component Id="Swedish" Guid="*" Win64="no"> + <Component Id="Swedish" Guid="*" Win64="$(var.Win64)"> <File Id="SwedishPO" Name="Swedish.po" Source="..\..\Src\Languages\Swedish.po" Vital="no" /> </Component> - <Component Id="Turkish" Guid="*" Win64="no"> + <Component Id="Turkish" Guid="*" Win64="$(var.Win64)"> <File Id="TurkishPO" Name="Turkish.po" Source="..\..\Src\Languages\Turkish.po" Vital="no" /> </Component> - <Component Id="Ukrainian" Guid="*" Win64="no"> + <Component Id="Ukrainian" Guid="*" Win64="$(var.Win64)"> <File Id="UkrainianPO" Name="Ukrainian.po" Source="..\..\Src\Languages\Ukrainian.po" @@ -630,4 +630,4 @@ <UI /> </Product> -</Wix> \ No newline at end of file +</Wix> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-04-23 18:37:59
|
Revision: 6697 http://winmerge.svn.sourceforge.net/winmerge/?rev=6697&view=rev Author: gerundt Date: 2009-04-23 18:37:54 +0000 (Thu, 23 Apr 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Create real 64bit setup Modified Paths: -------------- trunk/Installer/WiX/Config.wxi trunk/Installer/WiX/WinMerge.wxs Modified: trunk/Installer/WiX/Config.wxi =================================================================== --- trunk/Installer/WiX/Config.wxi 2009-04-23 17:53:12 UTC (rev 6696) +++ trunk/Installer/WiX/Config.wxi 2009-04-23 18:37:54 UTC (rev 6697) @@ -9,18 +9,20 @@ <?define PackageComments = "WinMerge" ?> <?if $(var.Platform) = "x64" ?> - <?define Win64 = "no" ?> + <?define Win64 = "yes" ?> <?define PackagePlatform = "x64" ?> <?define UpgradeGuid = "79F16C51-8485-426E-BF23-F4D3D0D431D7" ?> - <?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?> - <?define ExpatBuildDir = "..\..\Build\expat" ?> - <?define PcreBuildDir = "..\..\Build\pcre" ?> + <?define ProgramFilesFolder = "ProgramFiles64Folder" ?> + <?define MergeBuildDir = "..\..\Build\x64\MergeRelease" ?> + <?define ExpatBuildDir = "..\..\Build\expat\lib\x64\Release" ?> + <?define PcreBuildDir = "..\..\Build\pcre\lib\x64\Release" ?> <?else ?> <?define Win64 = "no" ?> <?define PackagePlatform = "x86" ?> <?define UpgradeGuid = "3C974FF6-9076-46EB-A65F-A53931EAF942" ?> + <?define ProgramFilesFolder = "ProgramFilesFolder" ?> <?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?> <?define ExpatBuildDir = "..\..\Build\expat" ?> <?define PcreBuildDir = "..\..\Build\pcre" ?> Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-23 17:53:12 UTC (rev 6696) +++ trunk/Installer/WiX/WinMerge.wxs 2009-04-23 18:37:54 UTC (rev 6697) @@ -8,7 +8,6 @@ <!-- TODO: * Install all files - * Make a different between 32bit and 64bit * Create start menu items * Mutli-language support * ... @@ -37,7 +36,7 @@ EmbedCab="yes" /> <Directory Id="TARGETDIR" Name="SourceDir"> - <Directory Id="ProgramFilesFolder"> + <Directory Id="$(var.ProgramFilesFolder)"> <Directory Id="INSTALLDIR" Name="WinMerge"> <Directory Id="DOCSDIR" Name="Docs" /> <Directory Id="FILTERSDIR" Name="Filters" /> @@ -45,11 +44,6 @@ <Directory Id="PLUGINSDIR" Name="MergePlugins" /> </Directory> </Directory> - <?if $(var.Platform) = "x64" ?> - <Directory Id="ProgramFiles64Folder"> - <Directory Id="INSTALLDIR64" Name="WinMerge" /> - </Directory> - <?endif ?> </Directory> <DirectoryRef Id="INSTALLDIR"> @@ -96,8 +90,8 @@ </Component> </DirectoryRef> - <?if $(var.Platform) = "x64" ?> - <DirectoryRef Id="INSTALLDIR64"> + <DirectoryRef Id="INSTALLDIR"> + <?if $(var.Platform) = "x64" ?> <Component Id="ShellExtension" Guid="*" Win64="yes"> <File Id="ShellExtensionX64DLL" Name="ShellExtensionX64.dll" @@ -105,9 +99,7 @@ Source="..\..\Build\ShellExtensionX64\ShellExtensionX64.dll" Vital="yes" /> </Component> - </DirectoryRef> - <?else ?> - <DirectoryRef Id="INSTALLDIR"> + <?else ?> <Component Id="ShellExtension" Guid="*" Win64="$(var.Win64)"> <File Id="ShellExtensionUDLL" Name="ShellExtensionU.dll" @@ -115,8 +107,8 @@ Source="$(var.MergeBuildDir)\ShellExtensionU.dll" Vital="yes" /> </Component> - </DirectoryRef> - <?endif ?> + <?endif ?> + </DirectoryRef> <DirectoryRef Id="DOCSDIR"> <Component Id="ReadMe" Guid="*" Win64="$(var.Win64)"> @@ -439,6 +431,7 @@ </Component> </DirectoryRef> + <?if not $(var.Platform) = "x64" ?> <DirectoryRef Id="PLUGINSDIR"> <Component Id="editoraddin" Guid="*" Win64="no"> <File Id="editoraddinSCT" @@ -524,6 +517,7 @@ Vital="no" /> </Component> </DirectoryRef> + <?endif ?> <!-- * Level <= 3 is "Typical" @@ -600,6 +594,7 @@ <ComponentRef Id="Turkish" /> <ComponentRef Id="Ukrainian" /> </Feature> + <?if not $(var.Platform) = "x64" ?> <Feature Id="Plugins" AllowAdvertise="no" Level="4" Title="Plugins"> <ComponentRef Id="editoraddin" /> <ComponentRef Id="insertdatetime" /> @@ -614,6 +609,7 @@ <ComponentRef Id="WatchBeginningOfLog" /> <ComponentRef Id="WatchEndOfLog" /> </Feature> + <?endif ?> </Feature> <!-- TODO: Works this really? --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-04-23 19:30:10
|
Revision: 6700 http://winmerge.svn.sourceforge.net/winmerge/?rev=6700&view=rev Author: gerundt Date: 2009-04-23 19:29:51 +0000 (Thu, 23 Apr 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Move features definition to a own file Modified Paths: -------------- trunk/Installer/WiX/WinMerge.wixproj trunk/Installer/WiX/WinMerge.wxs Added Paths: ----------- trunk/Installer/WiX/Features.wxs Added: trunk/Installer/WiX/Features.wxs =================================================================== --- trunk/Installer/WiX/Features.wxs (rev 0) +++ trunk/Installer/WiX/Features.wxs 2009-04-23 19:29:51 UTC (rev 6700) @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include Config.wxi ?> + <Fragment> + <!-- + * Level <= 3 is "Typical" + * Level <= 1000 is "Complete" + --> + <Feature Id="WinMerge" + Absent="disallow" + AllowAdvertise="no" + ConfigurableDirectory="INSTALLDIR" + Display="expand" + Level="1" + Title="WinMerge"> + <ComponentRef Id="WinMergeU" /> + <ComponentRef Id="libexpat" /> + <ComponentRef Id="pcre" /> + <ComponentRef Id="MergeLang" /> + <Feature Id="ShellExtension" + AllowAdvertise="no" + Description="Explorer context menu integration" + Level="1" + Title="Shell Extension"> + <ComponentRef Id="ShellExtension" /> + </Feature> + <Feature Id="Documentation" AllowAdvertise="no" Level="1" Title="Documentation"> + <ComponentRef Id="Files" /> + <ComponentRef Id="Contributors" /> + <ComponentRef Id="ReadMe" /> + <ComponentRef Id="ReleaseNotes" /> + <ComponentRef Id="ChangeLog" /> + <ComponentRef Id="WinMergeHelp" /> + </Feature> + <Feature Id="Filters" AllowAdvertise="no" Level="1" Title="Filters"> + <ComponentRef Id="ADAMulti" /> + <ComponentRef Id="ASPNET" /> + <ComponentRef Id="CSharp_loose" /> + <ComponentRef Id="Delphi" /> + <ComponentRef Id="FileFilter" /> + <ComponentRef Id="Frontpage" /> + <ComponentRef Id="MASM" /> + <ComponentRef Id="Merge_GnuC_loose" /> + <ComponentRef Id="Merge_VB_loose" /> + <ComponentRef Id="Merge_VC_loose" /> + <ComponentRef Id="SourceControl" /> + <ComponentRef Id="Symbian" /> + <ComponentRef Id="XML_html" /> + </Feature> + <Feature Id="Languages" AllowAdvertise="no" Level="1" Title="Languages"> + <ComponentRef Id="Brazilian" /> + <ComponentRef Id="Bulgarian" /> + <ComponentRef Id="Catalan" /> + <ComponentRef Id="ChineseSimplified" /> + <ComponentRef Id="ChineseTraditional" /> + <ComponentRef Id="Croatian" /> + <ComponentRef Id="Czech" /> + <ComponentRef Id="Danish" /> + <ComponentRef Id="Dutch" /> + <ComponentRef Id="French" /> + <ComponentRef Id="Galician" /> + <ComponentRef Id="German" /> + <ComponentRef Id="Greek" /> + <ComponentRef Id="Hungarian" /> + <ComponentRef Id="Italian" /> + <ComponentRef Id="Japanese" /> + <ComponentRef Id="Korean" /> + <ComponentRef Id="Norwegian" /> + <ComponentRef Id="Polish" /> + <ComponentRef Id="Portuguese" /> + <ComponentRef Id="Romanian" /> + <ComponentRef Id="Russian" /> + <ComponentRef Id="Slovak" /> + <ComponentRef Id="Slovenian" /> + <ComponentRef Id="Spanish" /> + <ComponentRef Id="Swedish" /> + <ComponentRef Id="Turkish" /> + <ComponentRef Id="Ukrainian" /> + </Feature> + <?if not $(var.Platform) = "x64" ?> + <Feature Id="Plugins" AllowAdvertise="no" Level="4" Title="Plugins"> + <ComponentRef Id="editoraddin" /> + <ComponentRef Id="insertdatetime" /> + <ComponentRef Id="CompareMSExcelFiles" /> + <ComponentRef Id="CompareMSWordFiles" /> + <ComponentRef Id="DisplayXMLFiles" /> + <ComponentRef Id="IgnoreColumns" /> + <ComponentRef Id="IgnoreCommentsC" /> + <ComponentRef Id="IgnoreFieldsComma" /> + <ComponentRef Id="IgnoreFieldsTab" /> + <ComponentRef Id="IgnoreLeadingLineNumbers" /> + <ComponentRef Id="WatchBeginningOfLog" /> + <ComponentRef Id="WatchEndOfLog" /> + </Feature> + <?endif ?> + </Feature> + </Fragment> +</Wix> Modified: trunk/Installer/WiX/WinMerge.wixproj =================================================================== --- trunk/Installer/WiX/WinMerge.wixproj 2009-04-23 19:28:00 UTC (rev 6699) +++ trunk/Installer/WiX/WinMerge.wixproj 2009-04-23 19:29:51 UTC (rev 6700) @@ -17,6 +17,7 @@ <ItemGroup> <WixExtension Include="$(WixToolPath)WixUIExtension.dll" /> <Compile Include="WinMerge.wxs"/> + <Compile Include="Features.wxs"/> <Compile Include="WixUI_WinMerge.wxs"/> </ItemGroup> Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-23 19:28:00 UTC (rev 6699) +++ trunk/Installer/WiX/WinMerge.wxs 2009-04-23 19:29:51 UTC (rev 6700) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - candleArgs: "WinMerge.wxs" "WixUI_WinMerge.wxs" <extensions> - lightArgs: "WinMerge.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> + candleArgs: "WinMerge.wxs" "WixUI_WinMerge.wxs" "Features.wxs" <extensions> + lightArgs: "WinMerge.wixobj" "WixUI_WinMerge.wixobj" "Features.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> --> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?include Config.wxi ?> @@ -518,98 +518,7 @@ </DirectoryRef> <?endif ?> - <!-- - * Level <= 3 is "Typical" - * Level <= 1000 is "Complete" - --> - <Feature Id="WinMerge" - Absent="disallow" - AllowAdvertise="no" - ConfigurableDirectory="INSTALLDIR" - Display="expand" - Level="1" - Title="WinMerge"> - <ComponentRef Id="WinMergeU" /> - <ComponentRef Id="libexpat" /> - <ComponentRef Id="pcre" /> - <ComponentRef Id="MergeLang" /> - <Feature Id="ShellExtension" - AllowAdvertise="no" - Description="Explorer context menu integration" - Level="1" - Title="Shell Extension"> - <ComponentRef Id="ShellExtension" /> - </Feature> - <Feature Id="Documentation" AllowAdvertise="no" Level="1" Title="Documentation"> - <ComponentRef Id="Files" /> - <ComponentRef Id="Contributors" /> - <ComponentRef Id="ReadMe" /> - <ComponentRef Id="ReleaseNotes" /> - <ComponentRef Id="ChangeLog" /> - <ComponentRef Id="WinMergeHelp" /> - </Feature> - <Feature Id="Filters" AllowAdvertise="no" Level="1" Title="Filters"> - <ComponentRef Id="ADAMulti" /> - <ComponentRef Id="ASPNET" /> - <ComponentRef Id="CSharp_loose" /> - <ComponentRef Id="Delphi" /> - <ComponentRef Id="FileFilter" /> - <ComponentRef Id="Frontpage" /> - <ComponentRef Id="MASM" /> - <ComponentRef Id="Merge_GnuC_loose" /> - <ComponentRef Id="Merge_VB_loose" /> - <ComponentRef Id="Merge_VC_loose" /> - <ComponentRef Id="SourceControl" /> - <ComponentRef Id="Symbian" /> - <ComponentRef Id="XML_html" /> - </Feature> - <Feature Id="Languages" AllowAdvertise="no" Level="1" Title="Languages"> - <ComponentRef Id="Brazilian" /> - <ComponentRef Id="Bulgarian" /> - <ComponentRef Id="Catalan" /> - <ComponentRef Id="ChineseSimplified" /> - <ComponentRef Id="ChineseTraditional" /> - <ComponentRef Id="Croatian" /> - <ComponentRef Id="Czech" /> - <ComponentRef Id="Danish" /> - <ComponentRef Id="Dutch" /> - <ComponentRef Id="French" /> - <ComponentRef Id="Galician" /> - <ComponentRef Id="German" /> - <ComponentRef Id="Greek" /> - <ComponentRef Id="Hungarian" /> - <ComponentRef Id="Italian" /> - <ComponentRef Id="Japanese" /> - <ComponentRef Id="Korean" /> - <ComponentRef Id="Norwegian" /> - <ComponentRef Id="Polish" /> - <ComponentRef Id="Portuguese" /> - <ComponentRef Id="Romanian" /> - <ComponentRef Id="Russian" /> - <ComponentRef Id="Slovak" /> - <ComponentRef Id="Slovenian" /> - <ComponentRef Id="Spanish" /> - <ComponentRef Id="Swedish" /> - <ComponentRef Id="Turkish" /> - <ComponentRef Id="Ukrainian" /> - </Feature> - <?if not $(var.Platform) = "x64" ?> - <Feature Id="Plugins" AllowAdvertise="no" Level="4" Title="Plugins"> - <ComponentRef Id="editoraddin" /> - <ComponentRef Id="insertdatetime" /> - <ComponentRef Id="CompareMSExcelFiles" /> - <ComponentRef Id="CompareMSWordFiles" /> - <ComponentRef Id="DisplayXMLFiles" /> - <ComponentRef Id="IgnoreColumns" /> - <ComponentRef Id="IgnoreCommentsC" /> - <ComponentRef Id="IgnoreFieldsComma" /> - <ComponentRef Id="IgnoreFieldsTab" /> - <ComponentRef Id="IgnoreLeadingLineNumbers" /> - <ComponentRef Id="WatchBeginningOfLog" /> - <ComponentRef Id="WatchEndOfLog" /> - </Feature> - <?endif ?> - </Feature> + <FeatureRef Id="WinMerge" /> <!-- TODO: Works this really? --> <Condition Message="WinMerge requires Windows 2000/XP/2003/Vista/2008 or later to install."> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-04-23 19:41:58
|
Revision: 6701 http://winmerge.svn.sourceforge.net/winmerge/?rev=6701&view=rev Author: gerundt Date: 2009-04-23 19:41:50 +0000 (Thu, 23 Apr 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Move plugins definition to a own file Modified Paths: -------------- trunk/Installer/WiX/WinMerge.wixproj trunk/Installer/WiX/WinMerge.wxs Added Paths: ----------- trunk/Installer/WiX/Plugins.wxs Added: trunk/Installer/WiX/Plugins.wxs =================================================================== --- trunk/Installer/WiX/Plugins.wxs (rev 0) +++ trunk/Installer/WiX/Plugins.wxs 2009-04-23 19:41:50 UTC (rev 6701) @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include Config.wxi ?> + <Fragment> + <?if not $(var.Platform) = "x64" ?> + <DirectoryRef Id="PLUGINSDIR"> + <Component Id="editoraddin" Guid="*" Win64="no"> + <File Id="editoraddinSCT" + Name="editor addin.sct" + Source="..\..\Plugins\dlls\editor addin.sct" + Vital="no" /> + </Component> + + <Component Id="insertdatetime" Guid="*" Win64="no"> + <File Id="insertdatetimeSCT" + Name="insert datetime.sct" + Source="..\..\Plugins\dlls\insert datetime.sct" + Vital="no" /> + </Component> + + <Component Id="CompareMSExcelFiles" Guid="*" Win64="no"> + <File Id="CompareMSExcelFilesDLL" + Name="CompareMSExcelFiles.dll" + Source="..\..\Plugins\dlls\CompareMSExcelFiles.dll" + Vital="no" /> + </Component> + + <Component Id="CompareMSWordFiles" Guid="*" Win64="no"> + <File Id="CompareMSWordFilesDLL" + Name="CompareMSWordFiles.dll" + Source="..\..\Plugins\dlls\CompareMSWordFiles.dll" + Vital="no" /> + </Component> + + <Component Id="DisplayXMLFiles" Guid="*" Win64="no"> + <File Id="DisplayXMLFilesDLL" + Name="DisplayXMLFiles.dll" + Source="..\..\Plugins\dlls\DisplayXMLFiles.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreColumns" Guid="*" Win64="no"> + <File Id="IgnoreColumnsDLL" + Name="IgnoreColumns.dll" + Source="..\..\Plugins\dlls\IgnoreColumns.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreCommentsC" Guid="*" Win64="no"> + <File Id="IgnoreCommentsCDLL" + Name="IgnoreCommentsC.dll" + Source="..\..\Plugins\dlls\IgnoreCommentsC.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreFieldsComma" Guid="*" Win64="no"> + <File Id="IgnoreFieldsCommaDLL" + Name="IgnoreFieldsComma.dll" + Source="..\..\Plugins\dlls\IgnoreFieldsComma.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreFieldsTab" Guid="*" Win64="no"> + <File Id="IgnoreFieldsTabDLL" + Name="IgnoreFieldsTab.dll" + Source="..\..\Plugins\dlls\IgnoreFieldsTab.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreLeadingLineNumbers" Guid="*" Win64="no"> + <File Id="IgnoreLeadingLineNumbersDLL" + Name="IgnoreLeadingLineNumbers.dll" + Source="..\..\Plugins\dlls\IgnoreLeadingLineNumbers.dll" + Vital="no" /> + </Component> + + <Component Id="WatchBeginningOfLog" Guid="*" Win64="no"> + <File Id="WatchBeginningOfLogDLL" + Name="WatchBeginningOfLog.dll" + Source="..\..\Plugins\dlls\WatchBeginningOfLog.dll" + Vital="no" /> + </Component> + + <Component Id="WatchEndOfLog" Guid="*" Win64="no"> + <File Id="WatchEndOfLogDLL" + Name="WatchEndOfLog.dll" + Source="..\..\Plugins\dlls\WatchEndOfLog.dll" + Vital="no" /> + </Component> + </DirectoryRef> + <?endif ?> + </Fragment> +</Wix> Modified: trunk/Installer/WiX/WinMerge.wixproj =================================================================== --- trunk/Installer/WiX/WinMerge.wixproj 2009-04-23 19:29:51 UTC (rev 6700) +++ trunk/Installer/WiX/WinMerge.wixproj 2009-04-23 19:41:50 UTC (rev 6701) @@ -17,6 +17,7 @@ <ItemGroup> <WixExtension Include="$(WixToolPath)WixUIExtension.dll" /> <Compile Include="WinMerge.wxs"/> + <Compile Include="Plugins.wxs"/> <Compile Include="Features.wxs"/> <Compile Include="WixUI_WinMerge.wxs"/> </ItemGroup> Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-23 19:29:51 UTC (rev 6700) +++ trunk/Installer/WiX/WinMerge.wxs 2009-04-23 19:41:50 UTC (rev 6701) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - candleArgs: "WinMerge.wxs" "WixUI_WinMerge.wxs" "Features.wxs" <extensions> - lightArgs: "WinMerge.wixobj" "WixUI_WinMerge.wixobj" "Features.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> + candleArgs: "WinMerge.wxs" "Plugins.wxs" "Features.wxs" "WixUI_WinMerge.wxs" <extensions> + lightArgs: "WinMerge.wixobj" "Plugins.wxs" "Features.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> --> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?include Config.wxi ?> @@ -430,94 +430,6 @@ </Component> </DirectoryRef> - <?if not $(var.Platform) = "x64" ?> - <DirectoryRef Id="PLUGINSDIR"> - <Component Id="editoraddin" Guid="*" Win64="no"> - <File Id="editoraddinSCT" - Name="editor addin.sct" - Source="..\..\Plugins\dlls\editor addin.sct" - Vital="no" /> - </Component> - - <Component Id="insertdatetime" Guid="*" Win64="no"> - <File Id="insertdatetimeSCT" - Name="insert datetime.sct" - Source="..\..\Plugins\dlls\insert datetime.sct" - Vital="no" /> - </Component> - - <Component Id="CompareMSExcelFiles" Guid="*" Win64="no"> - <File Id="CompareMSExcelFilesDLL" - Name="CompareMSExcelFiles.dll" - Source="..\..\Plugins\dlls\CompareMSExcelFiles.dll" - Vital="no" /> - </Component> - - <Component Id="CompareMSWordFiles" Guid="*" Win64="no"> - <File Id="CompareMSWordFilesDLL" - Name="CompareMSWordFiles.dll" - Source="..\..\Plugins\dlls\CompareMSWordFiles.dll" - Vital="no" /> - </Component> - - <Component Id="DisplayXMLFiles" Guid="*" Win64="no"> - <File Id="DisplayXMLFilesDLL" - Name="DisplayXMLFiles.dll" - Source="..\..\Plugins\dlls\DisplayXMLFiles.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreColumns" Guid="*" Win64="no"> - <File Id="IgnoreColumnsDLL" - Name="IgnoreColumns.dll" - Source="..\..\Plugins\dlls\IgnoreColumns.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreCommentsC" Guid="*" Win64="no"> - <File Id="IgnoreCommentsCDLL" - Name="IgnoreCommentsC.dll" - Source="..\..\Plugins\dlls\IgnoreCommentsC.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreFieldsComma" Guid="*" Win64="no"> - <File Id="IgnoreFieldsCommaDLL" - Name="IgnoreFieldsComma.dll" - Source="..\..\Plugins\dlls\IgnoreFieldsComma.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreFieldsTab" Guid="*" Win64="no"> - <File Id="IgnoreFieldsTabDLL" - Name="IgnoreFieldsTab.dll" - Source="..\..\Plugins\dlls\IgnoreFieldsTab.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreLeadingLineNumbers" Guid="*" Win64="no"> - <File Id="IgnoreLeadingLineNumbersDLL" - Name="IgnoreLeadingLineNumbers.dll" - Source="..\..\Plugins\dlls\IgnoreLeadingLineNumbers.dll" - Vital="no" /> - </Component> - - <Component Id="WatchBeginningOfLog" Guid="*" Win64="no"> - <File Id="WatchBeginningOfLogDLL" - Name="WatchBeginningOfLog.dll" - Source="..\..\Plugins\dlls\WatchBeginningOfLog.dll" - Vital="no" /> - </Component> - - <Component Id="WatchEndOfLog" Guid="*" Win64="no"> - <File Id="WatchEndOfLogDLL" - Name="WatchEndOfLog.dll" - Source="..\..\Plugins\dlls\WatchEndOfLog.dll" - Vital="no" /> - </Component> - </DirectoryRef> - <?endif ?> - <FeatureRef Id="WinMerge" /> <!-- TODO: Works this really? --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-04-23 19:48:29
|
Revision: 6702 http://winmerge.svn.sourceforge.net/winmerge/?rev=6702&view=rev Author: gerundt Date: 2009-04-23 19:48:20 +0000 (Thu, 23 Apr 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Move filters definition to a own file Modified Paths: -------------- trunk/Installer/WiX/WinMerge.wixproj trunk/Installer/WiX/WinMerge.wxs Added Paths: ----------- trunk/Installer/WiX/Filters.wxs Added: trunk/Installer/WiX/Filters.wxs =================================================================== --- trunk/Installer/WiX/Filters.wxs (rev 0) +++ trunk/Installer/WiX/Filters.wxs 2009-04-23 19:48:20 UTC (rev 6702) @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include Config.wxi ?> + <Fragment> + <DirectoryRef Id="FILTERSDIR"> + <Component Id="ADAMulti" Guid="*" Win64="$(var.Win64)"> + <File Id="ADAMultiFLT" + Name="ADAMulti.flt" + Source="..\..\Filters\ADAMulti.flt" + Vital="no" /> + </Component> + + <Component Id="ASPNET" Guid="*" Win64="$(var.Win64)"> + <File Id="ASPNETFLT" + Name="ASPNET.flt" + Source="..\..\Filters\ASPNET.flt" + Vital="no" /> + </Component> + + <Component Id="CSharp_loose" Guid="*" Win64="$(var.Win64)"> + <File Id="CSharp_looseFLT" + Name="CSharp_loose.flt" + Source="..\..\Filters\CSharp_loose.flt" + Vital="no" /> + </Component> + + <Component Id="Delphi" Guid="*" Win64="$(var.Win64)"> + <File Id="DelphiFLT" + Name="Delphi.flt" + Source="..\..\Filters\Delphi.flt" + Vital="no" /> + </Component> + + <Component Id="FileFilter" Guid="*" Win64="$(var.Win64)"> + <File Id="FileFilterTMPL" + Name="FileFilter.tmpl" + Source="..\..\Filters\FileFilter.tmpl" + Vital="no" /> + </Component> + + <Component Id="Frontpage" Guid="*" Win64="$(var.Win64)"> + <File Id="FrontpageFLT" + Name="Frontpage.flt" + Source="..\..\Filters\Frontpage.flt" + Vital="no" /> + </Component> + + <Component Id="MASM" Guid="*" Win64="$(var.Win64)"> + <File Id="MASMFLT" + Name="MASM.flt" + Source="..\..\Filters\MASM.flt" + Vital="no" /> + </Component> + + <Component Id="Merge_GnuC_loose" Guid="*" Win64="$(var.Win64)"> + <File Id="Merge_GnuC_looseFLT" + Name="Merge_GnuC_loose.flt" + Source="..\..\Filters\Merge_GnuC_loose.flt" + Vital="no" /> + </Component> + + <Component Id="Merge_VB_loose" Guid="*" Win64="$(var.Win64)"> + <File Id="Merge_VB_looseFLT" + Name="Merge_VB_loose.flt" + Source="..\..\Filters\Merge_VB_loose.flt" + Vital="no" /> + </Component> + + <Component Id="Merge_VC_loose" Guid="*" Win64="$(var.Win64)"> + <File Id="Merge_VC_looseFLT" + Name="Merge_VC_loose.flt" + Source="..\..\Filters\Merge_VC_loose.flt" + Vital="no" /> + </Component> + + <Component Id="SourceControl" Guid="*" Win64="$(var.Win64)"> + <File Id="SourceControlFLT" + Name="SourceControl.flt" + Source="..\..\Filters\SourceControl.flt" + Vital="no" /> + </Component> + + <Component Id="Symbian" Guid="*" Win64="$(var.Win64)"> + <File Id="SymbianFLT" + Name="Symbian.flt" + Source="..\..\Filters\Symbian.flt" + Vital="no" /> + </Component> + + <Component Id="XML_html" Guid="*" Win64="$(var.Win64)"> + <File Id="XML_htmlFLT" + Name="XML_html.flt" + Source="..\..\Filters\XML_html.flt" + Vital="no" /> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Modified: trunk/Installer/WiX/WinMerge.wixproj =================================================================== --- trunk/Installer/WiX/WinMerge.wixproj 2009-04-23 19:41:50 UTC (rev 6701) +++ trunk/Installer/WiX/WinMerge.wixproj 2009-04-23 19:48:20 UTC (rev 6702) @@ -17,6 +17,7 @@ <ItemGroup> <WixExtension Include="$(WixToolPath)WixUIExtension.dll" /> <Compile Include="WinMerge.wxs"/> + <Compile Include="Filters.wxs"/> <Compile Include="Plugins.wxs"/> <Compile Include="Features.wxs"/> <Compile Include="WixUI_WinMerge.wxs"/> Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-23 19:41:50 UTC (rev 6701) +++ trunk/Installer/WiX/WinMerge.wxs 2009-04-23 19:48:20 UTC (rev 6702) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - candleArgs: "WinMerge.wxs" "Plugins.wxs" "Features.wxs" "WixUI_WinMerge.wxs" <extensions> - lightArgs: "WinMerge.wixobj" "Plugins.wxs" "Features.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> + candleArgs: "WinMerge.wxs" "Filters.wxs" "Plugins.wxs" "Features.wxs" "WixUI_WinMerge.wxs" <extensions> + lightArgs: "WinMerge.wixobj" "Filters.wixobj" "Plugins.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> --> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?include Config.wxi ?> @@ -139,99 +139,6 @@ </Component> </DirectoryRef> - <DirectoryRef Id="FILTERSDIR"> - <Component Id="ADAMulti" Guid="*" Win64="$(var.Win64)"> - <File Id="ADAMultiFLT" - Name="ADAMulti.flt" - Source="..\..\Filters\ADAMulti.flt" - Vital="no" /> - </Component> - - <Component Id="ASPNET" Guid="*" Win64="$(var.Win64)"> - <File Id="ASPNETFLT" - Name="ASPNET.flt" - Source="..\..\Filters\ASPNET.flt" - Vital="no" /> - </Component> - - <Component Id="CSharp_loose" Guid="*" Win64="$(var.Win64)"> - <File Id="CSharp_looseFLT" - Name="CSharp_loose.flt" - Source="..\..\Filters\CSharp_loose.flt" - Vital="no" /> - </Component> - - <Component Id="Delphi" Guid="*" Win64="$(var.Win64)"> - <File Id="DelphiFLT" - Name="Delphi.flt" - Source="..\..\Filters\Delphi.flt" - Vital="no" /> - </Component> - - <Component Id="FileFilter" Guid="*" Win64="$(var.Win64)"> - <File Id="FileFilterTMPL" - Name="FileFilter.tmpl" - Source="..\..\Filters\FileFilter.tmpl" - Vital="no" /> - </Component> - - <Component Id="Frontpage" Guid="*" Win64="$(var.Win64)"> - <File Id="FrontpageFLT" - Name="Frontpage.flt" - Source="..\..\Filters\Frontpage.flt" - Vital="no" /> - </Component> - - <Component Id="MASM" Guid="*" Win64="$(var.Win64)"> - <File Id="MASMFLT" - Name="MASM.flt" - Source="..\..\Filters\MASM.flt" - Vital="no" /> - </Component> - - <Component Id="Merge_GnuC_loose" Guid="*" Win64="$(var.Win64)"> - <File Id="Merge_GnuC_looseFLT" - Name="Merge_GnuC_loose.flt" - Source="..\..\Filters\Merge_GnuC_loose.flt" - Vital="no" /> - </Component> - - <Component Id="Merge_VB_loose" Guid="*" Win64="$(var.Win64)"> - <File Id="Merge_VB_looseFLT" - Name="Merge_VB_loose.flt" - Source="..\..\Filters\Merge_VB_loose.flt" - Vital="no" /> - </Component> - - <Component Id="Merge_VC_loose" Guid="*" Win64="$(var.Win64)"> - <File Id="Merge_VC_looseFLT" - Name="Merge_VC_loose.flt" - Source="..\..\Filters\Merge_VC_loose.flt" - Vital="no" /> - </Component> - - <Component Id="SourceControl" Guid="*" Win64="$(var.Win64)"> - <File Id="SourceControlFLT" - Name="SourceControl.flt" - Source="..\..\Filters\SourceControl.flt" - Vital="no" /> - </Component> - - <Component Id="Symbian" Guid="*" Win64="$(var.Win64)"> - <File Id="SymbianFLT" - Name="Symbian.flt" - Source="..\..\Filters\Symbian.flt" - Vital="no" /> - </Component> - - <Component Id="XML_html" Guid="*" Win64="$(var.Win64)"> - <File Id="XML_htmlFLT" - Name="XML_html.flt" - Source="..\..\Filters\XML_html.flt" - Vital="no" /> - </Component> - </DirectoryRef> - <DirectoryRef Id="LANGDIR"> <Component Id="Brazilian" Guid="*" Win64="$(var.Win64)"> <File Id="BrazilianPO" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-04-23 19:55:19
|
Revision: 6703 http://winmerge.svn.sourceforge.net/winmerge/?rev=6703&view=rev Author: gerundt Date: 2009-04-23 19:55:14 +0000 (Thu, 23 Apr 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Move languages definition to a own file Modified Paths: -------------- trunk/Installer/WiX/WinMerge.wixproj trunk/Installer/WiX/WinMerge.wxs Added Paths: ----------- trunk/Installer/WiX/Languages.wxs Added: trunk/Installer/WiX/Languages.wxs =================================================================== --- trunk/Installer/WiX/Languages.wxs (rev 0) +++ trunk/Installer/WiX/Languages.wxs 2009-04-23 19:55:14 UTC (rev 6703) @@ -0,0 +1,203 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include Config.wxi ?> + <Fragment> + <DirectoryRef Id="LANGDIR"> + <Component Id="Brazilian" Guid="*" Win64="$(var.Win64)"> + <File Id="BrazilianPO" + Name="Brazilian.po" + Source="..\..\Src\Languages\Brazilian.po" + Vital="no" /> + </Component> + + <Component Id="Bulgarian" Guid="*" Win64="$(var.Win64)"> + <File Id="BulgarianPO" + Name="Bulgarian.po" + Source="..\..\Src\Languages\Bulgarian.po" + Vital="no" /> + </Component> + + <Component Id="Catalan" Guid="*" Win64="$(var.Win64)"> + <File Id="CatalanPO" + Name="Catalan.po" + Source="..\..\Src\Languages\Catalan.po" + Vital="no" /> + </Component> + + <Component Id="ChineseSimplified" Guid="*" Win64="$(var.Win64)"> + <File Id="ChineseSimplifiedPO" + Name="ChineseSimplified.po" + Source="..\..\Src\Languages\ChineseSimplified.po" + Vital="no" /> + </Component> + + <Component Id="ChineseTraditional" Guid="*" Win64="$(var.Win64)"> + <File Id="ChineseTraditionalPO" + Name="ChineseTraditional.po" + Source="..\..\Src\Languages\ChineseTraditional.po" + Vital="no" /> + </Component> + + <Component Id="Croatian" Guid="*" Win64="$(var.Win64)"> + <File Id="CroatianPO" + Name="Croatian.po" + Source="..\..\Src\Languages\Croatian.po" + Vital="no" /> + </Component> + + <Component Id="Czech" Guid="*" Win64="$(var.Win64)"> + <File Id="CzechPO" + Name="Czech.po" + Source="..\..\Src\Languages\Czech.po" + Vital="no" /> + </Component> + + <Component Id="Danish" Guid="*" Win64="$(var.Win64)"> + <File Id="DanishPO" + Name="Danish.po" + Source="..\..\Src\Languages\Danish.po" + Vital="no" /> + </Component> + + <Component Id="Dutch" Guid="*" Win64="$(var.Win64)"> + <File Id="DutchPO" + Name="Dutch.po" + Source="..\..\Src\Languages\Dutch.po" + Vital="no" /> + </Component> + + <Component Id="French" Guid="*" Win64="$(var.Win64)"> + <File Id="FrenchPO" + Name="French.po" + Source="..\..\Src\Languages\French.po" + Vital="no" /> + </Component> + + <Component Id="Galician" Guid="*" Win64="$(var.Win64)"> + <File Id="GalicianPO" + Name="Galician.po" + Source="..\..\Src\Languages\Galician.po" + Vital="no" /> + </Component> + + <Component Id="German" Guid="*" Win64="$(var.Win64)"> + <File Id="GermanPO" + Name="German.po" + Source="..\..\Src\Languages\German.po" + Vital="no" /> + </Component> + + <Component Id="Greek" Guid="*" Win64="$(var.Win64)"> + <File Id="GreekPO" + Name="Greek.po" + Source="..\..\Src\Languages\Greek.po" + Vital="no" /> + </Component> + + <Component Id="Hungarian" Guid="*" Win64="$(var.Win64)"> + <File Id="HungarianPO" + Name="Hungarian.po" + Source="..\..\Src\Languages\Hungarian.po" + Vital="no" /> + </Component> + + <Component Id="Italian" Guid="*" Win64="$(var.Win64)"> + <File Id="ItalianPO" + Name="Italian.po" + Source="..\..\Src\Languages\Italian.po" + Vital="no" /> + </Component> + + <Component Id="Japanese" Guid="*" Win64="$(var.Win64)"> + <File Id="JapanesePO" + Name="Japanese.po" + Source="..\..\Src\Languages\Japanese.po" + Vital="no" /> + </Component> + + <Component Id="Korean" Guid="*" Win64="$(var.Win64)"> + <File Id="KoreanPO" + Name="Korean.po" + Source="..\..\Src\Languages\Korean.po" + Vital="no" /> + </Component> + + <Component Id="Norwegian" Guid="*" Win64="$(var.Win64)"> + <File Id="NorwegianPO" + Name="Norwegian.po" + Source="..\..\Src\Languages\Norwegian.po" + Vital="no" /> + </Component> + + <Component Id="Polish" Guid="*" Win64="$(var.Win64)"> + <File Id="PolishPO" + Name="Polish.po" + Source="..\..\Src\Languages\Polish.po" + Vital="no" /> + </Component> + + <Component Id="Portuguese" Guid="*" Win64="$(var.Win64)"> + <File Id="PortuguesePO" + Name="Portuguese.po" + Source="..\..\Src\Languages\Portuguese.po" + Vital="no" /> + </Component> + + <Component Id="Romanian" Guid="*" Win64="$(var.Win64)"> + <File Id="RomanianPO" + Name="Romanian.po" + Source="..\..\Src\Languages\Romanian.po" + Vital="no" /> + </Component> + + <Component Id="Russian" Guid="*" Win64="$(var.Win64)"> + <File Id="RussianPO" + Name="Russian.po" + Source="..\..\Src\Languages\Russian.po" + Vital="no" /> + </Component> + + <Component Id="Slovak" Guid="*" Win64="$(var.Win64)"> + <File Id="SlovakPO" + Name="Slovak.po" + Source="..\..\Src\Languages\Slovak.po" + Vital="no" /> + </Component> + + <Component Id="Slovenian" Guid="*" Win64="$(var.Win64)"> + <File Id="SlovenianPO" + Name="Slovenian.po" + Source="..\..\Src\Languages\Slovenian.po" + Vital="no" /> + </Component> + + <Component Id="Spanish" Guid="*" Win64="$(var.Win64)"> + <File Id="SpanishPO" + Name="Spanish.po" + Source="..\..\Src\Languages\Spanish.po" + Vital="no" /> + </Component> + + <Component Id="Swedish" Guid="*" Win64="$(var.Win64)"> + <File Id="SwedishPO" + Name="Swedish.po" + Source="..\..\Src\Languages\Swedish.po" + Vital="no" /> + </Component> + + <Component Id="Turkish" Guid="*" Win64="$(var.Win64)"> + <File Id="TurkishPO" + Name="Turkish.po" + Source="..\..\Src\Languages\Turkish.po" + Vital="no" /> + </Component> + + <Component Id="Ukrainian" Guid="*" Win64="$(var.Win64)"> + <File Id="UkrainianPO" + Name="Ukrainian.po" + Source="..\..\Src\Languages\Ukrainian.po" + Vital="no" /> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Modified: trunk/Installer/WiX/WinMerge.wixproj =================================================================== --- trunk/Installer/WiX/WinMerge.wixproj 2009-04-23 19:48:20 UTC (rev 6702) +++ trunk/Installer/WiX/WinMerge.wixproj 2009-04-23 19:55:14 UTC (rev 6703) @@ -18,6 +18,7 @@ <WixExtension Include="$(WixToolPath)WixUIExtension.dll" /> <Compile Include="WinMerge.wxs"/> <Compile Include="Filters.wxs"/> + <Compile Include="Languages.wxs"/> <Compile Include="Plugins.wxs"/> <Compile Include="Features.wxs"/> <Compile Include="WixUI_WinMerge.wxs"/> Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-23 19:48:20 UTC (rev 6702) +++ trunk/Installer/WiX/WinMerge.wxs 2009-04-23 19:55:14 UTC (rev 6703) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - candleArgs: "WinMerge.wxs" "Filters.wxs" "Plugins.wxs" "Features.wxs" "WixUI_WinMerge.wxs" <extensions> - lightArgs: "WinMerge.wixobj" "Filters.wixobj" "Plugins.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> + candleArgs: "WinMerge.wxs" "Filters.wxs" "Plugins.wxs" "Languages.wxs" "Features.wxs" "WixUI_WinMerge.wxs" <extensions> + lightArgs: "WinMerge.wixobj" "Filters.wixobj" "Plugins.wixobj" "Languages.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> --> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?include Config.wxi ?> @@ -139,204 +139,6 @@ </Component> </DirectoryRef> - <DirectoryRef Id="LANGDIR"> - <Component Id="Brazilian" Guid="*" Win64="$(var.Win64)"> - <File Id="BrazilianPO" - Name="Brazilian.po" - Source="..\..\Src\Languages\Brazilian.po" - Vital="no" /> - </Component> - - <Component Id="Bulgarian" Guid="*" Win64="$(var.Win64)"> - <File Id="BulgarianPO" - Name="Bulgarian.po" - Source="..\..\Src\Languages\Bulgarian.po" - Vital="no" /> - </Component> - - <Component Id="Catalan" Guid="*" Win64="$(var.Win64)"> - <File Id="CatalanPO" - Name="Catalan.po" - Source="..\..\Src\Languages\Catalan.po" - Vital="no" /> - </Component> - - <Component Id="ChineseSimplified" Guid="*" Win64="$(var.Win64)"> - <File Id="ChineseSimplifiedPO" - Name="ChineseSimplified.po" - Source="..\..\Src\Languages\ChineseSimplified.po" - Vital="no" /> - </Component> - - <Component Id="ChineseTraditional" Guid="*" Win64="$(var.Win64)"> - <File Id="ChineseTraditionalPO" - Name="ChineseTraditional.po" - Source="..\..\Src\Languages\ChineseTraditional.po" - Vital="no" /> - </Component> - - <Component Id="Croatian" Guid="*" Win64="$(var.Win64)"> - <File Id="CroatianPO" - Name="Croatian.po" - Source="..\..\Src\Languages\Croatian.po" - Vital="no" /> - </Component> - - <Component Id="Czech" Guid="*" Win64="$(var.Win64)"> - <File Id="CzechPO" - Name="Czech.po" - Source="..\..\Src\Languages\Czech.po" - Vital="no" /> - </Component> - - <Component Id="Danish" Guid="*" Win64="$(var.Win64)"> - <File Id="DanishPO" - Name="Danish.po" - Source="..\..\Src\Languages\Danish.po" - Vital="no" /> - </Component> - - <Component Id="Dutch" Guid="*" Win64="$(var.Win64)"> - <File Id="DutchPO" - Name="Dutch.po" - Source="..\..\Src\Languages\Dutch.po" - Vital="no" /> - </Component> - - <Component Id="French" Guid="*" Win64="$(var.Win64)"> - <File Id="FrenchPO" - Name="French.po" - Source="..\..\Src\Languages\French.po" - Vital="no" /> - </Component> - - <Component Id="Galician" Guid="*" Win64="$(var.Win64)"> - <File Id="GalicianPO" - Name="Galician.po" - Source="..\..\Src\Languages\Galician.po" - Vital="no" /> - </Component> - - <Component Id="German" Guid="*" Win64="$(var.Win64)"> - <File Id="GermanPO" - Name="German.po" - Source="..\..\Src\Languages\German.po" - Vital="no" /> - </Component> - - <Component Id="Greek" Guid="*" Win64="$(var.Win64)"> - <File Id="GreekPO" - Name="Greek.po" - Source="..\..\Src\Languages\Greek.po" - Vital="no" /> - </Component> - - <Component Id="Hungarian" Guid="*" Win64="$(var.Win64)"> - <File Id="HungarianPO" - Name="Hungarian.po" - Source="..\..\Src\Languages\Hungarian.po" - Vital="no" /> - </Component> - - <Component Id="Italian" Guid="*" Win64="$(var.Win64)"> - <File Id="ItalianPO" - Name="Italian.po" - Source="..\..\Src\Languages\Italian.po" - Vital="no" /> - </Component> - - <Component Id="Japanese" Guid="*" Win64="$(var.Win64)"> - <File Id="JapanesePO" - Name="Japanese.po" - Source="..\..\Src\Languages\Japanese.po" - Vital="no" /> - </Component> - - <Component Id="Korean" Guid="*" Win64="$(var.Win64)"> - <File Id="KoreanPO" - Name="Korean.po" - Source="..\..\Src\Languages\Korean.po" - Vital="no" /> - </Component> - - <Component Id="Norwegian" Guid="*" Win64="$(var.Win64)"> - <File Id="NorwegianPO" - Name="Norwegian.po" - Source="..\..\Src\Languages\Norwegian.po" - Vital="no" /> - </Component> - - <Component Id="Polish" Guid="*" Win64="$(var.Win64)"> - <File Id="PolishPO" - Name="Polish.po" - Source="..\..\Src\Languages\Polish.po" - Vital="no" /> - </Component> - - <Component Id="Portuguese" Guid="*" Win64="$(var.Win64)"> - <File Id="PortuguesePO" - Name="Portuguese.po" - Source="..\..\Src\Languages\Portuguese.po" - Vital="no" /> - </Component> - - <Component Id="Romanian" Guid="*" Win64="$(var.Win64)"> - <File Id="RomanianPO" - Name="Romanian.po" - Source="..\..\Src\Languages\Romanian.po" - Vital="no" /> - </Component> - - <Component Id="Russian" Guid="*" Win64="$(var.Win64)"> - <File Id="RussianPO" - Name="Russian.po" - Source="..\..\Src\Languages\Russian.po" - Vital="no" /> - </Component> - - <Component Id="Slovak" Guid="*" Win64="$(var.Win64)"> - <File Id="SlovakPO" - Name="Slovak.po" - Source="..\..\Src\Languages\Slovak.po" - Vital="no" /> - </Component> - - <Component Id="Slovenian" Guid="*" Win64="$(var.Win64)"> - <File Id="SlovenianPO" - Name="Slovenian.po" - Source="..\..\Src\Languages\Slovenian.po" - Vital="no" /> - </Component> - - <Component Id="Spanish" Guid="*" Win64="$(var.Win64)"> - <File Id="SpanishPO" - Name="Spanish.po" - Source="..\..\Src\Languages\Spanish.po" - Vital="no" /> - </Component> - - <Component Id="Swedish" Guid="*" Win64="$(var.Win64)"> - <File Id="SwedishPO" - Name="Swedish.po" - Source="..\..\Src\Languages\Swedish.po" - Vital="no" /> - </Component> - - <Component Id="Turkish" Guid="*" Win64="$(var.Win64)"> - <File Id="TurkishPO" - Name="Turkish.po" - Source="..\..\Src\Languages\Turkish.po" - Vital="no" /> - </Component> - - <Component Id="Ukrainian" Guid="*" Win64="$(var.Win64)"> - <File Id="UkrainianPO" - Name="Ukrainian.po" - Source="..\..\Src\Languages\Ukrainian.po" - Vital="no" /> - </Component> - </DirectoryRef> - <FeatureRef Id="WinMerge" /> <!-- TODO: Works this really? --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-05-02 14:35:57
|
Revision: 6711 http://winmerge.svn.sourceforge.net/winmerge/?rev=6711&view=rev Author: gerundt Date: 2009-05-02 14:35:54 +0000 (Sat, 02 May 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Install startmenu shortcuts Modified Paths: -------------- trunk/Installer/WiX/Config.wxi trunk/Installer/WiX/Features.wxs trunk/Installer/WiX/WinMerge.wxs Modified: trunk/Installer/WiX/Config.wxi =================================================================== --- trunk/Installer/WiX/Config.wxi 2009-04-28 20:34:00 UTC (rev 6710) +++ trunk/Installer/WiX/Config.wxi 2009-05-02 14:35:54 UTC (rev 6711) @@ -17,6 +17,8 @@ <?define MergeBuildDir = "..\..\Build\x64\MergeRelease" ?> <?define ExpatBuildDir = "..\..\Build\expat\lib\x64\Release" ?> <?define PcreBuildDir = "..\..\Build\pcre\lib\x64\Release" ?> + + <?define StartMenuShortcutsGuid = "CDC49AA0-DC37-439d-8358-68E2EA9EF909" ?> <?else ?> <?define Win64 = "no" ?> <?define PackagePlatform = "x86" ?> @@ -26,5 +28,7 @@ <?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?> <?define ExpatBuildDir = "..\..\Build\expat" ?> <?define PcreBuildDir = "..\..\Build\pcre" ?> + + <?define StartMenuShortcutsGuid = "12413436-9929-453c-870B-03146CE11960" ?> <?endif ?> </Include> \ No newline at end of file Modified: trunk/Installer/WiX/Features.wxs =================================================================== --- trunk/Installer/WiX/Features.wxs 2009-04-28 20:34:00 UTC (rev 6710) +++ trunk/Installer/WiX/Features.wxs 2009-05-02 14:35:54 UTC (rev 6711) @@ -24,6 +24,12 @@ Title="Shell Extension"> <ComponentRef Id="ShellExtension" /> </Feature> + <Feature Id="StartMenuShortcuts" + AllowAdvertise="no" + Level="1" + Title="Startmenu shortcut"> + <ComponentRef Id="StartMenuShortcuts" /> + </Feature> <Feature Id="Documentation" Absent="disallow" AllowAdvertise="no" Display="hidden" Level="1" Title="Documentation"> <ComponentRef Id="Files" /> <ComponentRef Id="Contributors" /> Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-04-28 20:34:00 UTC (rev 6710) +++ trunk/Installer/WiX/WinMerge.wxs 2009-05-02 14:35:54 UTC (rev 6711) @@ -8,7 +8,6 @@ <!-- TODO: * Install all files - * Create start menu items * Mutli-language support * ... --> @@ -44,6 +43,9 @@ <Directory Id="PLUGINSDIR" Name="MergePlugins" /> </Directory> </Directory> + <Directory Id="ProgramMenuFolder"> + <Directory Id="WinMergeMenuFolder" Name="WinMerge" /> + </Directory> </Directory> <DirectoryRef Id="INSTALLDIR"> @@ -139,6 +141,26 @@ </Component> </DirectoryRef> + <!-- Startmenu shortcuts --> + <DirectoryRef Id="WinMergeMenuFolder"> + <Component Id="StartMenuShortcuts" Guid="$(var.StartMenuShortcutsGuid)" Win64="$(var.Win64)"> + <Shortcut Id="WinMergeStartMenuShortcut" + Name="WinMerge" + Target="[INSTALLDIR]WinMergeU.exe" + WorkingDirectory="INSTALLDIR" /> + <Shortcut Id="ReadMeStartMenuShortcut" + Name="Read Me" + Target="[INSTALLDIR]Docs\ReadMe.txt" + WorkingDirectory="INSTALLDIR" /> + <Shortcut Id="HelpStartMenuShortcut" + Name="WinMerge Help" + Target="[INSTALLDIR]Docs\WinMerge.chm" + WorkingDirectory="INSTALLDIR" /> + <RemoveFolder Id="WinMergeMenuFolder" On="uninstall" /> + <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" /> + </Component> + </DirectoryRef> + <FeatureRef Id="WinMerge" /> <!-- TODO: Works this really? --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-05-22 12:06:19
|
Revision: 6771 http://winmerge.svn.sourceforge.net/winmerge/?rev=6771&view=rev Author: gerundt Date: 2009-05-22 12:05:33 +0000 (Fri, 22 May 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Install desktop shortcut Modified Paths: -------------- trunk/Installer/WiX/Config.wxi trunk/Installer/WiX/Features.wxs trunk/Installer/WiX/WinMerge.wxs Modified: trunk/Installer/WiX/Config.wxi =================================================================== --- trunk/Installer/WiX/Config.wxi 2009-05-20 17:21:38 UTC (rev 6770) +++ trunk/Installer/WiX/Config.wxi 2009-05-22 12:05:33 UTC (rev 6771) @@ -24,6 +24,7 @@ <?define PcreBuildDir = "..\..\Build\pcre\lib\x64\Release" ?> <?define StartMenuShortcutsGuid = "CDC49AA0-DC37-439d-8358-68E2EA9EF909" ?> + <?define DesktopShortcutGuid = "CFF6BDA0-483F-496e-819F-0FC8874C2B9C" ?> <?else ?> <!-- if "x86" platform --> <?define Win64 = "no" ?> <?define PackagePlatform = "x86" ?> @@ -35,5 +36,6 @@ <?define PcreBuildDir = "..\..\Build\pcre" ?> <?define StartMenuShortcutsGuid = "12413436-9929-453c-870B-03146CE11960" ?> + <?define DesktopShortcutGuid = "36035411-C6BE-43e8-B569-B1EC325D180C" ?> <?endif ?> </Include> \ No newline at end of file Modified: trunk/Installer/WiX/Features.wxs =================================================================== --- trunk/Installer/WiX/Features.wxs 2009-05-20 17:21:38 UTC (rev 6770) +++ trunk/Installer/WiX/Features.wxs 2009-05-22 12:05:33 UTC (rev 6771) @@ -30,6 +30,12 @@ Title="Startmenu shortcut"> <ComponentRef Id="StartMenuShortcuts" /> </Feature> + <Feature Id="DesktopShortcut" + AllowAdvertise="no" + Level="1" + Title="Desktop shortcut"> + <ComponentRef Id="DesktopShortcut" /> + </Feature> <Feature Id="Documentation" Absent="disallow" AllowAdvertise="no" Display="hidden" Level="1" Title="Documentation"> <ComponentRef Id="Files" /> <ComponentRef Id="Contributors" /> Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-05-20 17:21:38 UTC (rev 6770) +++ trunk/Installer/WiX/WinMerge.wxs 2009-05-22 12:05:33 UTC (rev 6771) @@ -7,6 +7,17 @@ <?include Config.wxi ?> <!-- TODO: + * Tasks + * Shortcuts + * Quick Launch + * Integrate to... + * TortoiseCVS + * TortoiseSVN + * ClearCase + * Modify Path + * Don't install 32 bit version von Windows x64 + * Install C++ Runtime files + * Separate page for tasks (shortcuts, TortoiseSVN, ...) * Install all files * Mutli-language support * ... @@ -46,6 +57,7 @@ <Directory Id="ProgramMenuFolder"> <Directory Id="WinMergeMenuFolder" Name="WinMerge" /> </Directory> + <Directory Id="DesktopFolder" /> </Directory> <DirectoryRef Id="INSTALLDIR"> @@ -161,6 +173,17 @@ </Component> </DirectoryRef> + <!-- Desktop shortcut --> + <DirectoryRef Id="DesktopFolder"> + <Component Id="DesktopShortcut" Guid="$(var.DesktopShortcutGuid)" Win64="$(var.Win64)"> + <Shortcut Id="WinMergeDesktopShortcut" + Name="WinMerge" + Target="[INSTALLDIR]WinMergeU.exe" + WorkingDirectory="INSTALLDIR" /> + <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" /> + </Component> + </DirectoryRef> + <FeatureRef Id="WinMerge" /> <!-- TODO: Works this really? --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-05-26 14:03:26
|
Revision: 6787 http://winmerge.svn.sourceforge.net/winmerge/?rev=6787&view=rev Author: gerundt Date: 2009-05-26 13:56:42 +0000 (Tue, 26 May 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Move core and docs files definition to a own files Modified Paths: -------------- trunk/Installer/WiX/WinMerge.wixproj trunk/Installer/WiX/WinMerge.wxs Added Paths: ----------- trunk/Installer/WiX/Core.wxs trunk/Installer/WiX/Docs.wxs Added: trunk/Installer/WiX/Core.wxs =================================================================== --- trunk/Installer/WiX/Core.wxs (rev 0) +++ trunk/Installer/WiX/Core.wxs 2009-05-26 13:56:42 UTC (rev 6787) @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include Config.wxi ?> + <Fragment> + <DirectoryRef Id="INSTALLDIR"> + <Component Id="WinMergeU" Guid="*" Win64="$(var.Win64)"> + <File Id="WinMergeUEXE" + Name="WinMergeU.exe" + Source="$(var.MergeBuildDir)\WinMergeU.exe" + Vital="yes" /> + </Component> + + <Component Id="libexpat" Guid="*" Win64="$(var.Win64)"> + <File Id="libexpatDLL" + Name="libexpat.dll" + Source="$(var.ExpatBuildDir)\libexpat.dll" + Vital="yes" /> + </Component> + + <Component Id="pcre" Guid="*" Win64="$(var.Win64)"> + <File Id="pcreDLL" + Name="pcre.dll" + Source="$(var.PcreBuildDir)\pcre.dll" + Vital="yes" /> + </Component> + + <Component Id="MergeLang" Guid="*" Win64="$(var.Win64)"> + <File Id="MergeLangDLL" + Name="MergeLang.dll" + Source="$(var.MergeBuildDir)\MergeLang.dll" + Vital="yes" /> + </Component> + + <Component Id="Files" Guid="*" Win64="$(var.Win64)"> + <File Id="FilesTXT" + Name="Files.txt" + Source="..\..\Docs\Users\Files.txt" + Vital="no" /> + </Component> + + <Component Id="Contributors" Guid="*" Win64="$(var.Win64)"> + <File Id="ContributorsTXT" + Name="Contributors.txt" + Source="..\..\Docs\Users\Contributors.txt" + Vital="no" /> + </Component> + </DirectoryRef> + + <!-- Shell Extension --> + <DirectoryRef Id="INSTALLDIR"> + <Component Id="ShellExtension" Guid="*" Win64="$(var.Win64)"> + <?if $(var.Platform) = "x64" ?> + <File Id="ShellExtensionX64DLL" + Name="ShellExtensionX64.dll" + SelfRegCost="1" + Source="..\..\Build\ShellExtensionX64\ShellExtensionX64.dll" + Vital="yes" /> + <?else ?> + <File Id="ShellExtensionUDLL" + Name="ShellExtensionU.dll" + SelfRegCost="1" + Source="$(var.MergeBuildDir)\ShellExtensionU.dll" + Vital="yes" /> + <?endif ?> + </Component> + </DirectoryRef> + + <!-- Startmenu shortcuts --> + <DirectoryRef Id="WinMergeMenuFolder"> + <Component Id="StartMenuShortcuts" Guid="$(var.StartMenuShortcutsGuid)" Win64="$(var.Win64)"> + <Shortcut Id="WinMergeStartMenuShortcut" + Name="WinMerge" + Target="[INSTALLDIR]WinMergeU.exe" + WorkingDirectory="INSTALLDIR" /> + <Shortcut Id="ReadMeStartMenuShortcut" + Name="Read Me" + Target="[INSTALLDIR]Docs\ReadMe.txt" + WorkingDirectory="INSTALLDIR" /> + <Shortcut Id="HelpStartMenuShortcut" + Name="WinMerge Help" + Target="[INSTALLDIR]Docs\WinMerge.chm" + WorkingDirectory="INSTALLDIR" /> + <RemoveFolder Id="WinMergeMenuFolder" On="uninstall" /> + <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" /> + </Component> + </DirectoryRef> + + <!-- Desktop shortcut --> + <DirectoryRef Id="DesktopFolder"> + <Component Id="DesktopShortcut" Guid="$(var.DesktopShortcutGuid)" Win64="$(var.Win64)"> + <Shortcut Id="WinMergeDesktopShortcut" + Name="WinMerge" + Target="[INSTALLDIR]WinMergeU.exe" + WorkingDirectory="INSTALLDIR" /> + <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" /> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Added: trunk/Installer/WiX/Docs.wxs =================================================================== --- trunk/Installer/WiX/Docs.wxs (rev 0) +++ trunk/Installer/WiX/Docs.wxs 2009-05-26 13:56:42 UTC (rev 6787) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include Config.wxi ?> + <Fragment> + <DirectoryRef Id="DOCSDIR"> + <Component Id="ReadMe" Guid="*" Win64="$(var.Win64)"> + <File Id="ReadMeTXT" + Name="ReadMe.txt" + Source="..\..\Docs\Users\ReadMe.txt" + Vital="no" /> + </Component> + + <Component Id="ReleaseNotes" Guid="*" Win64="$(var.Win64)"> + <File Id="ReleaseNotesHTML" + Name="ReleaseNotes.html" + Source="..\..\Docs\Users\ReleaseNotes.html" + Vital="no" /> + </Component> + + <Component Id="ChangeLog" Guid="*" Win64="$(var.Win64)"> + <File Id="ChangeLogTXT" + Name="ChangeLog.txt" + Source="..\..\Docs\Users\ChangeLog.txt" + Vital="no" /> + </Component> + + <Component Id="WinMergeHelp" Guid="*" Win64="$(var.Win64)"> + <File Id="WinMergeCHM" + Name="WinMerge.chm" + Source="..\..\Build\Manual\htmlhelp\WinMerge.chm" + Vital="no" /> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Modified: trunk/Installer/WiX/WinMerge.wixproj =================================================================== --- trunk/Installer/WiX/WinMerge.wixproj 2009-05-26 13:30:14 UTC (rev 6786) +++ trunk/Installer/WiX/WinMerge.wixproj 2009-05-26 13:56:42 UTC (rev 6787) @@ -17,6 +17,8 @@ <ItemGroup> <WixExtension Include="$(WixToolPath)WixUIExtension.dll" /> <Compile Include="WinMerge.wxs"/> + <Compile Include="Core.wxs"/> + <Compile Include="Docs.wxs"/> <Compile Include="Filters.wxs"/> <Compile Include="Languages.wxs"/> <Compile Include="Plugins.wxs"/> Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-05-26 13:30:14 UTC (rev 6786) +++ trunk/Installer/WiX/WinMerge.wxs 2009-05-26 13:56:42 UTC (rev 6787) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - candleArgs: "WinMerge.wxs" "Filters.wxs" "Plugins.wxs" "Languages.wxs" "Features.wxs" "WixUI_WinMerge.wxs" <extensions> - lightArgs: "WinMerge.wixobj" "Filters.wixobj" "Plugins.wixobj" "Languages.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> + candleArgs: "WinMerge.wxs" "Core.wxs" "Docs.wxs" "Filters.wxs" "Plugins.wxs" "Languages.wxs" "Features.wxs" "WixUI_WinMerge.wxs" <extensions> + lightArgs: "WinMerge.wixobj" "Core.wixobj" "Docs.wixobj" "Filters.wixobj" "Plugins.wixobj" "Languages.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> --> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?include Config.wxi ?> @@ -18,7 +18,8 @@ * Don't install 32 bit version von Windows x64 * Install C++ Runtime files * Separate page for tasks (shortcuts, TortoiseSVN, ...) - * Install all files + * Install translated readme files + * Set WinMerge language * Mutli-language support * ... --> @@ -60,130 +61,6 @@ <Directory Id="DesktopFolder" /> </Directory> - <DirectoryRef Id="INSTALLDIR"> - <Component Id="WinMergeU" Guid="*" Win64="$(var.Win64)"> - <File Id="WinMergeUEXE" - Name="WinMergeU.exe" - Source="$(var.MergeBuildDir)\WinMergeU.exe" - Vital="yes" /> - </Component> - - <Component Id="libexpat" Guid="*" Win64="$(var.Win64)"> - <File Id="libexpatDLL" - Name="libexpat.dll" - Source="$(var.ExpatBuildDir)\libexpat.dll" - Vital="yes" /> - </Component> - - <Component Id="pcre" Guid="*" Win64="$(var.Win64)"> - <File Id="pcreDLL" - Name="pcre.dll" - Source="$(var.PcreBuildDir)\pcre.dll" - Vital="yes" /> - </Component> - - <Component Id="MergeLang" Guid="*" Win64="$(var.Win64)"> - <File Id="MergeLangDLL" - Name="MergeLang.dll" - Source="$(var.MergeBuildDir)\MergeLang.dll" - Vital="yes" /> - </Component> - - <Component Id="Files" Guid="*" Win64="$(var.Win64)"> - <File Id="FilesTXT" - Name="Files.txt" - Source="..\..\Docs\Users\Files.txt" - Vital="no" /> - </Component> - - <Component Id="Contributors" Guid="*" Win64="$(var.Win64)"> - <File Id="ContributorsTXT" - Name="Contributors.txt" - Source="..\..\Docs\Users\Contributors.txt" - Vital="no" /> - </Component> - </DirectoryRef> - - <!-- Shell Extension --> - <DirectoryRef Id="INSTALLDIR"> - <Component Id="ShellExtension" Guid="*" Win64="$(var.Win64)"> - <?if $(var.Platform) = "x64" ?> - <File Id="ShellExtensionX64DLL" - Name="ShellExtensionX64.dll" - SelfRegCost="1" - Source="..\..\Build\ShellExtensionX64\ShellExtensionX64.dll" - Vital="yes" /> - <?else ?> - <File Id="ShellExtensionUDLL" - Name="ShellExtensionU.dll" - SelfRegCost="1" - Source="$(var.MergeBuildDir)\ShellExtensionU.dll" - Vital="yes" /> - <?endif ?> - </Component> - </DirectoryRef> - - <DirectoryRef Id="DOCSDIR"> - <Component Id="ReadMe" Guid="*" Win64="$(var.Win64)"> - <File Id="ReadMeTXT" - Name="ReadMe.txt" - Source="..\..\Docs\Users\ReadMe.txt" - Vital="no" /> - </Component> - - <Component Id="ReleaseNotes" Guid="*" Win64="$(var.Win64)"> - <File Id="ReleaseNotesHTML" - Name="ReleaseNotes.html" - Source="..\..\Docs\Users\ReleaseNotes.html" - Vital="no" /> - </Component> - - <Component Id="ChangeLog" Guid="*" Win64="$(var.Win64)"> - <File Id="ChangeLogTXT" - Name="ChangeLog.txt" - Source="..\..\Docs\Users\ChangeLog.txt" - Vital="no" /> - </Component> - - <Component Id="WinMergeHelp" Guid="*" Win64="$(var.Win64)"> - <File Id="WinMergeCHM" - Name="WinMerge.chm" - Source="..\..\Build\Manual\htmlhelp\WinMerge.chm" - Vital="no" /> - </Component> - </DirectoryRef> - - <!-- Startmenu shortcuts --> - <DirectoryRef Id="WinMergeMenuFolder"> - <Component Id="StartMenuShortcuts" Guid="$(var.StartMenuShortcutsGuid)" Win64="$(var.Win64)"> - <Shortcut Id="WinMergeStartMenuShortcut" - Name="WinMerge" - Target="[INSTALLDIR]WinMergeU.exe" - WorkingDirectory="INSTALLDIR" /> - <Shortcut Id="ReadMeStartMenuShortcut" - Name="Read Me" - Target="[INSTALLDIR]Docs\ReadMe.txt" - WorkingDirectory="INSTALLDIR" /> - <Shortcut Id="HelpStartMenuShortcut" - Name="WinMerge Help" - Target="[INSTALLDIR]Docs\WinMerge.chm" - WorkingDirectory="INSTALLDIR" /> - <RemoveFolder Id="WinMergeMenuFolder" On="uninstall" /> - <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" /> - </Component> - </DirectoryRef> - - <!-- Desktop shortcut --> - <DirectoryRef Id="DesktopFolder"> - <Component Id="DesktopShortcut" Guid="$(var.DesktopShortcutGuid)" Win64="$(var.Win64)"> - <Shortcut Id="WinMergeDesktopShortcut" - Name="WinMerge" - Target="[INSTALLDIR]WinMergeU.exe" - WorkingDirectory="INSTALLDIR" /> - <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" /> - </Component> - </DirectoryRef> - <FeatureRef Id="WinMerge" /> <!-- TODO: Works this really? --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-05-26 14:10:39
|
Revision: 6788 http://winmerge.svn.sourceforge.net/winmerge/?rev=6788&view=rev Author: gerundt Date: 2009-05-26 14:10:35 +0000 (Tue, 26 May 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Move fragment files to a own folder Modified Paths: -------------- trunk/Installer/WiX/WinMerge.wixproj trunk/Installer/WiX/WinMerge.wxs Added Paths: ----------- trunk/Installer/WiX/Fragments/ trunk/Installer/WiX/Fragments/Core.wxs trunk/Installer/WiX/Fragments/Docs.wxs trunk/Installer/WiX/Fragments/Features.wxs trunk/Installer/WiX/Fragments/Filters.wxs trunk/Installer/WiX/Fragments/Languages.wxs trunk/Installer/WiX/Fragments/Plugins.wxs trunk/Installer/WiX/Fragments/WixUI_WinMerge.wxs Removed Paths: ------------- trunk/Installer/WiX/Core.wxs trunk/Installer/WiX/Docs.wxs trunk/Installer/WiX/Features.wxs trunk/Installer/WiX/Filters.wxs trunk/Installer/WiX/Languages.wxs trunk/Installer/WiX/Plugins.wxs trunk/Installer/WiX/WixUI_WinMerge.wxs Deleted: trunk/Installer/WiX/Core.wxs =================================================================== --- trunk/Installer/WiX/Core.wxs 2009-05-26 13:56:42 UTC (rev 6787) +++ trunk/Installer/WiX/Core.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <?include Config.wxi ?> - <Fragment> - <DirectoryRef Id="INSTALLDIR"> - <Component Id="WinMergeU" Guid="*" Win64="$(var.Win64)"> - <File Id="WinMergeUEXE" - Name="WinMergeU.exe" - Source="$(var.MergeBuildDir)\WinMergeU.exe" - Vital="yes" /> - </Component> - - <Component Id="libexpat" Guid="*" Win64="$(var.Win64)"> - <File Id="libexpatDLL" - Name="libexpat.dll" - Source="$(var.ExpatBuildDir)\libexpat.dll" - Vital="yes" /> - </Component> - - <Component Id="pcre" Guid="*" Win64="$(var.Win64)"> - <File Id="pcreDLL" - Name="pcre.dll" - Source="$(var.PcreBuildDir)\pcre.dll" - Vital="yes" /> - </Component> - - <Component Id="MergeLang" Guid="*" Win64="$(var.Win64)"> - <File Id="MergeLangDLL" - Name="MergeLang.dll" - Source="$(var.MergeBuildDir)\MergeLang.dll" - Vital="yes" /> - </Component> - - <Component Id="Files" Guid="*" Win64="$(var.Win64)"> - <File Id="FilesTXT" - Name="Files.txt" - Source="..\..\Docs\Users\Files.txt" - Vital="no" /> - </Component> - - <Component Id="Contributors" Guid="*" Win64="$(var.Win64)"> - <File Id="ContributorsTXT" - Name="Contributors.txt" - Source="..\..\Docs\Users\Contributors.txt" - Vital="no" /> - </Component> - </DirectoryRef> - - <!-- Shell Extension --> - <DirectoryRef Id="INSTALLDIR"> - <Component Id="ShellExtension" Guid="*" Win64="$(var.Win64)"> - <?if $(var.Platform) = "x64" ?> - <File Id="ShellExtensionX64DLL" - Name="ShellExtensionX64.dll" - SelfRegCost="1" - Source="..\..\Build\ShellExtensionX64\ShellExtensionX64.dll" - Vital="yes" /> - <?else ?> - <File Id="ShellExtensionUDLL" - Name="ShellExtensionU.dll" - SelfRegCost="1" - Source="$(var.MergeBuildDir)\ShellExtensionU.dll" - Vital="yes" /> - <?endif ?> - </Component> - </DirectoryRef> - - <!-- Startmenu shortcuts --> - <DirectoryRef Id="WinMergeMenuFolder"> - <Component Id="StartMenuShortcuts" Guid="$(var.StartMenuShortcutsGuid)" Win64="$(var.Win64)"> - <Shortcut Id="WinMergeStartMenuShortcut" - Name="WinMerge" - Target="[INSTALLDIR]WinMergeU.exe" - WorkingDirectory="INSTALLDIR" /> - <Shortcut Id="ReadMeStartMenuShortcut" - Name="Read Me" - Target="[INSTALLDIR]Docs\ReadMe.txt" - WorkingDirectory="INSTALLDIR" /> - <Shortcut Id="HelpStartMenuShortcut" - Name="WinMerge Help" - Target="[INSTALLDIR]Docs\WinMerge.chm" - WorkingDirectory="INSTALLDIR" /> - <RemoveFolder Id="WinMergeMenuFolder" On="uninstall" /> - <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" /> - </Component> - </DirectoryRef> - - <!-- Desktop shortcut --> - <DirectoryRef Id="DesktopFolder"> - <Component Id="DesktopShortcut" Guid="$(var.DesktopShortcutGuid)" Win64="$(var.Win64)"> - <Shortcut Id="WinMergeDesktopShortcut" - Name="WinMerge" - Target="[INSTALLDIR]WinMergeU.exe" - WorkingDirectory="INSTALLDIR" /> - <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" /> - </Component> - </DirectoryRef> - </Fragment> -</Wix> Deleted: trunk/Installer/WiX/Docs.wxs =================================================================== --- trunk/Installer/WiX/Docs.wxs 2009-05-26 13:56:42 UTC (rev 6787) +++ trunk/Installer/WiX/Docs.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <?include Config.wxi ?> - <Fragment> - <DirectoryRef Id="DOCSDIR"> - <Component Id="ReadMe" Guid="*" Win64="$(var.Win64)"> - <File Id="ReadMeTXT" - Name="ReadMe.txt" - Source="..\..\Docs\Users\ReadMe.txt" - Vital="no" /> - </Component> - - <Component Id="ReleaseNotes" Guid="*" Win64="$(var.Win64)"> - <File Id="ReleaseNotesHTML" - Name="ReleaseNotes.html" - Source="..\..\Docs\Users\ReleaseNotes.html" - Vital="no" /> - </Component> - - <Component Id="ChangeLog" Guid="*" Win64="$(var.Win64)"> - <File Id="ChangeLogTXT" - Name="ChangeLog.txt" - Source="..\..\Docs\Users\ChangeLog.txt" - Vital="no" /> - </Component> - - <Component Id="WinMergeHelp" Guid="*" Win64="$(var.Win64)"> - <File Id="WinMergeCHM" - Name="WinMerge.chm" - Source="..\..\Build\Manual\htmlhelp\WinMerge.chm" - Vital="no" /> - </Component> - </DirectoryRef> - </Fragment> -</Wix> Deleted: trunk/Installer/WiX/Features.wxs =================================================================== --- trunk/Installer/WiX/Features.wxs 2009-05-26 13:56:42 UTC (rev 6787) +++ trunk/Installer/WiX/Features.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <?include Config.wxi ?> - <Fragment> - <!-- - * Level <= 3 is "Typical" - * Level <= 1000 is "Complete" - --> - <Feature Id="WinMerge" - Absent="disallow" - AllowAdvertise="no" - ConfigurableDirectory="INSTALLDIR" - Display="expand" - Level="1" - Title="WinMerge"> - <ComponentRef Id="WinMergeU" /> - <ComponentRef Id="libexpat" /> - <ComponentRef Id="pcre" /> - <ComponentRef Id="MergeLang" /> - <Feature Id="ShellExtension" - AllowAdvertise="no" - Description="Explorer context menu integration" - Level="1" - Title="Shell Extension"> - <ComponentRef Id="ShellExtension" /> - </Feature> - <Feature Id="StartMenuShortcuts" - AllowAdvertise="no" - Level="1" - Title="Startmenu shortcut"> - <ComponentRef Id="StartMenuShortcuts" /> - </Feature> - <Feature Id="DesktopShortcut" - AllowAdvertise="no" - Level="1" - Title="Desktop shortcut"> - <ComponentRef Id="DesktopShortcut" /> - </Feature> - <Feature Id="Documentation" Absent="disallow" AllowAdvertise="no" Display="hidden" Level="1" Title="Documentation"> - <ComponentRef Id="Files" /> - <ComponentRef Id="Contributors" /> - <ComponentRef Id="ReadMe" /> - <ComponentRef Id="ReleaseNotes" /> - <ComponentRef Id="ChangeLog" /> - <ComponentRef Id="WinMergeHelp" /> - </Feature> - <Feature Id="Filters" AllowAdvertise="no" Level="1" Title="Filters"> - <ComponentRef Id="ADAMulti" /> - <ComponentRef Id="ASPNET" /> - <ComponentRef Id="CSharp_loose" /> - <ComponentRef Id="Delphi" /> - <ComponentRef Id="FileFilter" /> - <ComponentRef Id="Frontpage" /> - <ComponentRef Id="MASM" /> - <ComponentRef Id="Merge_GnuC_loose" /> - <ComponentRef Id="Merge_VB_loose" /> - <ComponentRef Id="Merge_VC_loose" /> - <ComponentRef Id="SourceControl" /> - <ComponentRef Id="Symbian" /> - <ComponentRef Id="XML_html" /> - </Feature> - <Feature Id="Languages" AllowAdvertise="no" Level="1" Title="Languages"> - <ComponentRef Id="Brazilian" /> - <ComponentRef Id="Bulgarian" /> - <ComponentRef Id="Catalan" /> - <ComponentRef Id="ChineseSimplified" /> - <ComponentRef Id="ChineseTraditional" /> - <ComponentRef Id="Croatian" /> - <ComponentRef Id="Czech" /> - <ComponentRef Id="Danish" /> - <ComponentRef Id="Dutch" /> - <ComponentRef Id="French" /> - <ComponentRef Id="Galician" /> - <ComponentRef Id="German" /> - <ComponentRef Id="Greek" /> - <ComponentRef Id="Hungarian" /> - <ComponentRef Id="Italian" /> - <ComponentRef Id="Japanese" /> - <ComponentRef Id="Korean" /> - <ComponentRef Id="Norwegian" /> - <ComponentRef Id="Polish" /> - <ComponentRef Id="Portuguese" /> - <ComponentRef Id="Romanian" /> - <ComponentRef Id="Russian" /> - <ComponentRef Id="Slovak" /> - <ComponentRef Id="Slovenian" /> - <ComponentRef Id="Spanish" /> - <ComponentRef Id="Swedish" /> - <ComponentRef Id="Turkish" /> - <ComponentRef Id="Ukrainian" /> - </Feature> - <?if not $(var.Platform) = "x64" ?> - <Feature Id="Plugins" AllowAdvertise="no" Level="4" Title="Plugins"> - <ComponentRef Id="editoraddin" /> - <ComponentRef Id="insertdatetime" /> - <ComponentRef Id="CompareMSExcelFiles" /> - <ComponentRef Id="CompareMSWordFiles" /> - <ComponentRef Id="DisplayXMLFiles" /> - <ComponentRef Id="IgnoreColumns" /> - <ComponentRef Id="IgnoreCommentsC" /> - <ComponentRef Id="IgnoreFieldsComma" /> - <ComponentRef Id="IgnoreFieldsTab" /> - <ComponentRef Id="IgnoreLeadingLineNumbers" /> - <ComponentRef Id="WatchBeginningOfLog" /> - <ComponentRef Id="WatchEndOfLog" /> - </Feature> - <?endif ?> - </Feature> - </Fragment> -</Wix> Deleted: trunk/Installer/WiX/Filters.wxs =================================================================== --- trunk/Installer/WiX/Filters.wxs 2009-05-26 13:56:42 UTC (rev 6787) +++ trunk/Installer/WiX/Filters.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -1,98 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <?include Config.wxi ?> - <Fragment> - <DirectoryRef Id="FILTERSDIR"> - <Component Id="ADAMulti" Guid="*" Win64="$(var.Win64)"> - <File Id="ADAMultiFLT" - Name="ADAMulti.flt" - Source="..\..\Filters\ADAMulti.flt" - Vital="no" /> - </Component> - - <Component Id="ASPNET" Guid="*" Win64="$(var.Win64)"> - <File Id="ASPNETFLT" - Name="ASPNET.flt" - Source="..\..\Filters\ASPNET.flt" - Vital="no" /> - </Component> - - <Component Id="CSharp_loose" Guid="*" Win64="$(var.Win64)"> - <File Id="CSharp_looseFLT" - Name="CSharp_loose.flt" - Source="..\..\Filters\CSharp_loose.flt" - Vital="no" /> - </Component> - - <Component Id="Delphi" Guid="*" Win64="$(var.Win64)"> - <File Id="DelphiFLT" - Name="Delphi.flt" - Source="..\..\Filters\Delphi.flt" - Vital="no" /> - </Component> - - <Component Id="FileFilter" Guid="*" Win64="$(var.Win64)"> - <File Id="FileFilterTMPL" - Name="FileFilter.tmpl" - Source="..\..\Filters\FileFilter.tmpl" - Vital="no" /> - </Component> - - <Component Id="Frontpage" Guid="*" Win64="$(var.Win64)"> - <File Id="FrontpageFLT" - Name="Frontpage.flt" - Source="..\..\Filters\Frontpage.flt" - Vital="no" /> - </Component> - - <Component Id="MASM" Guid="*" Win64="$(var.Win64)"> - <File Id="MASMFLT" - Name="MASM.flt" - Source="..\..\Filters\MASM.flt" - Vital="no" /> - </Component> - - <Component Id="Merge_GnuC_loose" Guid="*" Win64="$(var.Win64)"> - <File Id="Merge_GnuC_looseFLT" - Name="Merge_GnuC_loose.flt" - Source="..\..\Filters\Merge_GnuC_loose.flt" - Vital="no" /> - </Component> - - <Component Id="Merge_VB_loose" Guid="*" Win64="$(var.Win64)"> - <File Id="Merge_VB_looseFLT" - Name="Merge_VB_loose.flt" - Source="..\..\Filters\Merge_VB_loose.flt" - Vital="no" /> - </Component> - - <Component Id="Merge_VC_loose" Guid="*" Win64="$(var.Win64)"> - <File Id="Merge_VC_looseFLT" - Name="Merge_VC_loose.flt" - Source="..\..\Filters\Merge_VC_loose.flt" - Vital="no" /> - </Component> - - <Component Id="SourceControl" Guid="*" Win64="$(var.Win64)"> - <File Id="SourceControlFLT" - Name="SourceControl.flt" - Source="..\..\Filters\SourceControl.flt" - Vital="no" /> - </Component> - - <Component Id="Symbian" Guid="*" Win64="$(var.Win64)"> - <File Id="SymbianFLT" - Name="Symbian.flt" - Source="..\..\Filters\Symbian.flt" - Vital="no" /> - </Component> - - <Component Id="XML_html" Guid="*" Win64="$(var.Win64)"> - <File Id="XML_htmlFLT" - Name="XML_html.flt" - Source="..\..\Filters\XML_html.flt" - Vital="no" /> - </Component> - </DirectoryRef> - </Fragment> -</Wix> Property changes on: trunk/Installer/WiX/Fragments ___________________________________________________________________ Added: bugtraq:url + http://sourceforge.net/support/tracker.php?aid=%BUGID% Added: bugtraq:logregex + (\d{6,}) Copied: trunk/Installer/WiX/Fragments/Core.wxs (from rev 6787, trunk/Installer/WiX/Core.wxs) =================================================================== --- trunk/Installer/WiX/Fragments/Core.wxs (rev 0) +++ trunk/Installer/WiX/Fragments/Core.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include ..\Config.wxi ?> + <Fragment> + <DirectoryRef Id="INSTALLDIR"> + <Component Id="WinMergeU" Guid="*" Win64="$(var.Win64)"> + <File Id="WinMergeUEXE" + Name="WinMergeU.exe" + Source="$(var.MergeBuildDir)\WinMergeU.exe" + Vital="yes" /> + </Component> + + <Component Id="libexpat" Guid="*" Win64="$(var.Win64)"> + <File Id="libexpatDLL" + Name="libexpat.dll" + Source="$(var.ExpatBuildDir)\libexpat.dll" + Vital="yes" /> + </Component> + + <Component Id="pcre" Guid="*" Win64="$(var.Win64)"> + <File Id="pcreDLL" + Name="pcre.dll" + Source="$(var.PcreBuildDir)\pcre.dll" + Vital="yes" /> + </Component> + + <Component Id="MergeLang" Guid="*" Win64="$(var.Win64)"> + <File Id="MergeLangDLL" + Name="MergeLang.dll" + Source="$(var.MergeBuildDir)\MergeLang.dll" + Vital="yes" /> + </Component> + + <Component Id="Files" Guid="*" Win64="$(var.Win64)"> + <File Id="FilesTXT" + Name="Files.txt" + Source="..\..\Docs\Users\Files.txt" + Vital="no" /> + </Component> + + <Component Id="Contributors" Guid="*" Win64="$(var.Win64)"> + <File Id="ContributorsTXT" + Name="Contributors.txt" + Source="..\..\Docs\Users\Contributors.txt" + Vital="no" /> + </Component> + </DirectoryRef> + + <!-- Shell Extension --> + <DirectoryRef Id="INSTALLDIR"> + <Component Id="ShellExtension" Guid="*" Win64="$(var.Win64)"> + <?if $(var.Platform) = "x64" ?> + <File Id="ShellExtensionX64DLL" + Name="ShellExtensionX64.dll" + SelfRegCost="1" + Source="..\..\Build\ShellExtensionX64\ShellExtensionX64.dll" + Vital="yes" /> + <?else ?> + <File Id="ShellExtensionUDLL" + Name="ShellExtensionU.dll" + SelfRegCost="1" + Source="$(var.MergeBuildDir)\ShellExtensionU.dll" + Vital="yes" /> + <?endif ?> + </Component> + </DirectoryRef> + + <!-- Startmenu shortcuts --> + <DirectoryRef Id="WinMergeMenuFolder"> + <Component Id="StartMenuShortcuts" Guid="$(var.StartMenuShortcutsGuid)" Win64="$(var.Win64)"> + <Shortcut Id="WinMergeStartMenuShortcut" + Name="WinMerge" + Target="[INSTALLDIR]WinMergeU.exe" + WorkingDirectory="INSTALLDIR" /> + <Shortcut Id="ReadMeStartMenuShortcut" + Name="Read Me" + Target="[INSTALLDIR]Docs\ReadMe.txt" + WorkingDirectory="INSTALLDIR" /> + <Shortcut Id="HelpStartMenuShortcut" + Name="WinMerge Help" + Target="[INSTALLDIR]Docs\WinMerge.chm" + WorkingDirectory="INSTALLDIR" /> + <RemoveFolder Id="WinMergeMenuFolder" On="uninstall" /> + <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" /> + </Component> + </DirectoryRef> + + <!-- Desktop shortcut --> + <DirectoryRef Id="DesktopFolder"> + <Component Id="DesktopShortcut" Guid="$(var.DesktopShortcutGuid)" Win64="$(var.Win64)"> + <Shortcut Id="WinMergeDesktopShortcut" + Name="WinMerge" + Target="[INSTALLDIR]WinMergeU.exe" + WorkingDirectory="INSTALLDIR" /> + <RegistryValue Root="HKCU" Key="Software\Thingamahoochie\WinMerge" Name="Installed" Type="integer" Value="1" KeyPath="yes" /> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Copied: trunk/Installer/WiX/Fragments/Docs.wxs (from rev 6787, trunk/Installer/WiX/Docs.wxs) =================================================================== --- trunk/Installer/WiX/Fragments/Docs.wxs (rev 0) +++ trunk/Installer/WiX/Fragments/Docs.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include ..\Config.wxi ?> + <Fragment> + <DirectoryRef Id="DOCSDIR"> + <Component Id="ReadMe" Guid="*" Win64="$(var.Win64)"> + <File Id="ReadMeTXT" + Name="ReadMe.txt" + Source="..\..\Docs\Users\ReadMe.txt" + Vital="no" /> + </Component> + + <Component Id="ReleaseNotes" Guid="*" Win64="$(var.Win64)"> + <File Id="ReleaseNotesHTML" + Name="ReleaseNotes.html" + Source="..\..\Docs\Users\ReleaseNotes.html" + Vital="no" /> + </Component> + + <Component Id="ChangeLog" Guid="*" Win64="$(var.Win64)"> + <File Id="ChangeLogTXT" + Name="ChangeLog.txt" + Source="..\..\Docs\Users\ChangeLog.txt" + Vital="no" /> + </Component> + + <Component Id="WinMergeHelp" Guid="*" Win64="$(var.Win64)"> + <File Id="WinMergeCHM" + Name="WinMerge.chm" + Source="..\..\Build\Manual\htmlhelp\WinMerge.chm" + Vital="no" /> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Copied: trunk/Installer/WiX/Fragments/Features.wxs (from rev 6776, trunk/Installer/WiX/Features.wxs) =================================================================== --- trunk/Installer/WiX/Fragments/Features.wxs (rev 0) +++ trunk/Installer/WiX/Fragments/Features.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include ..\Config.wxi ?> + <Fragment> + <!-- + * Level <= 3 is "Typical" + * Level <= 1000 is "Complete" + --> + <Feature Id="WinMerge" + Absent="disallow" + AllowAdvertise="no" + ConfigurableDirectory="INSTALLDIR" + Display="expand" + Level="1" + Title="WinMerge"> + <ComponentRef Id="WinMergeU" /> + <ComponentRef Id="libexpat" /> + <ComponentRef Id="pcre" /> + <ComponentRef Id="MergeLang" /> + <Feature Id="ShellExtension" + AllowAdvertise="no" + Description="Explorer context menu integration" + Level="1" + Title="Shell Extension"> + <ComponentRef Id="ShellExtension" /> + </Feature> + <Feature Id="StartMenuShortcuts" + AllowAdvertise="no" + Level="1" + Title="Startmenu shortcut"> + <ComponentRef Id="StartMenuShortcuts" /> + </Feature> + <Feature Id="DesktopShortcut" + AllowAdvertise="no" + Level="1" + Title="Desktop shortcut"> + <ComponentRef Id="DesktopShortcut" /> + </Feature> + <Feature Id="Documentation" Absent="disallow" AllowAdvertise="no" Display="hidden" Level="1" Title="Documentation"> + <ComponentRef Id="Files" /> + <ComponentRef Id="Contributors" /> + <ComponentRef Id="ReadMe" /> + <ComponentRef Id="ReleaseNotes" /> + <ComponentRef Id="ChangeLog" /> + <ComponentRef Id="WinMergeHelp" /> + </Feature> + <Feature Id="Filters" AllowAdvertise="no" Level="1" Title="Filters"> + <ComponentRef Id="ADAMulti" /> + <ComponentRef Id="ASPNET" /> + <ComponentRef Id="CSharp_loose" /> + <ComponentRef Id="Delphi" /> + <ComponentRef Id="FileFilter" /> + <ComponentRef Id="Frontpage" /> + <ComponentRef Id="MASM" /> + <ComponentRef Id="Merge_GnuC_loose" /> + <ComponentRef Id="Merge_VB_loose" /> + <ComponentRef Id="Merge_VC_loose" /> + <ComponentRef Id="SourceControl" /> + <ComponentRef Id="Symbian" /> + <ComponentRef Id="XML_html" /> + </Feature> + <Feature Id="Languages" AllowAdvertise="no" Level="1" Title="Languages"> + <ComponentRef Id="Brazilian" /> + <ComponentRef Id="Bulgarian" /> + <ComponentRef Id="Catalan" /> + <ComponentRef Id="ChineseSimplified" /> + <ComponentRef Id="ChineseTraditional" /> + <ComponentRef Id="Croatian" /> + <ComponentRef Id="Czech" /> + <ComponentRef Id="Danish" /> + <ComponentRef Id="Dutch" /> + <ComponentRef Id="French" /> + <ComponentRef Id="Galician" /> + <ComponentRef Id="German" /> + <ComponentRef Id="Greek" /> + <ComponentRef Id="Hungarian" /> + <ComponentRef Id="Italian" /> + <ComponentRef Id="Japanese" /> + <ComponentRef Id="Korean" /> + <ComponentRef Id="Norwegian" /> + <ComponentRef Id="Polish" /> + <ComponentRef Id="Portuguese" /> + <ComponentRef Id="Romanian" /> + <ComponentRef Id="Russian" /> + <ComponentRef Id="Slovak" /> + <ComponentRef Id="Slovenian" /> + <ComponentRef Id="Spanish" /> + <ComponentRef Id="Swedish" /> + <ComponentRef Id="Turkish" /> + <ComponentRef Id="Ukrainian" /> + </Feature> + <?if not $(var.Platform) = "x64" ?> + <Feature Id="Plugins" AllowAdvertise="no" Level="4" Title="Plugins"> + <ComponentRef Id="editoraddin" /> + <ComponentRef Id="insertdatetime" /> + <ComponentRef Id="CompareMSExcelFiles" /> + <ComponentRef Id="CompareMSWordFiles" /> + <ComponentRef Id="DisplayXMLFiles" /> + <ComponentRef Id="IgnoreColumns" /> + <ComponentRef Id="IgnoreCommentsC" /> + <ComponentRef Id="IgnoreFieldsComma" /> + <ComponentRef Id="IgnoreFieldsTab" /> + <ComponentRef Id="IgnoreLeadingLineNumbers" /> + <ComponentRef Id="WatchBeginningOfLog" /> + <ComponentRef Id="WatchEndOfLog" /> + </Feature> + <?endif ?> + </Feature> + </Fragment> +</Wix> Copied: trunk/Installer/WiX/Fragments/Filters.wxs (from rev 6776, trunk/Installer/WiX/Filters.wxs) =================================================================== --- trunk/Installer/WiX/Fragments/Filters.wxs (rev 0) +++ trunk/Installer/WiX/Fragments/Filters.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include ..\Config.wxi ?> + <Fragment> + <DirectoryRef Id="FILTERSDIR"> + <Component Id="ADAMulti" Guid="*" Win64="$(var.Win64)"> + <File Id="ADAMultiFLT" + Name="ADAMulti.flt" + Source="..\..\Filters\ADAMulti.flt" + Vital="no" /> + </Component> + + <Component Id="ASPNET" Guid="*" Win64="$(var.Win64)"> + <File Id="ASPNETFLT" + Name="ASPNET.flt" + Source="..\..\Filters\ASPNET.flt" + Vital="no" /> + </Component> + + <Component Id="CSharp_loose" Guid="*" Win64="$(var.Win64)"> + <File Id="CSharp_looseFLT" + Name="CSharp_loose.flt" + Source="..\..\Filters\CSharp_loose.flt" + Vital="no" /> + </Component> + + <Component Id="Delphi" Guid="*" Win64="$(var.Win64)"> + <File Id="DelphiFLT" + Name="Delphi.flt" + Source="..\..\Filters\Delphi.flt" + Vital="no" /> + </Component> + + <Component Id="FileFilter" Guid="*" Win64="$(var.Win64)"> + <File Id="FileFilterTMPL" + Name="FileFilter.tmpl" + Source="..\..\Filters\FileFilter.tmpl" + Vital="no" /> + </Component> + + <Component Id="Frontpage" Guid="*" Win64="$(var.Win64)"> + <File Id="FrontpageFLT" + Name="Frontpage.flt" + Source="..\..\Filters\Frontpage.flt" + Vital="no" /> + </Component> + + <Component Id="MASM" Guid="*" Win64="$(var.Win64)"> + <File Id="MASMFLT" + Name="MASM.flt" + Source="..\..\Filters\MASM.flt" + Vital="no" /> + </Component> + + <Component Id="Merge_GnuC_loose" Guid="*" Win64="$(var.Win64)"> + <File Id="Merge_GnuC_looseFLT" + Name="Merge_GnuC_loose.flt" + Source="..\..\Filters\Merge_GnuC_loose.flt" + Vital="no" /> + </Component> + + <Component Id="Merge_VB_loose" Guid="*" Win64="$(var.Win64)"> + <File Id="Merge_VB_looseFLT" + Name="Merge_VB_loose.flt" + Source="..\..\Filters\Merge_VB_loose.flt" + Vital="no" /> + </Component> + + <Component Id="Merge_VC_loose" Guid="*" Win64="$(var.Win64)"> + <File Id="Merge_VC_looseFLT" + Name="Merge_VC_loose.flt" + Source="..\..\Filters\Merge_VC_loose.flt" + Vital="no" /> + </Component> + + <Component Id="SourceControl" Guid="*" Win64="$(var.Win64)"> + <File Id="SourceControlFLT" + Name="SourceControl.flt" + Source="..\..\Filters\SourceControl.flt" + Vital="no" /> + </Component> + + <Component Id="Symbian" Guid="*" Win64="$(var.Win64)"> + <File Id="SymbianFLT" + Name="Symbian.flt" + Source="..\..\Filters\Symbian.flt" + Vital="no" /> + </Component> + + <Component Id="XML_html" Guid="*" Win64="$(var.Win64)"> + <File Id="XML_htmlFLT" + Name="XML_html.flt" + Source="..\..\Filters\XML_html.flt" + Vital="no" /> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Copied: trunk/Installer/WiX/Fragments/Languages.wxs (from rev 6786, trunk/Installer/WiX/Languages.wxs) =================================================================== --- trunk/Installer/WiX/Fragments/Languages.wxs (rev 0) +++ trunk/Installer/WiX/Fragments/Languages.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -0,0 +1,203 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include ..\Config.wxi ?> + <Fragment> + <DirectoryRef Id="LANGDIR"> + <Component Id="Brazilian" Guid="*" Win64="$(var.Win64)"> + <File Id="BrazilianPO" + Name="Brazilian.po" + Source="..\..\Translations\WinMerge\Brazilian.po" + Vital="no" /> + </Component> + + <Component Id="Bulgarian" Guid="*" Win64="$(var.Win64)"> + <File Id="BulgarianPO" + Name="Bulgarian.po" + Source="..\..\Translations\WinMerge\Bulgarian.po" + Vital="no" /> + </Component> + + <Component Id="Catalan" Guid="*" Win64="$(var.Win64)"> + <File Id="CatalanPO" + Name="Catalan.po" + Source="..\..\Translations\WinMerge\Catalan.po" + Vital="no" /> + </Component> + + <Component Id="ChineseSimplified" Guid="*" Win64="$(var.Win64)"> + <File Id="ChineseSimplifiedPO" + Name="ChineseSimplified.po" + Source="..\..\Translations\WinMerge\ChineseSimplified.po" + Vital="no" /> + </Component> + + <Component Id="ChineseTraditional" Guid="*" Win64="$(var.Win64)"> + <File Id="ChineseTraditionalPO" + Name="ChineseTraditional.po" + Source="..\..\Translations\WinMerge\ChineseTraditional.po" + Vital="no" /> + </Component> + + <Component Id="Croatian" Guid="*" Win64="$(var.Win64)"> + <File Id="CroatianPO" + Name="Croatian.po" + Source="..\..\Translations\WinMerge\Croatian.po" + Vital="no" /> + </Component> + + <Component Id="Czech" Guid="*" Win64="$(var.Win64)"> + <File Id="CzechPO" + Name="Czech.po" + Source="..\..\Translations\WinMerge\Czech.po" + Vital="no" /> + </Component> + + <Component Id="Danish" Guid="*" Win64="$(var.Win64)"> + <File Id="DanishPO" + Name="Danish.po" + Source="..\..\Translations\WinMerge\Danish.po" + Vital="no" /> + </Component> + + <Component Id="Dutch" Guid="*" Win64="$(var.Win64)"> + <File Id="DutchPO" + Name="Dutch.po" + Source="..\..\Translations\WinMerge\Dutch.po" + Vital="no" /> + </Component> + + <Component Id="French" Guid="*" Win64="$(var.Win64)"> + <File Id="FrenchPO" + Name="French.po" + Source="..\..\Translations\WinMerge\French.po" + Vital="no" /> + </Component> + + <Component Id="Galician" Guid="*" Win64="$(var.Win64)"> + <File Id="GalicianPO" + Name="Galician.po" + Source="..\..\Translations\WinMerge\Galician.po" + Vital="no" /> + </Component> + + <Component Id="German" Guid="*" Win64="$(var.Win64)"> + <File Id="GermanPO" + Name="German.po" + Source="..\..\Translations\WinMerge\German.po" + Vital="no" /> + </Component> + + <Component Id="Greek" Guid="*" Win64="$(var.Win64)"> + <File Id="GreekPO" + Name="Greek.po" + Source="..\..\Translations\WinMerge\Greek.po" + Vital="no" /> + </Component> + + <Component Id="Hungarian" Guid="*" Win64="$(var.Win64)"> + <File Id="HungarianPO" + Name="Hungarian.po" + Source="..\..\Translations\WinMerge\Hungarian.po" + Vital="no" /> + </Component> + + <Component Id="Italian" Guid="*" Win64="$(var.Win64)"> + <File Id="ItalianPO" + Name="Italian.po" + Source="..\..\Translations\WinMerge\Italian.po" + Vital="no" /> + </Component> + + <Component Id="Japanese" Guid="*" Win64="$(var.Win64)"> + <File Id="JapanesePO" + Name="Japanese.po" + Source="..\..\Translations\WinMerge\Japanese.po" + Vital="no" /> + </Component> + + <Component Id="Korean" Guid="*" Win64="$(var.Win64)"> + <File Id="KoreanPO" + Name="Korean.po" + Source="..\..\Translations\WinMerge\Korean.po" + Vital="no" /> + </Component> + + <Component Id="Norwegian" Guid="*" Win64="$(var.Win64)"> + <File Id="NorwegianPO" + Name="Norwegian.po" + Source="..\..\Translations\WinMerge\Norwegian.po" + Vital="no" /> + </Component> + + <Component Id="Polish" Guid="*" Win64="$(var.Win64)"> + <File Id="PolishPO" + Name="Polish.po" + Source="..\..\Translations\WinMerge\Polish.po" + Vital="no" /> + </Component> + + <Component Id="Portuguese" Guid="*" Win64="$(var.Win64)"> + <File Id="PortuguesePO" + Name="Portuguese.po" + Source="..\..\Translations\WinMerge\Portuguese.po" + Vital="no" /> + </Component> + + <Component Id="Romanian" Guid="*" Win64="$(var.Win64)"> + <File Id="RomanianPO" + Name="Romanian.po" + Source="..\..\Translations\WinMerge\Romanian.po" + Vital="no" /> + </Component> + + <Component Id="Russian" Guid="*" Win64="$(var.Win64)"> + <File Id="RussianPO" + Name="Russian.po" + Source="..\..\Translations\WinMerge\Russian.po" + Vital="no" /> + </Component> + + <Component Id="Slovak" Guid="*" Win64="$(var.Win64)"> + <File Id="SlovakPO" + Name="Slovak.po" + Source="..\..\Translations\WinMerge\Slovak.po" + Vital="no" /> + </Component> + + <Component Id="Slovenian" Guid="*" Win64="$(var.Win64)"> + <File Id="SlovenianPO" + Name="Slovenian.po" + Source="..\..\Translations\WinMerge\Slovenian.po" + Vital="no" /> + </Component> + + <Component Id="Spanish" Guid="*" Win64="$(var.Win64)"> + <File Id="SpanishPO" + Name="Spanish.po" + Source="..\..\Translations\WinMerge\Spanish.po" + Vital="no" /> + </Component> + + <Component Id="Swedish" Guid="*" Win64="$(var.Win64)"> + <File Id="SwedishPO" + Name="Swedish.po" + Source="..\..\Translations\WinMerge\Swedish.po" + Vital="no" /> + </Component> + + <Component Id="Turkish" Guid="*" Win64="$(var.Win64)"> + <File Id="TurkishPO" + Name="Turkish.po" + Source="..\..\Translations\WinMerge\Turkish.po" + Vital="no" /> + </Component> + + <Component Id="Ukrainian" Guid="*" Win64="$(var.Win64)"> + <File Id="UkrainianPO" + Name="Ukrainian.po" + Source="..\..\Translations\WinMerge\Ukrainian.po" + Vital="no" /> + </Component> + </DirectoryRef> + </Fragment> +</Wix> Copied: trunk/Installer/WiX/Fragments/Plugins.wxs (from rev 6776, trunk/Installer/WiX/Plugins.wxs) =================================================================== --- trunk/Installer/WiX/Fragments/Plugins.wxs (rev 0) +++ trunk/Installer/WiX/Fragments/Plugins.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="utf-8"?> +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <?include ..\Config.wxi ?> + <Fragment> + <?if not $(var.Platform) = "x64" ?> + <DirectoryRef Id="PLUGINSDIR"> + <Component Id="editoraddin" Guid="*" Win64="no"> + <File Id="editoraddinSCT" + Name="editor addin.sct" + Source="..\..\Plugins\dlls\editor addin.sct" + Vital="no" /> + </Component> + + <Component Id="insertdatetime" Guid="*" Win64="no"> + <File Id="insertdatetimeSCT" + Name="insert datetime.sct" + Source="..\..\Plugins\dlls\insert datetime.sct" + Vital="no" /> + </Component> + + <Component Id="CompareMSExcelFiles" Guid="*" Win64="no"> + <File Id="CompareMSExcelFilesDLL" + Name="CompareMSExcelFiles.dll" + Source="..\..\Plugins\dlls\CompareMSExcelFiles.dll" + Vital="no" /> + </Component> + + <Component Id="CompareMSWordFiles" Guid="*" Win64="no"> + <File Id="CompareMSWordFilesDLL" + Name="CompareMSWordFiles.dll" + Source="..\..\Plugins\dlls\CompareMSWordFiles.dll" + Vital="no" /> + </Component> + + <Component Id="DisplayXMLFiles" Guid="*" Win64="no"> + <File Id="DisplayXMLFilesDLL" + Name="DisplayXMLFiles.dll" + Source="..\..\Plugins\dlls\DisplayXMLFiles.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreColumns" Guid="*" Win64="no"> + <File Id="IgnoreColumnsDLL" + Name="IgnoreColumns.dll" + Source="..\..\Plugins\dlls\IgnoreColumns.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreCommentsC" Guid="*" Win64="no"> + <File Id="IgnoreCommentsCDLL" + Name="IgnoreCommentsC.dll" + Source="..\..\Plugins\dlls\IgnoreCommentsC.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreFieldsComma" Guid="*" Win64="no"> + <File Id="IgnoreFieldsCommaDLL" + Name="IgnoreFieldsComma.dll" + Source="..\..\Plugins\dlls\IgnoreFieldsComma.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreFieldsTab" Guid="*" Win64="no"> + <File Id="IgnoreFieldsTabDLL" + Name="IgnoreFieldsTab.dll" + Source="..\..\Plugins\dlls\IgnoreFieldsTab.dll" + Vital="no" /> + </Component> + + <Component Id="IgnoreLeadingLineNumbers" Guid="*" Win64="no"> + <File Id="IgnoreLeadingLineNumbersDLL" + Name="IgnoreLeadingLineNumbers.dll" + Source="..\..\Plugins\dlls\IgnoreLeadingLineNumbers.dll" + Vital="no" /> + </Component> + + <Component Id="WatchBeginningOfLog" Guid="*" Win64="no"> + <File Id="WatchBeginningOfLogDLL" + Name="WatchBeginningOfLog.dll" + Source="..\..\Plugins\dlls\WatchBeginningOfLog.dll" + Vital="no" /> + </Component> + + <Component Id="WatchEndOfLog" Guid="*" Win64="no"> + <File Id="WatchEndOfLogDLL" + Name="WatchEndOfLog.dll" + Source="..\..\Plugins\dlls\WatchEndOfLog.dll" + Vital="no" /> + </Component> + </DirectoryRef> + <?endif ?> + </Fragment> +</Wix> Copied: trunk/Installer/WiX/Fragments/WixUI_WinMerge.wxs (from rev 6776, trunk/Installer/WiX/WixUI_WinMerge.wxs) =================================================================== --- trunk/Installer/WiX/Fragments/WixUI_WinMerge.wxs (rev 0) +++ trunk/Installer/WiX/Fragments/WixUI_WinMerge.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Copyright (c) Microsoft Corporation. All rights reserved. + + The use and distribution terms for this software are covered by the + Common Public License 1.0 (http://opensource.org/licenses/cpl.php) + which can be found in the file CPL.TXT at the root of this distribution. + By using this software in any fashion, you are agreeing to be bound by + the terms of this license. + + You must not remove this notice, or any other, from this software. +--> +<!-- +First-time install dialog sequence: Maintenance dialog sequence: + - WixUI_WelcomeDlg - WixUI_MaintenanceWelcomeDlg + - WixUI_LicenseAgreementDlg - WixUI_MaintenanceTypeDlg + - WixUI_SetupTypeDlg - WixUI_CustomizeDlg + - WixUI_VerifyReadyDlg - WixUI_VerifyReadyDlg + - WixUI_CustomizeDlg + - WixUI_DiskCostDlg + - WixUI_BrowseDlg +--> + +<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> + <Fragment> + <UI Id="WixUI_WinMerge"> + <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> + <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> + <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" /> + + <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" /> + <Property Id="WixUI_Mode" Value="Mondo" /> + + <DialogRef Id="ErrorDlg" /> + <DialogRef Id="FatalError" /> + <DialogRef Id="FilesInUse" /> + <DialogRef Id="MsiRMFilesInUse" /> + <DialogRef Id="PrepareDlg" /> + <DialogRef Id="ProgressDlg" /> + <DialogRef Id="ResumeDlg" /> + <DialogRef Id="UserExit" /> + + <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> + + <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish> + + <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish> + <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish> + + <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish> + <Publish Dialog="SetupTypeDlg" Control="TypicalButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="SetupTypeDlg" Control="CustomButton" Event="NewDialog" Value="CustomizeDlg">1</Publish> + <Publish Dialog="SetupTypeDlg" Control="CompleteButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + + <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="1">WixUI_InstallMode = "Change"</Publish> + <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallCustom"</Publish> + <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1">WixUI_InstallMode = "InstallCustom"</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="SetupTypeDlg" Order="2">WixUI_InstallMode = "InstallTypical" OR WixUI_InstallMode = "InstallComplete"</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="3">WixUI_InstallMode = "Change"</Publish> + <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="4">WixUI_InstallMode = "Repair" OR WixUI_InstallMode = "Remove"</Publish> + + <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish> + + <Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="CustomizeDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> + <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish> + </UI> + + <UIRef Id="WixUI_Common" /> + </Fragment> +</Wix> \ No newline at end of file Deleted: trunk/Installer/WiX/Languages.wxs =================================================================== --- trunk/Installer/WiX/Languages.wxs 2009-05-26 13:56:42 UTC (rev 6787) +++ trunk/Installer/WiX/Languages.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -1,203 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <?include Config.wxi ?> - <Fragment> - <DirectoryRef Id="LANGDIR"> - <Component Id="Brazilian" Guid="*" Win64="$(var.Win64)"> - <File Id="BrazilianPO" - Name="Brazilian.po" - Source="..\..\Translations\WinMerge\Brazilian.po" - Vital="no" /> - </Component> - - <Component Id="Bulgarian" Guid="*" Win64="$(var.Win64)"> - <File Id="BulgarianPO" - Name="Bulgarian.po" - Source="..\..\Translations\WinMerge\Bulgarian.po" - Vital="no" /> - </Component> - - <Component Id="Catalan" Guid="*" Win64="$(var.Win64)"> - <File Id="CatalanPO" - Name="Catalan.po" - Source="..\..\Translations\WinMerge\Catalan.po" - Vital="no" /> - </Component> - - <Component Id="ChineseSimplified" Guid="*" Win64="$(var.Win64)"> - <File Id="ChineseSimplifiedPO" - Name="ChineseSimplified.po" - Source="..\..\Translations\WinMerge\ChineseSimplified.po" - Vital="no" /> - </Component> - - <Component Id="ChineseTraditional" Guid="*" Win64="$(var.Win64)"> - <File Id="ChineseTraditionalPO" - Name="ChineseTraditional.po" - Source="..\..\Translations\WinMerge\ChineseTraditional.po" - Vital="no" /> - </Component> - - <Component Id="Croatian" Guid="*" Win64="$(var.Win64)"> - <File Id="CroatianPO" - Name="Croatian.po" - Source="..\..\Translations\WinMerge\Croatian.po" - Vital="no" /> - </Component> - - <Component Id="Czech" Guid="*" Win64="$(var.Win64)"> - <File Id="CzechPO" - Name="Czech.po" - Source="..\..\Translations\WinMerge\Czech.po" - Vital="no" /> - </Component> - - <Component Id="Danish" Guid="*" Win64="$(var.Win64)"> - <File Id="DanishPO" - Name="Danish.po" - Source="..\..\Translations\WinMerge\Danish.po" - Vital="no" /> - </Component> - - <Component Id="Dutch" Guid="*" Win64="$(var.Win64)"> - <File Id="DutchPO" - Name="Dutch.po" - Source="..\..\Translations\WinMerge\Dutch.po" - Vital="no" /> - </Component> - - <Component Id="French" Guid="*" Win64="$(var.Win64)"> - <File Id="FrenchPO" - Name="French.po" - Source="..\..\Translations\WinMerge\French.po" - Vital="no" /> - </Component> - - <Component Id="Galician" Guid="*" Win64="$(var.Win64)"> - <File Id="GalicianPO" - Name="Galician.po" - Source="..\..\Translations\WinMerge\Galician.po" - Vital="no" /> - </Component> - - <Component Id="German" Guid="*" Win64="$(var.Win64)"> - <File Id="GermanPO" - Name="German.po" - Source="..\..\Translations\WinMerge\German.po" - Vital="no" /> - </Component> - - <Component Id="Greek" Guid="*" Win64="$(var.Win64)"> - <File Id="GreekPO" - Name="Greek.po" - Source="..\..\Translations\WinMerge\Greek.po" - Vital="no" /> - </Component> - - <Component Id="Hungarian" Guid="*" Win64="$(var.Win64)"> - <File Id="HungarianPO" - Name="Hungarian.po" - Source="..\..\Translations\WinMerge\Hungarian.po" - Vital="no" /> - </Component> - - <Component Id="Italian" Guid="*" Win64="$(var.Win64)"> - <File Id="ItalianPO" - Name="Italian.po" - Source="..\..\Translations\WinMerge\Italian.po" - Vital="no" /> - </Component> - - <Component Id="Japanese" Guid="*" Win64="$(var.Win64)"> - <File Id="JapanesePO" - Name="Japanese.po" - Source="..\..\Translations\WinMerge\Japanese.po" - Vital="no" /> - </Component> - - <Component Id="Korean" Guid="*" Win64="$(var.Win64)"> - <File Id="KoreanPO" - Name="Korean.po" - Source="..\..\Translations\WinMerge\Korean.po" - Vital="no" /> - </Component> - - <Component Id="Norwegian" Guid="*" Win64="$(var.Win64)"> - <File Id="NorwegianPO" - Name="Norwegian.po" - Source="..\..\Translations\WinMerge\Norwegian.po" - Vital="no" /> - </Component> - - <Component Id="Polish" Guid="*" Win64="$(var.Win64)"> - <File Id="PolishPO" - Name="Polish.po" - Source="..\..\Translations\WinMerge\Polish.po" - Vital="no" /> - </Component> - - <Component Id="Portuguese" Guid="*" Win64="$(var.Win64)"> - <File Id="PortuguesePO" - Name="Portuguese.po" - Source="..\..\Translations\WinMerge\Portuguese.po" - Vital="no" /> - </Component> - - <Component Id="Romanian" Guid="*" Win64="$(var.Win64)"> - <File Id="RomanianPO" - Name="Romanian.po" - Source="..\..\Translations\WinMerge\Romanian.po" - Vital="no" /> - </Component> - - <Component Id="Russian" Guid="*" Win64="$(var.Win64)"> - <File Id="RussianPO" - Name="Russian.po" - Source="..\..\Translations\WinMerge\Russian.po" - Vital="no" /> - </Component> - - <Component Id="Slovak" Guid="*" Win64="$(var.Win64)"> - <File Id="SlovakPO" - Name="Slovak.po" - Source="..\..\Translations\WinMerge\Slovak.po" - Vital="no" /> - </Component> - - <Component Id="Slovenian" Guid="*" Win64="$(var.Win64)"> - <File Id="SlovenianPO" - Name="Slovenian.po" - Source="..\..\Translations\WinMerge\Slovenian.po" - Vital="no" /> - </Component> - - <Component Id="Spanish" Guid="*" Win64="$(var.Win64)"> - <File Id="SpanishPO" - Name="Spanish.po" - Source="..\..\Translations\WinMerge\Spanish.po" - Vital="no" /> - </Component> - - <Component Id="Swedish" Guid="*" Win64="$(var.Win64)"> - <File Id="SwedishPO" - Name="Swedish.po" - Source="..\..\Translations\WinMerge\Swedish.po" - Vital="no" /> - </Component> - - <Component Id="Turkish" Guid="*" Win64="$(var.Win64)"> - <File Id="TurkishPO" - Name="Turkish.po" - Source="..\..\Translations\WinMerge\Turkish.po" - Vital="no" /> - </Component> - - <Component Id="Ukrainian" Guid="*" Win64="$(var.Win64)"> - <File Id="UkrainianPO" - Name="Ukrainian.po" - Source="..\..\Translations\WinMerge\Ukrainian.po" - Vital="no" /> - </Component> - </DirectoryRef> - </Fragment> -</Wix> Deleted: trunk/Installer/WiX/Plugins.wxs =================================================================== --- trunk/Installer/WiX/Plugins.wxs 2009-05-26 13:56:42 UTC (rev 6787) +++ trunk/Installer/WiX/Plugins.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <?include Config.wxi ?> - <Fragment> - <?if not $(var.Platform) = "x64" ?> - <DirectoryRef Id="PLUGINSDIR"> - <Component Id="editoraddin" Guid="*" Win64="no"> - <File Id="editoraddinSCT" - Name="editor addin.sct" - Source="..\..\Plugins\dlls\editor addin.sct" - Vital="no" /> - </Component> - - <Component Id="insertdatetime" Guid="*" Win64="no"> - <File Id="insertdatetimeSCT" - Name="insert datetime.sct" - Source="..\..\Plugins\dlls\insert datetime.sct" - Vital="no" /> - </Component> - - <Component Id="CompareMSExcelFiles" Guid="*" Win64="no"> - <File Id="CompareMSExcelFilesDLL" - Name="CompareMSExcelFiles.dll" - Source="..\..\Plugins\dlls\CompareMSExcelFiles.dll" - Vital="no" /> - </Component> - - <Component Id="CompareMSWordFiles" Guid="*" Win64="no"> - <File Id="CompareMSWordFilesDLL" - Name="CompareMSWordFiles.dll" - Source="..\..\Plugins\dlls\CompareMSWordFiles.dll" - Vital="no" /> - </Component> - - <Component Id="DisplayXMLFiles" Guid="*" Win64="no"> - <File Id="DisplayXMLFilesDLL" - Name="DisplayXMLFiles.dll" - Source="..\..\Plugins\dlls\DisplayXMLFiles.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreColumns" Guid="*" Win64="no"> - <File Id="IgnoreColumnsDLL" - Name="IgnoreColumns.dll" - Source="..\..\Plugins\dlls\IgnoreColumns.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreCommentsC" Guid="*" Win64="no"> - <File Id="IgnoreCommentsCDLL" - Name="IgnoreCommentsC.dll" - Source="..\..\Plugins\dlls\IgnoreCommentsC.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreFieldsComma" Guid="*" Win64="no"> - <File Id="IgnoreFieldsCommaDLL" - Name="IgnoreFieldsComma.dll" - Source="..\..\Plugins\dlls\IgnoreFieldsComma.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreFieldsTab" Guid="*" Win64="no"> - <File Id="IgnoreFieldsTabDLL" - Name="IgnoreFieldsTab.dll" - Source="..\..\Plugins\dlls\IgnoreFieldsTab.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreLeadingLineNumbers" Guid="*" Win64="no"> - <File Id="IgnoreLeadingLineNumbersDLL" - Name="IgnoreLeadingLineNumbers.dll" - Source="..\..\Plugins\dlls\IgnoreLeadingLineNumbers.dll" - Vital="no" /> - </Component> - - <Component Id="WatchBeginningOfLog" Guid="*" Win64="no"> - <File Id="WatchBeginningOfLogDLL" - Name="WatchBeginningOfLog.dll" - Source="..\..\Plugins\dlls\WatchBeginningOfLog.dll" - Vital="no" /> - </Component> - - <Component Id="WatchEndOfLog" Guid="*" Win64="no"> - <File Id="WatchEndOfLogDLL" - Name="WatchEndOfLog.dll" - Source="..\..\Plugins\dlls\WatchEndOfLog.dll" - Vital="no" /> - </Component> - </DirectoryRef> - <?endif ?> - </Fragment> -</Wix> Modified: trunk/Installer/WiX/WinMerge.wixproj =================================================================== --- trunk/Installer/WiX/WinMerge.wixproj 2009-05-26 13:56:42 UTC (rev 6787) +++ trunk/Installer/WiX/WinMerge.wixproj 2009-05-26 14:10:35 UTC (rev 6788) @@ -17,13 +17,13 @@ <ItemGroup> <WixExtension Include="$(WixToolPath)WixUIExtension.dll" /> <Compile Include="WinMerge.wxs"/> - <Compile Include="Core.wxs"/> - <Compile Include="Docs.wxs"/> - <Compile Include="Filters.wxs"/> - <Compile Include="Languages.wxs"/> - <Compile Include="Plugins.wxs"/> - <Compile Include="Features.wxs"/> - <Compile Include="WixUI_WinMerge.wxs"/> + <Compile Include="Fragments\Core.wxs"/> + <Compile Include="Fragments\Docs.wxs"/> + <Compile Include="Fragments\Filters.wxs"/> + <Compile Include="Fragments\Languages.wxs"/> + <Compile Include="Fragments\Plugins.wxs"/> + <Compile Include="Fragments\Features.wxs"/> + <Compile Include="Fragments\WixUI_WinMerge.wxs"/> </ItemGroup> <Import Project="$(WixTargetsPath)"/> Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-05-26 13:56:42 UTC (rev 6787) +++ trunk/Installer/WiX/WinMerge.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - candleArgs: "WinMerge.wxs" "Core.wxs" "Docs.wxs" "Filters.wxs" "Plugins.wxs" "Languages.wxs" "Features.wxs" "WixUI_WinMerge.wxs" <extensions> - lightArgs: "WinMerge.wixobj" "Core.wixobj" "Docs.wixobj" "Filters.wixobj" "Plugins.wixobj" "Languages.wixobj" "Features.wixobj" "WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> + candleArgs: "WinMerge.wxs" "Fragments\Core.wxs" "Fragments\Docs.wxs" "Fragments\Filters.wxs" "Fragments\Plugins.wxs" "Fragments\Languages.wxs" "Fragments\Features.wxs" "Fragments\WixUI_WinMerge.wxs" <extensions> + lightArgs: "WinMerge.wixobj" "Fragments\Core.wixobj" "Fragments\Docs.wixobj" "Fragments\Filters.wixobj" "Fragments\Plugins.wixobj" "Fragments\Languages.wixobj" "Fragments\Features.wixobj" "Fragments\WixUI_WinMerge.wixobj" -ext WixUIExtension -out "<projectname>.msi" <extensions> --> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <?include Config.wxi ?> Deleted: trunk/Installer/WiX/WixUI_WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WixUI_WinMerge.wxs 2009-05-26 13:56:42 UTC (rev 6787) +++ trunk/Installer/WiX/WixUI_WinMerge.wxs 2009-05-26 14:10:35 UTC (rev 6788) @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Copyright (c) Microsoft Corporation. All rights reserved. - - The use and distribution terms for this software are covered by the - Common Public License 1.0 (http://opensource.org/licenses/cpl.php) - which can be found in the file CPL.TXT at the root of this distribution. - By using this software in any fashion, you are agreeing to be bound by - the terms of this license. - - You must not remove this notice, or any other, from this software. ---> -<!-- -First-time install dialog sequence: Maintenance dialog sequence: - - WixUI_WelcomeDlg - WixUI_MaintenanceWelcomeDlg - - WixUI_LicenseAgreementDlg - WixUI_MaintenanceTypeDlg - - WixUI_SetupTypeDlg - WixUI_CustomizeDlg - - WixUI_VerifyReadyDlg - WixUI_VerifyReadyDlg - - WixUI_CustomizeDlg - - WixUI_DiskCostDlg - - WixUI_BrowseDlg ---> - -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <Fragment> - <UI Id="WixUI_WinMerge"> - <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> - <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> - <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" /> - - <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" /> - <Property Id="WixUI_Mode" Value="Mondo" /> - - <DialogRef Id="ErrorDlg" /> - <DialogRef Id="FatalError" /> - <DialogRef Id="FilesInUse" /> - <DialogRef Id="MsiRMFilesInUse" /> - <DialogRef Id="PrepareDlg" /> - <DialogRef Id="ProgressDlg" /> - <DialogRef Id="ResumeDlg" /> - <DialogRef Id="UserExit" /> - - <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish> - - <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish> - - <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish> - <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="SetupTypeDlg" Order="2">LicenseAccepted = "1"</Publish> - - <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" ... [truncated message content] |
From: <ge...@us...> - 2009-06-04 19:20:46
|
Revision: 6818 http://winmerge.svn.sourceforge.net/winmerge/?rev=6818&view=rev Author: gerundt Date: 2009-06-04 19:20:32 +0000 (Thu, 04 Jun 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Add CRT merge module Modified Paths: -------------- trunk/Installer/WiX/Config.wxi trunk/Installer/WiX/Fragments/Features.wxs trunk/Installer/WiX/WinMerge.wxs Modified: trunk/Installer/WiX/Config.wxi =================================================================== --- trunk/Installer/WiX/Config.wxi 2009-06-04 18:48:30 UTC (rev 6817) +++ trunk/Installer/WiX/Config.wxi 2009-06-04 19:20:32 UTC (rev 6818) @@ -25,6 +25,8 @@ <?define StartMenuShortcutsGuid = "CDC49AA0-DC37-439d-8358-68E2EA9EF909" ?> <?define DesktopShortcutGuid = "CFF6BDA0-483F-496e-819F-0FC8874C2B9C" ?> + + <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC80_CRT_x86_x64.msm" ?> <?else ?> <!-- if "x86" platform --> <?define Win64 = "no" ?> <?define PackagePlatform = "x86" ?> @@ -37,5 +39,7 @@ <?define StartMenuShortcutsGuid = "12413436-9929-453c-870B-03146CE11960" ?> <?define DesktopShortcutGuid = "36035411-C6BE-43e8-B569-B1EC325D180C" ?> + + <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC80_CRT_x86.msm" ?> <?endif ?> </Include> \ No newline at end of file Modified: trunk/Installer/WiX/Fragments/Features.wxs =================================================================== --- trunk/Installer/WiX/Fragments/Features.wxs 2009-06-04 18:48:30 UTC (rev 6817) +++ trunk/Installer/WiX/Fragments/Features.wxs 2009-06-04 19:20:32 UTC (rev 6818) @@ -105,6 +105,9 @@ <ComponentRef Id="WatchEndOfLog" /> </Feature> <?endif ?> + <Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2005 Runtime Components "> + <MergeRef Id="CRT"/> + </Feature> </Feature> </Fragment> </Wix> Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-06-04 18:48:30 UTC (rev 6817) +++ trunk/Installer/WiX/WinMerge.wxs 2009-06-04 19:20:32 UTC (rev 6818) @@ -35,7 +35,7 @@ Comments="$(var.PackageComments)" Compressed="yes" Description="$(var.Manufacturer)" - InstallerVersion="200" + InstallerVersion="300" Keywords="$(var.PackageKeywords)" Languages="1033" Manufacturer="$(var.PackageDescription)" @@ -59,6 +59,7 @@ <Directory Id="WinMergeMenuFolder" Name="WinMerge" /> </Directory> <Directory Id="DesktopFolder" /> + <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" /> </Directory> <FeatureRef Id="WinMerge" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-06-04 19:31:13
|
Revision: 6819 http://winmerge.svn.sourceforge.net/winmerge/?rev=6819&view=rev Author: gerundt Date: 2009-06-04 19:31:10 +0000 (Thu, 04 Jun 2009) Log Message: ----------- PATCH: [ 2690509 ] Installer: First MSI setup - Add MFC merge module Modified Paths: -------------- trunk/Installer/WiX/Config.wxi trunk/Installer/WiX/Fragments/Features.wxs trunk/Installer/WiX/WinMerge.wxs Modified: trunk/Installer/WiX/Config.wxi =================================================================== --- trunk/Installer/WiX/Config.wxi 2009-06-04 19:20:32 UTC (rev 6818) +++ trunk/Installer/WiX/Config.wxi 2009-06-04 19:31:10 UTC (rev 6819) @@ -27,6 +27,7 @@ <?define DesktopShortcutGuid = "CFF6BDA0-483F-496e-819F-0FC8874C2B9C" ?> <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC80_CRT_x86_x64.msm" ?> + <?define MfcMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC80_MFC_x86_x64.msm" ?> <?else ?> <!-- if "x86" platform --> <?define Win64 = "no" ?> <?define PackagePlatform = "x86" ?> @@ -41,5 +42,6 @@ <?define DesktopShortcutGuid = "36035411-C6BE-43e8-B569-B1EC325D180C" ?> <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC80_CRT_x86.msm" ?> + <?define MfcMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC80_MFC_x86.msm" ?> <?endif ?> </Include> \ No newline at end of file Modified: trunk/Installer/WiX/Fragments/Features.wxs =================================================================== --- trunk/Installer/WiX/Fragments/Features.wxs 2009-06-04 19:20:32 UTC (rev 6818) +++ trunk/Installer/WiX/Fragments/Features.wxs 2009-06-04 19:31:10 UTC (rev 6819) @@ -108,6 +108,9 @@ <Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2005 Runtime Components "> <MergeRef Id="CRT"/> </Feature> + <Feature Id="MFC" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2005 MFC Components "> + <MergeRef Id="MFC"/> + </Feature> </Feature> </Fragment> </Wix> Modified: trunk/Installer/WiX/WinMerge.wxs =================================================================== --- trunk/Installer/WiX/WinMerge.wxs 2009-06-04 19:20:32 UTC (rev 6818) +++ trunk/Installer/WiX/WinMerge.wxs 2009-06-04 19:31:10 UTC (rev 6819) @@ -60,6 +60,7 @@ </Directory> <Directory Id="DesktopFolder" /> <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" /> + <Merge Id="MFC" Language="0" SourceFile="$(var.MfcMergeModule)" DiskId="1" /> </Directory> <FeatureRef Id="WinMerge" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-07-06 18:34:31
|
Revision: 6900 http://winmerge.svn.sourceforge.net/winmerge/?rev=6900&view=rev Author: gerundt Date: 2009-07-06 18:34:04 +0000 (Mon, 06 Jul 2009) Log Message: ----------- PATCH: [ 2783915 ] Do not install plugins at all - Drop plugins from MSI setup too Modified Paths: -------------- trunk/Installer/WiX/Fragments/Features.wxs trunk/Installer/WiX/WinMerge.wixproj Removed Paths: ------------- trunk/Installer/WiX/Fragments/Plugins.wxs Modified: trunk/Installer/WiX/Fragments/Features.wxs =================================================================== --- trunk/Installer/WiX/Fragments/Features.wxs 2009-07-05 14:22:19 UTC (rev 6899) +++ trunk/Installer/WiX/Fragments/Features.wxs 2009-07-06 18:34:04 UTC (rev 6900) @@ -89,22 +89,6 @@ <ComponentRef Id="Turkish" /> <ComponentRef Id="Ukrainian" /> </Feature> - <?if not $(var.Platform) = "x64" ?> - <Feature Id="Plugins" AllowAdvertise="no" Level="4" Title="Plugins"> - <ComponentRef Id="editoraddin" /> - <ComponentRef Id="insertdatetime" /> - <ComponentRef Id="CompareMSExcelFiles" /> - <ComponentRef Id="CompareMSWordFiles" /> - <ComponentRef Id="DisplayXMLFiles" /> - <ComponentRef Id="IgnoreColumns" /> - <ComponentRef Id="IgnoreCommentsC" /> - <ComponentRef Id="IgnoreFieldsComma" /> - <ComponentRef Id="IgnoreFieldsTab" /> - <ComponentRef Id="IgnoreLeadingLineNumbers" /> - <ComponentRef Id="WatchBeginningOfLog" /> - <ComponentRef Id="WatchEndOfLog" /> - </Feature> - <?endif ?> <Feature Id="CRT" AllowAdvertise="no" Display="hidden" Level="1" Title="Microsoft Visual C++ 2005 Runtime Components "> <MergeRef Id="CRT"/> </Feature> Deleted: trunk/Installer/WiX/Fragments/Plugins.wxs =================================================================== --- trunk/Installer/WiX/Fragments/Plugins.wxs 2009-07-05 14:22:19 UTC (rev 6899) +++ trunk/Installer/WiX/Fragments/Plugins.wxs 2009-07-06 18:34:04 UTC (rev 6900) @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - <?include ..\Config.wxi ?> - <Fragment> - <?if not $(var.Platform) = "x64" ?> - <DirectoryRef Id="PLUGINSDIR"> - <Component Id="editoraddin" Guid="*" Win64="no"> - <File Id="editoraddinSCT" - Name="editor addin.sct" - Source="..\..\Plugins\dlls\editor addin.sct" - Vital="no" /> - </Component> - - <Component Id="insertdatetime" Guid="*" Win64="no"> - <File Id="insertdatetimeSCT" - Name="insert datetime.sct" - Source="..\..\Plugins\dlls\insert datetime.sct" - Vital="no" /> - </Component> - - <Component Id="CompareMSExcelFiles" Guid="*" Win64="no"> - <File Id="CompareMSExcelFilesDLL" - Name="CompareMSExcelFiles.dll" - Source="..\..\Plugins\dlls\CompareMSExcelFiles.dll" - Vital="no" /> - </Component> - - <Component Id="CompareMSWordFiles" Guid="*" Win64="no"> - <File Id="CompareMSWordFilesDLL" - Name="CompareMSWordFiles.dll" - Source="..\..\Plugins\dlls\CompareMSWordFiles.dll" - Vital="no" /> - </Component> - - <Component Id="DisplayXMLFiles" Guid="*" Win64="no"> - <File Id="DisplayXMLFilesDLL" - Name="DisplayXMLFiles.dll" - Source="..\..\Plugins\dlls\DisplayXMLFiles.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreColumns" Guid="*" Win64="no"> - <File Id="IgnoreColumnsDLL" - Name="IgnoreColumns.dll" - Source="..\..\Plugins\dlls\IgnoreColumns.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreCommentsC" Guid="*" Win64="no"> - <File Id="IgnoreCommentsCDLL" - Name="IgnoreCommentsC.dll" - Source="..\..\Plugins\dlls\IgnoreCommentsC.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreFieldsComma" Guid="*" Win64="no"> - <File Id="IgnoreFieldsCommaDLL" - Name="IgnoreFieldsComma.dll" - Source="..\..\Plugins\dlls\IgnoreFieldsComma.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreFieldsTab" Guid="*" Win64="no"> - <File Id="IgnoreFieldsTabDLL" - Name="IgnoreFieldsTab.dll" - Source="..\..\Plugins\dlls\IgnoreFieldsTab.dll" - Vital="no" /> - </Component> - - <Component Id="IgnoreLeadingLineNumbers" Guid="*" Win64="no"> - <File Id="IgnoreLeadingLineNumbersDLL" - Name="IgnoreLeadingLineNumbers.dll" - Source="..\..\Plugins\dlls\IgnoreLeadingLineNumbers.dll" - Vital="no" /> - </Component> - - <Component Id="WatchBeginningOfLog" Guid="*" Win64="no"> - <File Id="WatchBeginningOfLogDLL" - Name="WatchBeginningOfLog.dll" - Source="..\..\Plugins\dlls\WatchBeginningOfLog.dll" - Vital="no" /> - </Component> - - <Component Id="WatchEndOfLog" Guid="*" Win64="no"> - <File Id="WatchEndOfLogDLL" - Name="WatchEndOfLog.dll" - Source="..\..\Plugins\dlls\WatchEndOfLog.dll" - Vital="no" /> - </Component> - </DirectoryRef> - <?endif ?> - </Fragment> -</Wix> Modified: trunk/Installer/WiX/WinMerge.wixproj =================================================================== --- trunk/Installer/WiX/WinMerge.wixproj 2009-07-05 14:22:19 UTC (rev 6899) +++ trunk/Installer/WiX/WinMerge.wixproj 2009-07-06 18:34:04 UTC (rev 6900) @@ -22,7 +22,6 @@ <Compile Include="Fragments\Docs.wxs"/> <Compile Include="Fragments\Filters.wxs"/> <Compile Include="Fragments\Languages.wxs"/> - <Compile Include="Fragments\Plugins.wxs"/> <Compile Include="Fragments\Features.wxs"/> <Compile Include="Fragments\WixUI_WinMerge.wxs"/> </ItemGroup> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ki...@us...> - 2010-01-12 21:52:27
|
Revision: 7096 http://winmerge.svn.sourceforge.net/winmerge/?rev=7096&view=rev Author: kimmov Date: 2010-01-12 21:52:21 +0000 (Tue, 12 Jan 2010) Log Message: ----------- Update ShellExtension build folders to WiX installer. Modified Paths: -------------- trunk/Installer/WiX/Config.wxi trunk/Installer/WiX/Fragments/Core.wxs Modified: trunk/Installer/WiX/Config.wxi =================================================================== --- trunk/Installer/WiX/Config.wxi 2010-01-12 21:45:51 UTC (rev 7095) +++ trunk/Installer/WiX/Config.wxi 2010-01-12 21:52:21 UTC (rev 7096) @@ -22,6 +22,7 @@ <?define MergeBuildDir = "..\..\Build\x64\MergeRelease" ?> <?define ExpatBuildDir = "..\..\Build\expat\lib\x64\Release" ?> <?define PcreBuildDir = "..\..\Build\pcre\lib\x64\Release" ?> + <?define ShellExtBuildDir = "..\..\Build\ShellExtension\x64 release" ?> <?define StartMenuShortcutsGuid = "CDC49AA0-DC37-439d-8358-68E2EA9EF909" ?> <?define DesktopShortcutGuid = "CFF6BDA0-483F-496e-819F-0FC8874C2B9C" ?> @@ -37,6 +38,7 @@ <?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?> <?define ExpatBuildDir = "..\..\Build\expat" ?> <?define PcreBuildDir = "..\..\Build\pcre" ?> + <?define ShellExtBuildDir = "..\..\Build\ShellExtension\unicode release mindependency" ?> <?define StartMenuShortcutsGuid = "12413436-9929-453c-870B-03146CE11960" ?> <?define DesktopShortcutGuid = "36035411-C6BE-43e8-B569-B1EC325D180C" ?> Modified: trunk/Installer/WiX/Fragments/Core.wxs =================================================================== --- trunk/Installer/WiX/Fragments/Core.wxs 2010-01-12 21:45:51 UTC (rev 7095) +++ trunk/Installer/WiX/Fragments/Core.wxs 2010-01-12 21:52:21 UTC (rev 7096) @@ -53,13 +53,13 @@ <File Id="ShellExtensionX64DLL" Name="ShellExtensionX64.dll" SelfRegCost="1" - Source="..\..\Build\ShellExtensionX64\ShellExtensionX64.dll" + Source="$(var.ShellExtBuildDir)\ShellExtensionX64.dll" Vital="yes" /> <?else ?> <File Id="ShellExtensionUDLL" Name="ShellExtensionU.dll" SelfRegCost="1" - Source="$(var.MergeBuildDir)\ShellExtensionU.dll" + Source="$(var.ShellExtBuildDir)\ShellExtensionU.dll" Vital="yes" /> <?endif ?> </Component> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |