OSDN Git Service

release build succesful
authorFrank Li <lznuaa@gmail.com>
Tue, 9 Dec 2008 14:33:18 +0000 (22:33 +0800)
committerFrank Li <lznuaa@gmail.com>
Tue, 9 Dec 2008 14:33:18 +0000 (22:33 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
18 files changed:
src/Git/Git.vcproj
src/TortoiseGitSetup/FeaturesFragment.wxi [moved from src/TortoiseGitSetup/FeaturesFragment.wxs with 91% similarity]
src/TortoiseGitSetup/Includes.wxi
src/TortoiseGitSetup/License.rtf
src/TortoiseGitSetup/StructureFragment.wxi [new file with mode: 0644]
src/TortoiseGitSetup/StructureFragment.wxs [deleted file]
src/TortoiseGitSetup/SubWCRev.wxs
src/TortoiseGitSetup/TortoiseSVN.wxs
src/TortoiseGitSetup/UIFragment.wxi [moved from src/TortoiseGitSetup/UIFragment.wxs with 98% similarity]
src/TortoiseGitSetup/VersionNumberInclude.wxi
src/TortoiseGitSetup/WiXSetup.wixproj
src/TortoiseGitSetup/WixUI_Simplest.wxs
src/TortoiseProc/CheckoutDlg.h
src/TortoiseProc/Commands/CloneCommand.cpp
src/TortoiseProc/TortoiseProc.vcproj
src/TortoiseProc/gitstatuslistctrl.cpp [deleted file]
src/TortoiseShell/TortoiseShell.vcproj
src/Utils/Utils.vcproj

index 1c9dbe5..98377f9 100644 (file)
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="../utils"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
similarity index 91%
rename from src/TortoiseGitSetup/FeaturesFragment.wxs
rename to src/TortoiseGitSetup/FeaturesFragment.wxi
index b8d68d8..982fba1 100644 (file)
@@ -1,8 +1,7 @@
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
-       <?include Includes.wxi?>\r
-       <Fragment Id="FeaturesFragment">\r
-               <Feature Id="DefaultFeature" Level="1" ConfigurableDirectory="INSTALLDIR" Title="TortoiseSVN" Absent="disallow"\r
-               TypicalDefault="install" Description="The TortoiseSVN package and dependencies." Display="expand" InstallDefault="local" >\r
+<?xml version="1.0" encoding="utf-8"?>\r
+<Include>\r
+               <Feature Id="DefaultFeature" Level="1" ConfigurableDirectory="INSTALLDIR" Title="TortoiseGit" Absent="disallow"\r
+               TypicalDefault="install" Description="The TortoiseGit package and dependencies." Display="expand" InstallDefault="local" >\r
                        <ComponentRef Id="C__infofiles" />\r
                        <ComponentRef Id="C__apr" />\r
                        <ComponentRef Id="C__sasl" />\r
@@ -80,5 +79,4 @@ DO NOT INSTALL THIS FEATURE if you don't use VS.NET with Web Projects!!!"
                        <?endif ?>\r
 \r
                </Feature>\r
-       </Fragment>\r
-</Wix>\r
+</Include>
\ No newline at end of file
index f5c42f1..f8ddd52 100644 (file)
@@ -6,17 +6,17 @@
        <!-- General ..................................................................... -->\r
        <?define VersionNumberInternal="$(var.MajorVersion).$(var.MinorVersion).$(var.BuildVersion)" ?>\r
        <?define VersionNumberUserVisible="$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)" ?>\r
-       <?define ProductName="TortoiseSVN" ?>\r
+       <?define ProductName="TortoiseGit" ?>\r
 \r
-       <?define PackageKeywords="Sourcecontrol;Subversion;TortoiseSVN;Shell" ?>\r
-       <?define PackageDescription="Subversion Client" ?>\r
-       <?define PackageComments="Windows Shell Integration For SubVersion Source Control, v$(var.VersionNumberUserVisible)" ?>\r
-       <?define PackageManufacturer="Stefan Kueng" ?>\r
-       <?define TortoiseSvnOrg="http://tortoisesvn.net/"?>\r
+       <?define PackageKeywords="Sourcecontrol;Git;TortoiseGit;Shell" ?>\r
+       <?define PackageDescription="Git Client" ?>\r
+       <?define PackageComments="Windows Shell Integration For Git Source Control, v$(var.VersionNumberUserVisible)" ?>\r
+       <?define PackageManufacturer="Frank Li" ?>\r
+       <?define TortoiseSvnOrg="http://code.google.com/p/TortoiseGit/"?>\r
 \r
        <!-- Platform specifics ........................................................... -->\r
 \r
-       <?if $(env.Platform) = "x64" ?>\r
+       <?if $(var.Platform) = "x64" ?>\r
        <?define Win64YesNo="yes" ?>\r
        <?define ReleasePath="Release64" ?>\r
        <?define PlatformPathExtension="x64" ?>\r
        <?define Win64YesNo="no" ?>\r
        <?define ReleasePath="Release" ?>\r
        <?define PlatformPathExtension="win32" ?>\r
-       <?define PackagePlatforms="Intel" ?>\r
+       <?define PackagePlatforms="x86" ?>\r
        <?define PlatformUserVisible="(32 bit)" ?>\r
        <?endif?>\r
 \r
        <!-- GUIDs ....................................................................... -->\r
 \r
        <?if $(var.Platform) = "x64" ?>\r
-       <?define UpgradeGuid="6113DD64-FD87-491a-9D05-0D1749DF7E18" ?>\r
+       <?define UpgradeGuid="F46D0E11-F71A-48a0-8A7B-FD8669B5080C" ?>\r
        <?else?>\r
-       <?define UpgradeGuid="3E07F1EB-9543-437C-9DE2-58FFCADD39A9" ?>\r
+       <?define UpgradeGuid="DA0E5440-E13D-4852-AE01-15CD0264D489" ?>\r
        <?endif?>\r
 \r
-       <?define GuidUncontrolled="30351349-7B7D-4FCC-81B4-1E394CA267EB"?>\r
-       <?define GuidDropHandler="3035134A-7B7D-4FCC-81B4-1E394CA267EB"?>\r
-       <?define GuidAdded="3035134E-7B7D-4FCC-81B4-1E394CA267EB"?>\r
-       <?define GuidLocked="3035134D-7B7D-4FCC-81B4-1E394CA267EB"?>\r
-       <?define GuidDeleted="3035134C-7B7D-4FCC-81B4-1E394CA267EB"?>\r
-       <?define GuidNormal="30351346-7B7D-4FCC-81B4-1E394CA267EB"?>\r
-       <?define GuidReadonly="3035134B-7B7D-4FCC-81B4-1E394CA267EB"?>\r
-       <?define GuidModified="30351347-7B7D-4FCC-81B4-1E394CA267EB"?>\r
-       <?define GuidConflict="30351348-7B7D-4FCC-81B4-1E394CA267EB"?>\r
-       <?define GuidIgnored="3035134F-7B7D-4FCC-81B4-1E394CA267EB"?>\r
-       <?define GuidUnversioned="30351350-7B7D-4FCC-81B4-1E394CA267EB"?>\r
+       <?define GuidUncontrolled="10A0FDD2-B0C0-4cd4-A7AE-E594CE3B91C8"?>\r
+       <?define GuidDropHandler="6A4800FA-13B4-4cb4-9A37-97E7FAEDA731"?>\r
+       <?define GuidAdded="A38915E4-A460-4143-8D6B-0B45564C6A00"?>\r
+       <?define GuidLocked="4E453CBA-2AAB-465c-A01E-627A7BE9ED73"?>\r
+       <?define GuidDeleted="D69716CD-6993-4d0d-898F-5EBBC25C5D4D"?>\r
+       <?define GuidNormal="451C7E59-058F-450a-8C42-FE9A12A302FC"?>\r
+       <?define GuidReadonly="5F380D0B-EE64-479b-B2AD-EF437BF4B0A6"?>\r
+       <?define GuidModified="8DA7CDCB-DC0B-4246-80BD-812E942734AF"?>\r
+       <?define GuidConflict="475A024D-6157-4e03-8C61-D1FA9806415C"?>\r
+       <?define GuidIgnored="1B94B098-57C6-4c39-9DC5-8EB00E423D3E"?>\r
+       <?define GuidUnversioned="18BF1135-6EA2-405f-A71E-16EEE7F71F8B"?>\r
+  <!--\r
        <?define GuidSubWCRev="F26E2640-0CFF-43DC-8325-575A3261D885"?>\r
        <?define GuidSubWCRevTypeLib="40ACF49D-74FF-4165-94E9-0E002C448520"?>\r
        <?define GuidSubWCRevInterface="2F5EA5B0-4DE7-4f96-8E6B-FC0C37D9C0D6"?>\r
-\r
+  -->\r
        <!-- Target specific component GUIDs ............................................. -->\r
 \r
        <?if $(var.Platform) = "x64" ?>\r
-       <?define GuidInfoFiles="9ED40327-2473-4060-9BB9-09DA84F6BAE7"?>\r
-       <?define GuidProgramMenuFolder="106CFF43-EC40-48b0-BDAD-6C3D7E5EEDD3"?>\r
+       <?define GuidInfoFiles="B776F75C-B019-44b1-957A-3F58D3A225CF"?>\r
+       <?define GuidProgramMenuFolder="B776F75C-B019-44b1-957A-3F58D3A225CF"?>\r
 \r
-       <?define GuidShellRegistry="A3380CB4-2909-4704-8826-68FF68081E50"?>\r
-       <?define GuidMachineRegistry="ED3ED854-3BC4-4c6f-BCB0-21D472F5370C"?>\r
-       <?define GuidApproveShellComponents="1A24BED1-003F-49e7-8CF0-81E24DAA5108"?>\r
-       <?define GuidSvnProtocol="F648F715-1409-4b3a-A38C-C2733A6709EB"?>\r
-       <?define GuidASPNETHack="7716E7D1-0EF3-43de-80B1-360FBA56B2AA"?>\r
+       <?define GuidShellRegistry="9E011A3C-F5D1-47ab-8BE2-443C2FFF9499"?>\r
+       <?define GuidMachineRegistry="9E011A3C-F5D1-47ab-8BE2-443C2FFF9499"?>\r
+       <?define GuidApproveShellComponents="E7E43AE0-DB46-4af9-95EA-2EF7AD3F2119"?>\r
+       <?define GuidSvnProtocol="0AD2B787-A9B3-4ad7-99A5-EC6DFF0EB2B7"?>\r
+       <?define GuidASPNETHack="C9279E7B-3D81-4c9e-962F-987252011A29"?>\r
 \r
-       <?define GuidLibSSL="9DC58B6C-E3F3-4612-8B5B-8AC8F06FCDC7"?>\r
-       <?define GuidBerkeleyDB="004AB3B8-9DFF-48b2-B6A9-DB4E8536E4EF"?>\r
-       <?define GuidAPR="CCCE8851-346A-4898-B778-927661FC1AA0"?>\r
-       <?define GuidSASL="C89F08D0-1855-4409-A8F5-199481FD1F4D"?>\r
-       <?define GuidGettext="BF140EE2-5F0B-41b6-A9EF-EE9ACD2F0B78"?>\r
-       <?define GuidCrashRpt="112578CA-CCFE-4709-AFD7-5B4D0F5692BE"?>\r
+       <?define GuidLibSSL="CB2A61D8-AE23-4b9b-AC7D-473E2610367E"?>\r
+       <?define GuidBerkeleyDB="D1002679-2234-4c1e-AEBD-F65DAE45A02E"?>\r
+       <?define GuidAPR="72EB77A1-E5CD-4cdb-BFC2-77FDCFD04ACF"?>\r
+       <?define GuidSASL="6836861E-C998-4c3c-8671-97ADA341AD60"?>\r
+       <?define GuidGettext="5C19D01A-557F-4568-9368-852BD62B85A0"?>\r
+       <?define GuidCrashRpt="69B216BC-60D2-4675-A4E5-1ECFB26A4AED"?>\r
 \r
-       <?define GuidHelpEN="53416983-DD93-4b57-BC13-F246057B592A"?>\r
+       <?define GuidHelpEN="7AB0A6AA-1283-4a2a-B989-D8117ACB9FC4"?>\r
 \r
-       <?define GuidTortoiseSVN="AE3E4132-4EF5-4297-8444-32B73D916FA0"?>\r
+       <?define GuidTortoiseSVN="2F61414B-4884-497f-A066-0D0C86A4872A"?>\r
        <?define GuidTortoiseSVNShortcuts="BFF1875C-D7A8-49cf-BD30-C2B76C5576CF"?>\r
-       <?define GuidTortoiseMerge="025743B0-BDC1-4014-90D0-5610865BC473"?>\r
+       <?define GuidTortoiseMerge="8D5CCE58-8F79-4ff1-A25A-E40D41357D45"?>\r
        <?define GuidTortoiseMergeShortcuts="659A37E6-CE9A-4a30-AFF5-6FA1A077AA33"?>\r
-       <?define GuidSounds="CCFE23E1-6EE7-4dc6-83C6-955DC19A6FC1"?>\r
-       <?define GuidTortoiseBlame="2277EF11-7D34-453f-9D83-531F4AE349ED"?>\r
+       <?define GuidSounds="504B02AA-9C6E-4639-99BC-8F5A885BACBD"?>\r
+       <?define GuidTortoiseBlame="4B84CF65-1FE5-4736-B880-F04490D150C5"?>\r
        <?define GuidTortoiseIDiff="75D19614-B4D4-4661-A7EB-683CEE849CF3"?>\r
-       <?define GuidTortoiseIDiffShortcuts="423FB20D-5691-4123-9EC6-86B9B87F62E6"?>\r
-       <?define GuidTortoiseUDiff="58D894C4-029F-4bc2-B61D-F9BE5BB71277"?>\r
-       <?define GuidTortoiseUDiffAssoc="2340FAE7-4B1D-4877-9A5B-5AA22C396267"?>\r
-       <?define GuidPlainSettingsShortcuts="F8A9F712-5239-4510-852D-224F9F7FD196"?>\r
-       <?define GuidPlatformSettingsShortcuts="737F9B77-C40B-4770-9585-BC541BBA5716"?>\r
+       <?define GuidTortoiseIDiffShortcuts="7312EFB9-4775-4b9c-8FE8-4E9F8C1D5586"?>\r
+       <?define GuidTortoiseUDiff="F41B3D1B-E500-457e-876E-86A0186BE7B5"?>\r
+       <?define GuidTortoiseUDiffAssoc="1A2972B9-F6B2-4dd5-B656-30638ACCF205"?>\r
+       <?define GuidPlainSettingsShortcuts="D78CE764-1770-4d38-9229-F5068D8738FD"?>\r
+       <?define GuidPlatformSettingsShortcuts="256F134F-87F1-418f-BA9A-AFA92270D42D"?>\r
 \r
-       <?define GuidDictionaryENGB="1CC29BB2-023E-4d59-82DD-8C26E59F4280"?>\r
-       <?define GuidDictionaryENUS="46A24184-E5C0-4f6e-BD24-9EA6BDCD6DE2"?>\r
+       <?define GuidDictionaryENGB="03B4BF1F-7CBB-4f14-BE09-5DAA6F38B976"?>\r
+       <?define GuidDictionaryENUS="5E7DDA35-1078-40c1-8428-14808AF7DB96"?>\r
 \r
-       <?define GuidDiffScripts="448D99A8-A18D-45d4-9DC7-E389C5D03CCC"?>\r
+       <?define GuidDiffScripts="A4FB4DC3-489C-4144-A286-C2693356E04A"?>\r
 \r
-       <?define GuidIconsClassic="548E03CB-7391-472c-8150-42B4546F54FA"?>\r
-       <?define GuidIconsCVSClassic="5B8AEE2D-9513-4b9f-AC76-3B6A2248126D"?>\r
-       <?define GuidIconsModern="C5987858-CFF2-4c96-973A-6522918A35C7"?>\r
-       <?define GuidIconsXPStyle="CA95AE19-433B-4771-ADA8-52506EF8D5E7"?>\r
-       <?define GuidIconsMarkPhippard="23BC56D1-3916-4800-A741-4BA63AA7C3C0"?>\r
-       <?define GuidIconsStraight="E25A0D4F-6C68-4eff-8220-8797F42E3AD8"?>\r
+       <?define GuidIconsClassic="1123191B-D931-49ae-A6D0-551CC82B8E83"?>\r
+       <?define GuidIconsCVSClassic="5D337941-A1FA-46a4-9B23-B6EDB133D97C"?>\r
+       <?define GuidIconsModern="4C840CEE-A967-4784-AF1C-617757D60DBB"?>\r
+       <?define GuidIconsXPStyle="53FBA4D1-B436-4f1c-875C-0A7FA18002FE"?>\r
+       <?define GuidIconsMarkPhippard="53FBA4D1-B436-4f1c-875C-0A7FA18002FE"?>\r
+       <?define GuidIconsStraight="53FBA4D1-B436-4f1c-875C-0A7FA18002FE"?>\r
 \r
        <?else?>\r
 \r
-       <?define GuidInfoFiles="625A2E1E-90D3-4107-8AE8-C5C37975FEA0"?>\r
-       <?define GuidProgramMenuFolder="46F6E6A9-843F-4039-8F6C-450953BB47F2"?>\r
-\r
-       <?define GuidShellRegistry="D3F48AA6-A01B-47C5-A314-70319092E89A"?>\r
-       <?define GuidMachineRegistry="4913F361-DE93-490C-81D0-1FB002EBF141"?>\r
-       <?define GuidApproveShellComponents="A5B89BEC-D213-461D-AACD-8F46477E87D0"?>\r
-       <?define GuidSvnProtocol="02271D5C-3065-4038-AD86-46A271854FA6"?>\r
-       <?define GuidASPNETHack="12212FA2-8FE5-4ebb-A413-B1D2017F628C"?>\r
-\r
-       <?define GuidLibSSL="A50352B2-803D-44ee-89AF-E5D2A895C1B4"?>\r
-       <?define GuidBerkeleyDB="556D1AD4-384C-4ece-A3C8-A5A29FE78F22"?>\r
-       <?define GuidAPR="8C10D3B6-6C92-453c-91B8-56BC22942C96"?>\r
-       <?define GuidSASL="73ED8A02-2ADB-40cb-B28D-A2FCFE2D6B1B"?>\r
-       <?define GuidGettext="D47C005D-7017-4bd3-8197-9B3C5B206EBF"?>\r
-       <?define GuidCrashRpt="2FEF52B8-7D4D-4fd3-8D26-6177AAA60B03"?>\r
-\r
-       <?define GuidHelpEN="012FDAFF-53D4-420B-87A2-72C88B859D09"?>\r
-\r
-       <?define GuidTortoiseSVN="2F1FD4CC-32F0-51FB-A9CE-9DB539518655"?>\r
-       <?define GuidTortoiseSVNShortcuts="0AF473FD-2AF6-476b-A919-AE5E3F1F68DD"?>\r
-       <?define GuidTortoiseMerge="2F8D9AF8-A660-47f0-83CE-DD7DA0FB73DD"?>\r
-       <?define GuidTortoiseMergeShortcuts="73E24CEA-9BBE-4944-8EEC-20EE5E6710E9"?>\r
-       <?define GuidSounds="8C3F26B0-D4EE-4EB9-8E88-9FA60AD48B83"?>\r
-       <?define GuidTortoiseBlame="1B00F2A6-4D6B-4DBE-8B69-C8B493B4BBE5"?>\r
-       <?define GuidTortoiseIDiff="42740041-0AD3-4265-BB92-E6035F85F2A9"?>\r
-       <?define GuidTortoiseIDiffShortcuts="8669A999-BFCA-4933-B7E4-54B09D4C7652"?>\r
-       <?define GuidTortoiseUDiff="7164436F-2076-4031-9A11-751AF342C1E9"?>\r
-       <?define GuidTortoiseUDiffAssoc="A4670F92-0639-4b5f-A480-432F493F044F"?>\r
-       <?define GuidPlainSettingsShortcuts="3794CC38-A044-4879-A33B-417419E3524B"?>\r
-       <?define GuidPlatformSettingsShortcuts="676E1787-196E-498a-81B7-DE5C99E107D2"?>\r
-\r
-       <?define GuidDictionaryENGB="3B8C81C0-CC2A-42FB-A619-BA3656113736"?>\r
-       <?define GuidDictionaryENUS="EC574EC2-AD1F-4FA4-9F49-E66C11D38BDF"?>\r
-\r
-       <?define GuidDiffScripts="97BFA893-388D-494d-9C12-1FC868039293"?>\r
-\r
-       <?define GuidIconsClassic="CC0571DE-4A6D-4041-912B-C470EF40114A"?>\r
-       <?define GuidIconsCVSClassic="B96586EC-BE4C-4CCB-B88B-D4CD77CE66FB"?>\r
-       <?define GuidIconsModern="09F2C74B-E4DF-428B-8366-7C0346F7309C"?>\r
-       <?define GuidIconsXPStyle="BEF69706-378E-4EE3-960A-617C2A2C769D"?>\r
-       <?define GuidIconsMarkPhippard="F79F394A-EFF0-47AF-B5DE-BCBE24A2E321"?>\r
-       <?define GuidIconsStraight="5CF62B63-1159-4626-A449-8486104D33AB"?>\r
+       <?define GuidInfoFiles="424219CC-2F91-49ad-B0EF-DB6A61575C99"?>\r
+       <?define GuidProgramMenuFolder="29B86BBB-C17C-4cc9-947D-766D5A89D4F9"?>\r
+\r
+       <?define GuidShellRegistry="EED2630A-E3DA-4046-B642-6296C23DEC2A"?>\r
+       <?define GuidMachineRegistry="27FA9458-F68B-4a26-A36B-D452FD9EABBA"?>\r
+       <?define GuidApproveShellComponents="E3B982F9-7B17-457f-A72F-2F47E9DB1719"?>\r
+       <?define GuidSvnProtocol="508DD925-273C-4170-9D81-55222E2E36AB"?>\r
+       <?define GuidASPNETHack="518F225C-9EB5-46ed-A685-223E9BFCBE99"?>\r
+\r
+       <?define GuidLibSSL="BD9DD138-AEA4-4cf3-982D-8B5EB2A510D9"?>\r
+       <?define GuidBerkeleyDB="BDFC7A7D-6C1A-4da1-9CB6-40D2FB41FB3A"?>\r
+       <?define GuidAPR="DFBE3185-5272-4880-9ED3-F50F21EA9BE7"?>\r
+       <?define GuidSASL="64F29E1B-9B7A-4bf0-A738-32BDD69DE7D8"?>\r
+       <?define GuidGettext="4B23E70B-B46A-4ba2-8EDA-7295C8B75303"?>\r
+       <?define GuidCrashRpt="2B7AD90B-41D9-4a10-834F-1CDD6E366AC7"?>\r
+\r
+       <?define GuidHelpEN="2355B04E-2D12-48c9-8034-372EEB6910D5"?>\r
+\r
+       <?define GuidTortoiseSVN="7BFB3206-4CD3-4c91-A8E3-6FA64C6C4CB9"?>\r
+       <?define GuidTortoiseSVNShortcuts="664008F0-5BF8-4c11-AAA4-A5DD9C237BBF"?>\r
+       <?define GuidTortoiseMerge="F97E61D9-AECD-4160-AB31-5E5C78ADDD9F"?>\r
+       <?define GuidTortoiseMergeShortcuts="C22CF21D-57F0-471b-80AE-E8C101AA27CA"?>\r
+       <?define GuidSounds="0DD7EE86-517F-49a1-AA47-69EA7F171050"?>\r
+       <?define GuidTortoiseBlame="6C0D7DE5-7CDA-4fa2-9939-0AA274C929A7"?>\r
+       <?define GuidTortoiseIDiff="742E7CF3-0255-4100-B241-E753BF92F9F0"?>\r
+       <?define GuidTortoiseIDiffShortcuts="85832CAF-32F7-48ef-8E18-A4271C1DB5ED"?>\r
+       <?define GuidTortoiseUDiff="E41DAF84-C1F5-4e43-9DC8-B5CB84A649D6"?>\r
+       <?define GuidTortoiseUDiffAssoc="6CF22556-FE5B-4640-A184-D60C5B6AEBE7"?>\r
+       <?define GuidPlainSettingsShortcuts="49263747-C09E-4ffe-A0A4-8E8966CBD807"?>\r
+       <?define GuidPlatformSettingsShortcuts="F1B92E39-6F75-4ed4-9099-CB5DC7A91831"?>\r
+\r
+       <?define GuidDictionaryENGB="7218599E-4140-429f-855A-D82B59ED34F9"?>\r
+       <?define GuidDictionaryENUS="B3FD2F77-B14C-448f-8D82-4B21F16711D6"?>\r
+\r
+       <?define GuidDiffScripts="FAF533BB-06AC-4ff1-97D6-4D71E6D8F6C6"?>\r
+\r
+       <?define GuidIconsClassic="DB0D8F52-36BF-404a-A60B-717BB1E134B8"?>\r
+       <?define GuidIconsCVSClassic="A4A54A67-C538-4e5f-AA63-47EA4208AAA6"?>\r
+       <?define GuidIconsModern="7C20C016-9152-4cc1-9E55-7A8D507290B0"?>\r
+       <?define GuidIconsXPStyle="EA15DA03-D008-4d2e-8BC4-F20E0A01418C"?>\r
+       <?define GuidIconsMarkPhippard="40D1B81D-F8FE-4a97-BCF0-F58BE2C9D7A9"?>\r
+       <?define GuidIconsStraight="6176FFF7-3626-4464-8B71-4A5E2551A2B8"?>\r
 \r
        <?endif?>\r
 \r
index 08f517d..bc2b9b4 100644 (file)
@@ -1,47 +1,38 @@
-{\rtf1\ansi\ansicpg1252\r
-{\fonttbl {\f0\fswiss\fcharset0 Arial;}}\r
-\f0\sa100\fs18\lang1033\r
-\r
-Copyright (C) 2003-2008 - TortoiseSVN\r
-\r
-\par\ql\r
-TortoiseSVN is free. You don't have to pay for it, and you can use it \r
-any way you want. It is developed as an Open Source project under the \r
-GNU General Public License (GPL). That means you have full access to \r
-the source code of this program. You can find it on our website at \r
-http://tortoisesvn.tigris.org\r
-\r
-\par\r
-Should you wish to modify or redistribute this program, or any part of it, \r
-you should read the full terms and conditions set out in the license \r
-agreement before doing so. A copy of the license is available on our website.\r
-\r
-\par\r
-If you simply wish to install and use this software, you need only be aware of \r
-the disclaimer conditions in the license, which are set out below.\r
-\r
-\par\b\r
-NO WARRANTY\r
-\r
-\par\b0\r
-Because the program is licensed free of charge, there is no warranty \r
-for the program, to the extent permitted by applicable law.  Except when \r
-otherwise stated in writing the copyright holders and/or other parties \r
-provide the program "as is" without warranty of any kind, either expressed \r
-or implied, including, but not limited to, the implied warranties of \r
-merchantability and fitness for a particular purpose.  The entire risk as \r
-to the quality and performance of the program is with you.  Should the \r
-program prove defective, you assume the cost of all necessary servicing, \r
-repair or correction.\r
-\r
-\par\r
-In no event unless required by applicable law or agreed to in writing \r
-will any copyright holder, or any other party who may modify and/or \r
-redistribute the program as permitted above, be liable to you for damages, \r
-including any general, special, incidental or consequential damages arising \r
-out of the use or inability to use the program (including but not limited \r
-to loss of data or data being rendered inaccurate or losses sustained by \r
-you or third parties or a failure of the program to operate with any other \r
-programs), even if such holder or other party has been advised of the \r
-possibility of such damages.\r
-}\r
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc2\adeff0\deff0\stshfdbch13\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe2052{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;}\r
+{\f13\fnil\fcharset134\fprq2{\*\panose 02010600030101010101}\'cb\'ce\'cc\'e5{\*\falt SimSun};}{\f37\fnil\fcharset134\fprq2{\*\panose 02010600030101010101}@\'cb\'ce\'cc\'e5;}{\f38\froman\fcharset238\fprq2 Times New Roman CE;}\r
+{\f39\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f41\froman\fcharset161\fprq2 Times New Roman Greek;}{\f42\froman\fcharset162\fprq2 Times New Roman Tur;}{\f43\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}\r
+{\f44\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f45\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f46\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f48\fswiss\fcharset238\fprq2 Arial CE;}\r
+{\f49\fswiss\fcharset204\fprq2 Arial Cyr;}{\f51\fswiss\fcharset161\fprq2 Arial Greek;}{\f52\fswiss\fcharset162\fprq2 Arial Tur;}{\f53\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f54\fbidi \fswiss\fcharset178\fprq2 Arial (Arabic);}\r
+{\f55\fswiss\fcharset186\fprq2 Arial Baltic;}{\f56\fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f170\fnil\fcharset0\fprq2 SimSun Western{\*\falt SimSun};}{\f410\fnil\fcharset0\fprq2 @\'cb\'ce\'cc\'e5 Western;}}{\colortbl;\red0\green0\blue0;\r
+\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\r
+\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \r
+\fs24\lang1033\langfe2052\loch\f0\hich\af0\dbch\af13\cgrid\langnp1033\langfenp2052 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*\r
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \r
+\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}}\r
+{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid5258405\rsid16059667}{\*\generator Microsoft Word 11.0.0000;}{\info{\operator Frank Li}{\creatim\yr2008\mo12\dy8\hr14\min57}{\revtim\yr2008\mo12\dy8\hr14\min57}{\version2}{\edmins0}{\nofpages1}\r
+{\nofwords288}{\nofchars1643}{\nofcharsws1928}{\vern24613}{\*\password 00000000}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1800\margr1800\margt1440\margb1440\gutter0\ltrsect \r
+\widowctrl\ftnbj\aenddoc\donotembedsysfont0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3\r
+\jcompress\viewkind1\viewscale150\rsidroot5258405 \fet0{\*\wgrffmtfilter 013f}\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta \hich .}}{\*\pnseclvl2\r
+\pnucltr\pnstart1\pnindent720\pnhang {\pntxta \hich .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta \hich .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta \hich )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb \hich (}\r
+{\pntxta \hich )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb \hich (}{\pntxta \hich )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb \hich (}{\pntxta \hich )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb \hich (}\r
+{\pntxta \hich )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb \hich (}{\pntxta \hich )}}\pard\plain \ltrpar\ql \li0\ri0\sa100\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \r
+\fs24\lang1033\langfe2052\loch\af0\hich\af0\dbch\af13\cgrid\langnp1033\langfenp2052 {\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 Copyright (C) 2003-2008 - Tortoise}{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \r
+\f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 GIT}{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 \r
+\par \hich\af1\dbch\af13\loch\f1 Tortoise}{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 GIT}{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 \r
+ is free. You don't have to pay for it, and you can use it any way you want. It is developed as an Open Source project under the GNU General Public License (GPL). That means you have full access to \hich\af1\dbch\af13\loch\f1 \r
+the source code of this program. You can find it on our website at http://tortoise}{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 Git}{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 \r
+\hich\af1\dbch\af13\loch\f1 .tigris.org\r
+\par \hich\af1\dbch\af13\loch\f1 Should you wish to modify or redistribute this program, or any part of it, you should read the full terms and conditions set out in the license agreement befor\hich\af1\dbch\af13\loch\f1 \r
+e doing so. A copy of the license is available on our website.\r
+\par \hich\af1\dbch\af13\loch\f1 If you simply wish to install and use this software, you need only be aware of the disclaimer conditions in the license, which are set out below.\r
+\par }{\rtlch\fcs1 \ab\af1\afs18 \ltrch\fcs0 \b\f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 NO WARRANTY\r
+\par }{\rtlch\fcs1 \af1\afs18 \ltrch\fcs0 \f1\fs18\insrsid5258405 \hich\af1\dbch\af13\loch\f1 \r
+Because the program is licensed free of charge, there is no warranty for the program, to the extent permitted by applicable law.  Except when otherwise stated in writing the copyright holders and/or other parties provide the program "as is" without warran\r
+\hich\af1\dbch\af13\loch\f1 t\hich\af1\dbch\af13\loch\f1 \r
+y of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.  The entire risk as to the quality and performance of the program is with you.  Should the program p\r
+\hich\af1\dbch\af13\loch\f1 r\hich\af1\dbch\af13\loch\f1 ove defective, you assume the cost of all necessary servicing, repair or correction.\r
+\par \hich\af1\dbch\af13\loch\f1 In no event unless required by applicable law or agreed to in writing will any copyright holder, or any other party who may modify and/or redistribute the program as permi\hich\af1\dbch\af13\loch\f1 \r
+tted above, be liable to you for damages, including any general, special, incidental or consequential damages arising out of the use or inability to use the program (including but not limited to loss of data or data being rendered inaccurate or losses sus\r
+\hich\af1\dbch\af13\loch\f1 t\hich\af1\dbch\af13\loch\f1 ained by you or third parties or a failure of the program to operate with any other programs), even if such holder or other party has been advised of the possibility of such damages.}{\rtlch\fcs1 \r
+\af0 \ltrch\fcs0 \insrsid5258405 \r
+\par }}
\ No newline at end of file
diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
new file mode 100644 (file)
index 0000000..207fb2f
--- /dev/null
@@ -0,0 +1,464 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!--\r
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
+\r
+       <?include Includes.wxi?>\r
+-->\r
+       <?if $(var.Platform) = "x86" ?>\r
+       <?define cf="CommonFilesFolder" ?>\r
+       <?endif ?>\r
+       <?if $(var.Platform) = "x64" ?>\r
+       <?define cf="CommonFiles64Folder" ?>\r
+       <?endif ?>\r
+<!--\r
+       <Fragment Id="StructureFragment">\r
+-->\r
+<Include>\r
+   <Directory Id="TARGETDIR" Name="SourceDir">\r
+      <Directory Id="D__ProgramFilesFolder" ShortName="PFiles" Name="Program Files">\r
+        <Directory Id="INSTALLDIR" ShortName="TSVN" Name="TortoiseGit">\r
+\r
+          <?if $(var.Platform) = "x86" ?>\r
+          <Merge Id='CRT' Language='0' SourceFile='$(var.MergeModules)\microsoft_vc90_crt_x86.msm' DiskId='1' />\r
+          <Merge Id='CRT Policy' Language='0' SourceFile='$(var.MergeModules)\policy_9_0_Microsoft_VC90_CRT_x86.msm' DiskId='1' />\r
+          <Merge Id='MFC' Language='0' SourceFile='$(var.MergeModules)\Microsoft_VC90_MFC_x86.msm' DiskId='1' />\r
+          <Merge Id='MFC Policy' Language='0' SourceFile='$(var.MergeModules)\policy_9_0_Microsoft_VC90_MFC_x86.msm' DiskId='1' />\r
+          <Merge Id='MFCLOC' Language='0' SourceFile='$(var.MergeModules)\Microsoft_VC90_MFCLOC_x86.msm' DiskId='1' />\r
+          <Merge Id='MFCLOC Policy' Language='0' SourceFile='$(var.MergeModules)\policy_9_0_Microsoft_VC90_MFCLOC_x86.msm' DiskId='1' />\r
+          <?endif ?>\r
+\r
+          <?if $(var.Platform) = "x64" ?>\r
+          <Merge Id='CRT' Language='0' Source='$(var.MergeModules)\Microsoft_VC90_CRT_x86_x64.msm' DiskId='1' />\r
+          <Merge Id='CRT Policy' Language='0' Source='$(var.MergeModules)\policy_9_0_Microsoft_VC90_CRT_x86_x64.msm' DiskId='1' />\r
+          <Merge Id='MFC' Language='0' Source='$(var.MergeModules)\Microsoft_VC90_MFC_x86_x64.msm' DiskId='1' />\r
+          <Merge Id='MFC Policy' Language='0' Source='$(var.MergeModules)\policy_9_0_Microsoft_VC90_MFC_x86_x64.msm' DiskId='1' />\r
+          <Merge Id='MFCLOC' Language='0' Source='$(var.MergeModules)\Microsoft_VC90_MFCLOC_x86_x64.msm' DiskId='1' />\r
+          <Merge Id='MFCLOC Policy' Language='0' Source='$(var.MergeModules)\policy_9_0_Microsoft_VC90_MFCLOC_x86_x64.msm' DiskId='1' />\r
+          <?endif ?>\r
+\r
+          <?if $(var.Platform) = "x86" ?>\r
+          <Merge Id='Ovlays' Language='0' SourceFile='..\..\ext\TortoiseOverlays\TortoiseOverlays-1.0.4.11886-win32.msm' DiskId='1' />\r
+          <?endif ?>\r
+\r
+          <?if $(var.Platform) = "x64" ?>\r
+          <Merge Id='Ovlays' Language='0' SourceFile='..\..\ext\TortoiseOverlays\TortoiseOverlays-1.0.4.11886-x64.msm' DiskId='1' />\r
+          <?endif ?>\r
+\r
+          <Component Id="C__infofiles" Guid="$(var.GuidInfoFiles)" Win64="$(var.Win64YesNo)">\r
+            <File Id="F__changelog" ShortName="CHANGELG.TXT" Name="Changelog.txt" DiskId="1" Source="..\Changelog.txt" KeyPath="yes" />\r
+            <File Id="F__subversionlicense" ShortName="LICENSES.TXT" Name="Subversion license.txt" DiskId="1" Source="..\..\ext\Subversion\subversion\LICENSE" />\r
+            <File Id="F__tortoisesvnlicense" ShortName="LICENSE.TXT" Name="TortoiseSVN License.txt" DiskId="1" Source="..\gpl.txt" />\r
+            <File Id="F__openssllicense" ShortName="OSSL_LIC.TXT" Name="OpenSSL License.txt" DiskId="1" Source="include\OpenSSL_License.txt" />\r
+            <File Id="F__aprlicense" ShortName="APR_LIC.TXT" Name="apr License.txt" DiskId="1" Source="..\..\ext\apr\LICENSE" />\r
+            <File Id="F__sasllicense" ShortName="CYRUSSAS.TXT" Name="CyrusSASL License.txt" DiskId="1" Source="include\CyrusSASL_License.txt" />\r
+          </Component>\r
+\r
+          <Component Id="C__ProgramMenuFolder" Guid="$(var.GuidProgramMenuFolder)" Win64="$(var.Win64YesNo)">\r
+            <RemoveFolder Directory="INSTALLDIR" On="uninstall" Id="RemoveFolder_INSTALLDIR" />\r
+            <RemoveFolder Directory="D_TortoisePrgMenu" On="uninstall" Id="RemoveFolder_PrgMenu" />\r
+          </Component>\r
+\r
+          <Component Id="C__shellregistry" Guid="$(var.GuidShellRegistry)" Win64="$(var.Win64YesNo)">\r
+            <Registry Root="HKMU" Key="Software\Classes\Drive\shellex\ContextMenuHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Drive\shellex\ContextMenuHandlers\TortoiseSVN" KeyPath="yes" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Drive\shellex\PropertySheetHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Drive\shellex\PropertySheetHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\ContextMenuHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\ContextMenuHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\DragDropHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\DragDropHandlers\TortoiseSVN" Value="{$(var.GuidDropHandler)}" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\PropertySheetHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\PropertySheetHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Directory\Background\shellex\ContextMenuHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Directory\Background\shellex\ContextMenuHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Folder\shellex\ColumnHandlers\{$(var.GuidUncontrolled)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Folder\shellex\ContextMenuHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Folder\shellex\ContextMenuHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Folder\shellex\DragDropHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Folder\shellex\DragDropHandlers\TortoiseSVN" Value="{$(var.GuidDropHandler)}" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidAdded)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidAdded)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidAdded)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidAdded)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidLocked)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidLocked)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidLocked)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidLocked)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDeleted)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDeleted)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDeleted)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDeleted)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidNormal)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidNormal)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidNormal)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidNormal)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidReadonly)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidReadonly)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidReadonly)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidReadonly)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUncontrolled)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUncontrolled)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUncontrolled)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUncontrolled)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidModified)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidModified)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidModified)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidModified)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDropHandler)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDropHandler)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDropHandler)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDropHandler)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidConflict)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidConflict)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidConflict)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidConflict)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidIgnored)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidIgnored)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidIgnored)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidIgnored)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUnversioned)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUnversioned)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUnversioned)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUnversioned)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\lnkfile\shellex\ContextMenuHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\InternetShortcut\shellex\ContextMenuHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\*\shellex\ContextMenuHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\*\shellex\PropertySheetHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\CopyHookHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
+          </Component>\r
+\r
+          <Component Id="C__machineregistry" Guid="$(var.GuidMachineRegistry)" Win64="$(var.Win64YesNo)">\r
+            <Registry Root="HKLM" Key="Software\[Manufacturer]" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKLM" Key="Software\[Manufacturer]" Name="ProcPath" Value="[INSTALLDIR]bin\TortoiseProc.exe" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\[Manufacturer]" Name="CachePath" Value="[INSTALLDIR]bin\TSVNCache.exe" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\[Manufacturer]" Name="TMergePath" Value="[INSTALLDIR]bin\TortoiseMerge.exe" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\[Manufacturer]" Name="Directory" Value="[INSTALLDIR]" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\SubWCRev.exe" Action="createKeyAndRemoveKeyOnUninstall" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\SubWCRev.exe" Name="Path" Value="[INSTALLDIR]bin" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\SubWCRev.exe" Value="[INSTALLDIR]bin\SubWCRev.exe" Type="string" />\r
+\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Normal" Action="createKey" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Normal" Name="SVN" Value="{$(var.GuidNormal)}" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Modified" Action="createKey" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Modified" Name="SVN" Value="{$(var.GuidModified)}" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Conflict" Action="createKey" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Conflict" Name="SVN" Value="{$(var.GuidConflict)}" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Deleted" Action="createKey" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Deleted" Name="SVN" Value="{$(var.GuidDeleted)}" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\ReadOnly" Action="createKey" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\ReadOnly" Name="SVN" Value="{$(var.GuidReadonly)}" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Locked" Action="createKey" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Locked" Name="SVN" Value="{$(var.GuidLocked)}" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Added" Action="createKey" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Added" Name="SVN" Value="{$(var.GuidAdded)}" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Ignored" Action="createKey" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Ignored" Name="SVN" Value="{$(var.GuidIgnored)}" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Unversioned" Action="createKey" />\r
+            <Registry Root="HKLM" Key="Software\TortoiseOverlays\Unversioned" Name="SVN" Value="{$(var.GuidUnversioned)}" Type="string" />\r
+          </Component>\r
+\r
+          <Component Id="C__approveshellcomponents" Guid="$(var.GuidApproveShellComponents)" Win64="$(var.Win64YesNo)">\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidConflict)}" Value="TortoiseSVN" KeyPath="yes" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidModified)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidDropHandler)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidDeleted)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidNormal)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidUncontrolled)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidReadonly)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidLocked)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidAdded)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidIgnored)}" Value="TortoiseSVN" Type="string" />\r
+            <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidUnversioned)}" Value="TortoiseSVN" Type="string" />\r
+          </Component>\r
+\r
+          <Component Id="C__svnprotocoll" Guid="$(var.GuidSvnProtocol)" Win64="$(var.Win64YesNo)">\r
+            <Registry Root="HKMU" Key="Software\Classes\svn" KeyPath="yes" Value="URL:SVN Protocol" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\svn" Name="URL Protocol" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\svn\DefaultIcon" Value="[INSTALLDIR]bin\TortoiseProc.exe" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\svn\shell\open\command" Value="[INSTALLDIR]bin\TortoiseProc.exe /command:repobrowser /path:&quot;%1&quot;" Type="string" />\r
+\r
+            <Registry Root="HKMU" Key="Software\Classes\svn+ssh" Value="URL:SVN+SSH Protocol" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\svn+ssh" Name="URL Protocol" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\svn+ssh\DefaultIcon" Value="[INSTALLDIR]bin\TortoiseProc.exe" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\svn+ssh\shell\open\command" Value="[INSTALLDIR]bin\TortoiseProc.exe /command:repobrowser /path:&quot;%1&quot;" Type="string" />\r
+\r
+            <Registry Root="HKMU" Key="Software\Classes\tsvn" Value="URL:TSVN Protocol" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\tsvn" Name="URL Protocol" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\tsvn\DefaultIcon" Value="[INSTALLDIR]bin\TortoiseProc.exe" Type="string" />\r
+            <Registry Root="HKMU" Key="Software\Classes\tsvn\shell\open\command" Value="[INSTALLDIR]bin\TortoiseProc.exe /command:checkout /url:&quot;%1&quot;" Type="string" />\r
+          </Component>\r
+\r
+          <Component Id="C__ASPDOTNETHACK" Guid="$(var.GuidASPNETHack)" Win64="$(var.Win64YesNo)">\r
+            <Registry Root="HKCU" Key="Software\TortoiseSVN" KeyPath="yes" Name="ASP.NET KeyPath" Value="ASP.NET" Type="string" />\r
+            <!-- only used because this component needs a key path! -->\r
+            <Environment Id="E__ASPDOTNETHACK" Action="create" Name="SVN_ASP_DOT_NET_HACK" Value="1" Permanent="yes" System="yes" />\r
+          </Component>\r
+          <Directory Id="D__Bin" ShortName="BIN" Name="bin" >\r
+            <Component Id="C__apr" Guid="$(var.GuidAPR)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__libapr" ShortName="LIBAPR.DLL" Name="libapr_tsvn.dll" DiskId="1" Source="..\..\ext\apr\release_$(var.PlatformPathExtension)\libapr_tsvn.dll" KeyPath="yes" />\r
+              <File Id="F__libaprutil" ShortName="LIBAPRUT.DLL" Name="libaprutil_tsvn.dll" DiskId="1" Source="..\..\ext\apr-util\release_$(var.PlatformPathExtension)\libaprutil_tsvn.dll" />\r
+            </Component>\r
+\r
+            <Component Id="C__sasl" Guid="$(var.GuidSASL)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__libsasl" ShortName="LIBSASL.DLL" Name="libsasl.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\libsasl.dll" KeyPath="yes" />\r
+              <File Id="F__saslANONYMOUS" ShortName="saslANON.DLL" Name="saslANONYMOUS.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslANONYMOUS.dll" />\r
+              <File Id="F__saslCRAMMD5" ShortName="saslCRAM.DLL" Name="saslCRAMMD5.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslCRAMMD5.dll" />\r
+              <File Id="F__saslDIGESTMD5" ShortName="saslDIGE.DLL" Name="saslDIGESTMD5.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslDIGESTMD5.dll" />\r
+              <File Id="F__saslLOGIN" ShortName="saslLOGI.DLL" Name="saslLOGIN.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslLOGIN.dll" />\r
+              <File Id="F__saslNTLM" ShortName="saslNTLM.DLL" Name="saslNTLM.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslNTLM.dll" />\r
+              <File Id="F__saslPLAIN" ShortName="saslPLAI.DLL" Name="saslPLAIN.dll" DiskId="1" Source="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslPLAIN.dll" />\r
+            </Component>\r
+\r
+            <Component Id="C__gettext" Guid="$(var.GuidGettext)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__intl" ShortName="INTL3_TS.DLL" Name="intl3_tsvn.dll" DiskId="1" Source="..\..\ext\libintl\libintl3-$(var.PlatformPathExtension)\bin\intl3_tsvn.dll" KeyPath="yes" />\r
+            </Component>\r
+\r
+            <?if $(var.IncludeCrashReportDll) = 1 ?>\r
+            <Component Id="C__crash" Guid="$(var.GuidCrashRpt)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__crashrpt" ShortName="CRASHRPT.DLL" Name="CrashRpt.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\CrashRpt.dll" KeyPath="yes" />\r
+            </Component>\r
+            <?endif ?>\r
+\r
+            <Component Id="C__help_en" Guid="$(var.GuidHelpEN)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F_TortoiseSVN_en" ShortName="TSVNHELP.CHM" Name="TortoiseSVN_en.chm" DiskId="1" Source="..\..\doc\output\TortoiseSVN_en.chm" KeyPath="yes" />\r
+              <File Id="F__TortoiseMerge_en" ShortName="TMEHELP.CHM" Name="TortoiseMerge_en.chm" DiskId="1" Source="..\..\doc\output\TortoiseMerge_en.chm" />\r
+              <RemoveFile Id="F__Tortoise_lang"  Name="*.chm" On="uninstall" />\r
+            </Component>\r
+\r
+            <Component Id="C__TortoiseSVN" Guid="$(var.GuidTortoiseSVN)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__TortoiseProc" ShortName="TORTPROC.EXE" Name="TortoiseProc.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseProc.exe" KeyPath="yes" />\r
+              <File Id="F__TortoiseShell" ShortName="TORTSVN.DLL" Name="TortoiseSVN.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseSVN.dll" />\r
+              <File Id="F__TortoiseStub" ShortName="TORTSTB.DLL" Name="TortoiseStub.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseStub.dll" />\r
+              <File Id="F__TortoisePlink" ShortName="TORTPLI.EXE" Name="TortoisePlink.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoisePlink.exe" />\r
+              <File Id="F__TSVNCache" ShortName="TSVNCACH.EXE" Name="TSVNCache.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TSVNCache.exe" />\r
+              <File Id="F__TSVNAutolist" ShortName="AUTOLIST.TXT" Name="autolist.txt" DiskId="1" Source="include\autolist.txt" />\r
+              <File Id="F__websiteurl" ShortName="WEBSITE.URL" Name="Website.url" Source="include\Website.url" DiskId="1" />\r
+\r
+              <File Id="F__SubWCRev" ShortName="SUBWCREV.EXE" Name="SubWCRev.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\SubWCRev.exe" />\r
+              <File Id="F__SubWCRevCOM" ShortName="SUBWCOM.EXE" Name="SubWCRevCOM.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\SubWCRevCOM.exe" />\r
+              <!-- register the SubWCRev COM-Object -->\r
+              <Environment Id="Environment" Name="PATH" Part="last" System="yes" Value="[INSTALLDIR]bin" Action="set" />\r
+              <!--\r
+              <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidSubWCRev)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidSubWCRev)}\LocalServer32" Value="[INSTALLDIR]bin\SubWCRevCOM.exe /automation" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidSubWCRev)}\ProgID" Value="SubWCRev.object.1" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidSubWCRev)}\VersionIndependentProgID" Value="SubWCRev.object" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidSubWCRev)}\TypeLib" Value="{$(var.GuidSubWCRevTypeLib)}" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidSubWCRev)}" Value="SubWCRev Server Object" Type="string" />\r
+\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object" Action="createKeyAndRemoveKeyOnUninstall" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object" Value="SubWCRev Server Object" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object\CLSID" Value="{$(var.GuidSubWCRev)}" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object\CurVer" Value="SubWCRev.object.1" Type="string" />\r
+\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object.1" Action="createKeyAndRemoveKeyOnUninstall" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object.1" Value="SubWCRev Server Object" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object.1\CLSID" Value="{$(var.GuidSubWCRev)}" Type="string" />\r
+\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\TypeLib\{$(var.GuidSubWCRevTypeLib)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\TypeLib\{$(var.GuidSubWCRevTypeLib)}\1.0" Value="LibSubWCRev" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\TypeLib\{$(var.GuidSubWCRevTypeLib)}\1.0\0" Action="createKeyAndRemoveKeyOnUninstall" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\TypeLib\{$(var.GuidSubWCRevTypeLib)}\1.0\0\win32" Value="[INSTALLDIR]bin\SubWCRevCOM.exe" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\TypeLib\{$(var.GuidSubWCRevTypeLib)}\FLAGS" Value="0" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\TypeLib\{$(var.GuidSubWCRevTypeLib)}\HELPDIR" Value="[INSTALLDIR]" Type="string" />\r
+\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\Interface\{$(var.GuidSubWCRevInterface)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\Interface\{$(var.GuidSubWCRevInterface)}" Value="ISubWCRev" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\Interface\{$(var.GuidSubWCRevInterface)}\ProxyStubClsid" Value="{00020424-0000-0000-C000-000000000046}" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\Interface\{$(var.GuidSubWCRevInterface)}\ProxyStubClsid32" Value="{00020424-0000-0000-C000-000000000046}" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\Interface\{$(var.GuidSubWCRevInterface)}\TypeLib" Value="{$(var.GuidSubWCRevTypeLib)}" Type="string" />\r
+                                                       <Registry Root="HKMU" Key="Software\Classes\Interface\{$(var.GuidSubWCRevInterface)}\TypeLib" Name="Version" Value="1.0" Type="string" />\r
+-->\r
+            </Component>\r
+\r
+            <Component Id="C__TortoiseSVNShortcuts" Guid="$(var.GuidTortoiseSVNShortcuts)" Win64="$(var.Win64YesNo)">\r
+              <Registry Root="HKCU" Key="Software\TortoiseSVN" KeyPath="yes" Name="TortoiseSVN" Value="TortoiseSVN" Type="string" />\r
+              <Shortcut Id="S__Website" Directory="D_TortoisePrgMenu"  Name="Website" Advertise="no"\r
+              Target="[INSTALLDIR]bin\website.url" Description="TortoiseSVN Website" />\r
+              <Shortcut Id="S__RTFM" Directory="D_TortoisePrgMenu" ShortName="TSVN" Name="TortoiseSVN" Advertise="no"\r
+              Target="[INSTALLDIR]bin\TortoiseProc.exe" Description="TortoiseSVN" Arguments="/command:rtfm" Show="normal" />\r
+              <Shortcut Id="S__TortoiseProc" Directory="D_TortoisePrgMenu" Name="Help" Advertise="no"\r
+              Target="[INSTALLDIR]bin\TortoiseProc.exe" Description="Documentation about TortoiseSVN" Arguments="/command:help" Show="normal" />\r
+            </Component>\r
+\r
+            <Component Id="C__TortoiseMerge" Guid="$(var.GuidTortoiseMerge)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__TortoiseMerge" ShortName="TMERGE.EXE" Name="TortoiseMerge.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseMerge.exe" KeyPath="yes" />\r
+            </Component>\r
+\r
+            <Component Id="C__TortoiseMergeShortcuts" Guid="$(var.GuidTortoiseMergeShortcuts)" Win64="$(var.Win64YesNo)">\r
+              <Registry Root="HKCU" Key="Software\TortoiseSVN" KeyPath="yes" Name="TortoiseMerge" Value="TortoiseMerge" Type="string" />\r
+              <Shortcut Id="S__TortoiseMerge" Directory="D_TortoisePrgMenu" ShortName="TMERGE" Name="TortoiseMerge" Advertise="no"\r
+              Target="[INSTALLDIR]bin\TortoiseMerge.exe" Description="View Diff's, Merge Diff's, Resolve Conflicted Files and Apply Patches" Show="normal" />\r
+            </Component>\r
+\r
+            <Component Id="C__Sounds" Guid="$(var.GuidSounds)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__sounderror" ShortName="TERROR.WAV" Name="TortoiseSVN_error.wav" DiskId="1" Source="..\Resources\TortoiseSVN_error.wav" KeyPath="yes" />\r
+              <File Id="F__soundwarning" ShortName="TWARN.WAV" Name="TortoiseSVN_Warning.wav" DiskId="1" Source="..\Resources\TortoiseSVN_Warning.wav" />\r
+              <File Id="F__soundnotification" ShortName="TNOTIFY.WAV" Name="TortoiseSVN_Notification.wav" DiskId="1" Source="..\Resources\TortoiseSVN_Notification.wav" />\r
+            </Component>\r
+\r
+            <Component Id="C__TortoiseBlame" Guid="$(var.GuidTortoiseBlame)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__TortoiseBlame" ShortName="TBLAME.EXE" Name="TortoiseBlame.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseBlame.exe" KeyPath="yes" />\r
+              <File Id="F__SciLexer" ShortName="SCILEX.DLL" Name="SciLexer.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\SciLexer.dll" />\r
+            </Component>\r
+\r
+            <Component Id="C__TortoiseIDiff" Guid="$(var.GuidTortoiseIDiff)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__TortoiseIDiff" ShortName="TIDIFF.EXE" Name="TortoiseIDiff.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseIDiff.exe" KeyPath="yes" />\r
+            </Component>\r
+\r
+            <Component Id="C__TortoiseIDiffShortcuts" Guid="$(var.GuidTortoiseIDiffShortcuts)" Win64="$(var.Win64YesNo)">\r
+              <Registry Root="HKCU" Key="Software\TortoiseSVN" KeyPath="yes" Name="TortoiseIDiff" Value="TortoiseIDiff" Type="string" />\r
+              <Shortcut Id="S__TortoiseIDiff" Directory="D_TortoisePrgMenu" ShortName="TIDIFF" Name="TortoiseIDiff" Advertise="no"\r
+              Target="[INSTALLDIR]bin\TortoiseIDiff.exe" Description="View Diff's of image files" Show="normal" />\r
+            </Component>\r
+\r
+            <Component Id="C__TortoiseUDiff" Guid="$(var.GuidTortoiseUDiff)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__TortoiseUDiff" ShortName="TUDIFF.EXE" Name="TortoiseUDiff.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseUDiff.exe" KeyPath="yes" />\r
+            </Component>\r
+\r
+            <Component Id="C__TortoiseUDiffAssoc" Guid="$(var.GuidTortoiseUDiffAssoc)" Win64="$(var.Win64YesNo)">\r
+              <Registry Root="HKMU" Key="Software\Classes\.diff" Action="createKeyAndRemoveKeyOnUninstall" />\r
+              <Registry Root="HKMU" Key="Software\Classes\.diff" KeyPath="yes" Value="unified_diff_file" Type="string" />\r
+              <Registry Root="HKMU" Key="Software\Classes\.patch" Action="createKeyAndRemoveKeyOnUninstall" />\r
+              <Registry Root="HKMU" Key="Software\Classes\.patch" Value="unified_diff_file" Type="string" />\r
+              <Registry Root="HKMU" Key="Software\Classes\unified_diff_file\shell\open\command" Action="createKeyAndRemoveKeyOnUninstall" />\r
+              <Registry Root="HKMU" Key="Software\Classes\unified_diff_file\shell\open\command" Value="[INSTALLDIR]bin\TortoiseUDiff.exe /patchfile:&quot;%1&quot;" Type="string" />\r
+            </Component>\r
+\r
+            <Component Id="C__PlainSettingsShortcuts" Guid="$(var.GuidPlainSettingsShortcuts)" Win64="$(var.Win64YesNo)">\r
+              <Registry Root="HKCU" Key="Software\TortoiseSVN" KeyPath="yes" Name="TortoiseSVN" Value="TortoiseSVN" Type="string" />\r
+              <Condition><![CDATA[NOT VersionNT64]]></Condition>\r
+              <Shortcut Id="S__PlainConfig" Directory="D_TortoisePrgMenu" Name="Settings" Advertise="no"\r
+              Target="[INSTALLDIR]bin\TortoiseProc.exe" Description="TortoiseSVN" Arguments="/command:settings" Show="normal" />\r
+            </Component>\r
+\r
+            <Component Id="C__PlatformSettingsShortcuts" Guid="$(var.GuidPlatformSettingsShortcuts)" Win64="$(var.Win64YesNo)">\r
+              <Registry Root="HKCU" Key="Software\TortoiseSVN" KeyPath="yes" Name="TortoiseSVN" Value="TortoiseSVN" Type="string" />\r
+              <Condition>VersionNT64</Condition>\r
+              <Shortcut Id="S__PlatformConfig" Directory="D_TortoisePrgMenu" ShortName="SETTINGS" Name="Settings $(var.PlatformUserVisible)" Advertise="no"\r
+              Target="[INSTALLDIR]bin\TortoiseProc.exe" Description="TortoiseSVN" Arguments="/command:settings" Show="normal" />\r
+            </Component>\r
+\r
+          </Directory>\r
+\r
+          <Directory Id="D__Languages" ShortName="Language" Name="Languages" >\r
+\r
+            <?if $(var.DictionaryENGB) = 1 ?>\r
+            <Component Id="C__DictionaryENGB" Guid="$(var.GuidDictionaryENGB)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__ENGBSPELLAFF" ShortName="en_GB.aff" Name="en_GB.aff" Source="..\..\..\Common\Spell\en_GB.aff" DiskId="1" />\r
+              <File Id="F__ENGBSPELLDIC" ShortName="en_GB.dic" Name="en_GB.dic" Source="..\..\..\Common\Spell\en_GB.dic" DiskId="1" />\r
+            </Component>\r
+            <?endif ?>\r
+\r
+            <?if $(var.DictionaryENUS) = 1 ?>\r
+            <Component Id="C__DictionaryENUS" Guid="$(var.GuidDictionaryENUS)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__ENSPELLAFF" ShortName="en_US.aff" Name="en_US.aff" Source="..\..\..\Common\Spell\en_US.aff" DiskId="1" />\r
+              <File Id="F__ENSPELLDIC" ShortName="en_US.dic" Name="en_US.dic" Source="..\..\..\Common\Spell\en_US.dic" DiskId="1" />\r
+            </Component>\r
+            <?endif ?>\r
+\r
+          </Directory>\r
+\r
+          <Directory Id="D__DiffScripts" ShortName="Diff" Name="Diff-Scripts" >\r
+\r
+            <Component Id="C__DiffScripts" Guid="$(var.GuidDiffScripts)" Win64="$(var.Win64YesNo)">\r
+              <File Id="F__diffxls" ShortName="diff-xls.vbs" Name="diff-xls.vbs" Source="..\..\contrib\other\diff-scripts\diff-xls.vbs" DiskId="1" KeyPath="yes"/>\r
+              <File Id="F__diffxlsx" ShortName="diffxlsx.vbs" Name="diff-xlsx.vbs" Source="..\..\contrib\other\diff-scripts\diff-xlsx.vbs" DiskId="1" />\r
+              <File Id="F__diffppt" ShortName="diff-ppt.js" Name="diff-ppt.js" Source="..\..\contrib\other\diff-scripts\diff-ppt.js" DiskId="1" />\r
+              <File Id="F__diffdoc" ShortName="diff-doc.js" Name="diff-doc.js" Source="..\..\contrib\other\diff-scripts\diff-doc.js" DiskId="1" />\r
+              <File Id="F__diffdocx" ShortName="diffdocx.js" Name="diff-docx.js" Source="..\..\contrib\other\diff-scripts\diff-docx.js" DiskId="1" />\r
+              <File Id="F__mergedoc" ShortName="mergedoc.js" Name="merge-doc.js" Source="..\..\contrib\other\diff-scripts\merge-doc.js" DiskId="1" />\r
+              <File Id="F__mergedocx" ShortName="mergedcx.js" Name="merge-docx.js" Source="..\..\contrib\other\diff-scripts\merge-docx.js" DiskId="1" />\r
+              <File Id="F__diffsxw" ShortName="diff-sxw.vbs" Name="diff-sxw.vbs" Source="..\..\contrib\other\diff-scripts\diff-sxw.vbs" DiskId="1" />\r
+              <File Id="F__mergesxw" ShortName="mergesxw.vbs" Name="merge-sxw.vbs" Source="..\..\contrib\other\diff-scripts\merge-sxw.vbs" DiskId="1" />\r
+              <File Id="F__diffods" ShortName="diff-ods.vbs" Name="diff-ods.vbs" Source="..\..\contrib\other\diff-scripts\diff-ods.vbs" DiskId="1" />\r
+              <File Id="F__diffodt" ShortName="diff-odt.vbs" Name="diff-odt.vbs" Source="..\..\contrib\other\diff-scripts\diff-odt.vbs" DiskId="1" />\r
+              <File Id="F__mergeods" ShortName="mergeods.vbs" Name="merge-ods.vbs" Source="..\..\contrib\other\diff-scripts\merge-ods.vbs" DiskId="1" />\r
+              <File Id="F__mergeodt" ShortName="mergeodt.vbs" Name="merge-odt.vbs" Source="..\..\contrib\other\diff-scripts\merge-odt.vbs" DiskId="1" />\r
+              <File Id="F__diffnb" ShortName="diff-nb.vbs" Name="diff-nb.vbs" Source="..\..\contrib\other\diff-scripts\diff-nb.vbs" DiskId="1" />\r
+            </Component>\r
+\r
+          </Directory>\r
+\r
+          <Directory Id="ProgramMenuFolder" Name="." SourceName="USER'S" LongSource="User's Programs Menu">\r
+            <Directory Id="D_TortoisePrgMenu" ShortName="TORTOISE" Name="TortoiseSVN" />\r
+          </Directory>\r
+\r
+          <Directory Id='$(var.cf)' ShortName='Common'>\r
+            <Directory Id='TortoioseOverlays' ShortName='TortOvl' Name='TortoiseOverlays'>\r
+              <Directory Id="D__icons" ShortName="ICONS" Name="icons" >\r
+                <Directory Id="D__iconscvsclassic" ShortName="CVSClass" Name="CVSClassic" >\r
+\r
+                  <Component Id="C__iconscvsclassic" Guid="$(var.GuidIconsCVSClassic)" Win64="$(var.Win64YesNo)">\r
+                    <File Id="F__CVSClassicConflictIcon" ShortName="TORTOI1.ICO" Name="ConflictIcon.ico" DiskId="1" Source="..\Resources\Icons\CVSClassic\ConflictIcon.ico" KeyPath="yes" />\r
+                    <File Id="F__CVSClassicInSubversionIcon" ShortName="TORTOI2.ICO" Name="NormalIcon.ico" DiskId="1" Source="..\Resources\Icons\CVSClassic\NormalIcon.ico" />\r
+                    <File Id="F__CVSClassicModifiedIcon" ShortName="TORTOI3.ICO" Name="ModifiedIcon.ico" DiskId="1" Source="..\Resources\Icons\CVSClassic\ModifiedIcon.ico" />\r
+                    <File Id="F__CVSClassicReadOnlyIcon" ShortName="TORTOI4.ICO" Name="ReadOnlyIcon.ico" DiskId="1" Source="..\Resources\Icons\CVSClassic\ReadOnlyIcon.ico" />\r
+                    <File Id="F__CVSClassicDeletedIcon" ShortName="TORTOI5.ICO" Name="DeletedIcon.ico" DiskId="1" Source="..\Resources\Icons\CVSClassic\DeletedIcon.ico" />\r
+                    <File Id="F__CVSClassicLockedIcon" ShortName="TORTOI6.ICO" Name="LockedIcon.ico" DiskId="1" Source="..\Resources\Icons\CVSClassic\LockedIcon.ico" />\r
+                    <File Id="F__CVSClassicAddedIcon" ShortName="TORTOI7.ICO" Name="AddedIcon.ico" DiskId="1" Source="..\Resources\Icons\CVSClassic\AddedIcon.ico" />\r
+                    <File Id="F__CVSClassicIgnoredIcon" ShortName="TORTOI8.ICO" Name="IgnoredIcon.ico" DiskId="1" Source="..\Resources\Icons\CVSClassic\IgnoredIcon.ico" />\r
+                    <File Id="F__CVSClassicUnversionedIcon" ShortName="TORTOI9.ICO" Name="UnversionedIcon.ico" DiskId="1" Source="..\Resources\Icons\CVSClassic\UnversionedIcon.ico" />\r
+                  </Component>\r
+\r
+                </Directory>\r
+\r
+                <Directory Id="D__iconsmodern" ShortName="Modern" >\r
+\r
+                  <Component Id="C__iconsmodern" Guid="$(var.GuidIconsModern)" Win64="$(var.Win64YesNo)">\r
+                    <File Id="F__ModernConflictIcon" ShortName="TORTOI1.ICO" Name="ConflictIcon.ico" DiskId="1" Source="..\Resources\Icons\Modern\ConflictIcon.ico" KeyPath="yes" />\r
+                    <File Id="F__ModernInSubversionIcon" ShortName="TORTOI2.ICO" Name="NormalIcon.ico" DiskId="1" Source="..\Resources\Icons\Modern\NormalIcon.ico" />\r
+                    <File Id="F__ModernModifiedIcon" ShortName="TORTOI3.ICO" Name="ModifiedIcon.ico" DiskId="1" Source="..\Resources\Icons\Modern\ModifiedIcon.ico" />\r
+                    <File Id="F__ModernReadOnlyIcon" ShortName="TORTOI4.ICO" Name="ReadOnlyIcon.ico" DiskId="1" Source="..\Resources\Icons\Modern\ReadOnlyIcon.ico" />\r
+                    <File Id="F__ModernDeletedIcon" ShortName="TORTOI5.ICO" Name="DeletedIcon.ico" DiskId="1" Source="..\Resources\Icons\Modern\DeletedIcon.ico" />\r
+                    <File Id="F__ModernLockedIcon" ShortName="TORTOI6.ICO" Name="LockedIcon.ico" DiskId="1" Source="..\Resources\Icons\Modern\LockedIcon.ico" />\r
+                    <File Id="F__ModernAddedIcon" ShortName="TORTOI7.ICO" Name="AddedIcon.ico" DiskId="1" Source="..\Resources\Icons\Modern\AddedIcon.ico" />\r
+                    <File Id="F__ModernIgnoredIcon" ShortName="TORTOI8.ICO" Name="IgnoredIcon.ico" DiskId="1" Source="..\Resources\Icons\Modern\IgnoredIcon.ico" />\r
+                    <File Id="F__ModernUnversionedIcon" ShortName="TORTOI9.ICO" Name="UnversionedIcon.ico" DiskId="1" Source="..\Resources\Icons\Modern\UnversionedIcon.ico" />\r
+                  </Component>\r
+\r
+                </Directory>\r
+\r
+                <Directory Id="D__iconssubclipse" ShortName="SUBCLI1" Name="Subclipse" >\r
+\r
+                  <Component Id="C__iconsmarkphippard" Guid="$(var.GuidIconsMarkPhippard)" Win64="$(var.Win64YesNo)">\r
+                    <File Id="F__SubclipseConflictIcon" ShortName="TORTOI1.ICO" Name="ConflictIcon.ico" DiskId="1" Source="..\Resources\Icons\Subclipse\ConflictIcon.ico" KeyPath="yes" />\r
+                    <File Id="F__SubclipseInSubversionIcon" ShortName="TORTOI2.ICO" Name="NormalIcon.ico" DiskId="1" Source="..\Resources\Icons\Subclipse\NormalIcon.ico" />\r
+                    <File Id="F__SubclipseModifiedIcon" ShortName="TORTOI3.ICO" Name="ModifiedIcon.ico" DiskId="1" Source="..\Resources\Icons\Subclipse\ModifiedIcon.ico" />\r
+                    <File Id="F__SubclipseReadOnlyIcon" ShortName="TORTOI4.ICO" Name="ReadOnlyIcon.ico" DiskId="1" Source="..\Resources\Icons\Subclipse\ReadOnlyIcon.ico" />\r
+                    <File Id="F__SubclipseDeletedIcon" ShortName="TORTOI5.ICO" Name="DeletedIcon.ico" DiskId="1" Source="..\Resources\Icons\Subclipse\DeletedIcon.ico" />\r
+                    <File Id="F__SubclipseLockedIcon" ShortName="TORTOI6.ICO" Name="LockedIcon.ico" DiskId="1" Source="..\Resources\Icons\Subclipse\LockedIcon.ico" />\r
+                    <File Id="F__SubclipseAddedIcon" ShortName="TORTOI7.ICO" Name="AddedIcon.ico" DiskId="1" Source="..\Resources\Icons\Subclipse\AddedIcon.ico" />\r
+                    <File Id="F__SubclipseIgnoredIcon" ShortName="TORTOI8.ICO" Name="IgnoredIcon.ico" DiskId="1" Source="..\Resources\Icons\Subclipse\IgnoredIcon.ico" />\r
+                    <File Id="F__SubclipseUnversionedIcon" ShortName="TORTOI9.ICO" Name="UnversionedIcon.ico" DiskId="1" Source="..\Resources\Icons\Subclipse\UnversionedIcon.ico" />\r
+                  </Component>\r
+\r
+                </Directory>\r
+\r
+                <Directory Id="D__iconsstraight" ShortName="Straight" >\r
+\r
+                  <Component Id="C__iconsstraight" Guid="$(var.GuidIconsStraight)" Win64="$(var.Win64YesNo)">\r
+                    <File Id="F__StraightConflictIcon" ShortName="TORTOI1.ICO" Name="ConflictIcon.ico" DiskId="1" Source="..\Resources\Icons\Straight\ConflictIcon.ico" KeyPath="yes" />\r
+                    <File Id="F__StraightInSubversionIcon" ShortName="TORTOI2.ICO" Name="NormalIcon.ico" DiskId="1" Source="..\Resources\Icons\Straight\NormalIcon.ico" />\r
+                    <File Id="F__StraightModifiedIcon" ShortName="TORTOI3.ICO" Name="ModifiedIcon.ico" DiskId="1" Source="..\Resources\Icons\Straight\ModifiedIcon.ico" />\r
+                    <File Id="F__StraightReadOnlyIcon" ShortName="TORTOI4.ICO" Name="ReadOnlyIcon.ico" DiskId="1" Source="..\Resources\Icons\Straight\ReadOnlyIcon.ico" />\r
+                    <File Id="F__StraightDeletedIcon" ShortName="TORTOI5.ICO" Name="DeletedIcon.ico" DiskId="1" Source="..\Resources\Icons\Straight\DeletedIcon.ico" />\r
+                    <File Id="F__StraightLockedIcon" ShortName="TORTOI6.ICO" Name="LockedIcon.ico" DiskId="1" Source="..\Resources\Icons\Straight\LockedIcon.ico" />\r
+                    <File Id="F__StraightAddedIcon" ShortName="TORTOI7.ICO" Name="AddedIcon.ico" DiskId="1" Source="..\Resources\Icons\Straight\AddedIcon.ico" />\r
+                    <File Id="F__StraightIgnoredIcon" ShortName="TORTOI8.ICO" Name="IgnoredIcon.ico" DiskId="1" Source="..\Resources\Icons\Straight\IgnoredIcon.ico" />\r
+                    <File Id="F__StraightUnversionedIcon" ShortName="TORTOI9.ICO" Name="UnversionedIcon.ico" DiskId="1" Source="..\Resources\Icons\Straight\UnversionedIcon.ico" />\r
+                  </Component>\r
+\r
+                </Directory>\r
+              </Directory>\r
+            </Directory>\r
+          </Directory>\r
+\r
+        </Directory>\r
+      </Directory>\r
+    </Directory>\r
+</Include>\r
+<!--\r
+       </Fragment>\r
+</Wix>\r
+-->
\ No newline at end of file
diff --git a/src/TortoiseGitSetup/StructureFragment.wxs b/src/TortoiseGitSetup/StructureFragment.wxs
deleted file mode 100644 (file)
index 2c98710..0000000
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0"?>\r
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
-       <?include Includes.wxi?>\r
-       <?if $(env.Platform) = "win32" ?>\r
-       <?define cf="CommonFilesFolder" ?>\r
-       <?endif ?>\r
-       <?if $(env.Platform) = "x64" ?>\r
-       <?define cf="CommonFiles64Folder" ?>\r
-       <?endif ?>\r
-       <Fragment Id="StructureFragment">\r
-               <Directory Id="TARGETDIR" Name="SourceDir">\r
-                       <Directory Id="D__ProgramFilesFolder" Name="PFiles" LongName="Program Files">\r
-                               <Directory Id="INSTALLDIR" Name="TSVN" LongName="TortoiseSVN">\r
-\r
-                                       <?if $(env.Platform) = "win32" ?>\r
-                                       <Merge Id='CRT' Language='0' src='$(env.MergeModules)\microsoft_vc90_crt_x86.msm' DiskId='1' />\r
-                                       <Merge Id='CRT Policy' Language='0' src='$(env.MergeModules)\policy_9_0_Microsoft_VC90_CRT_x86.msm' DiskId='1' />\r
-                                       <Merge Id='MFC' Language='0' src='$(env.MergeModules)\Microsoft_VC90_MFC_x86.msm' DiskId='1' />\r
-                                       <Merge Id='MFC Policy' Language='0' src='$(env.MergeModules)\policy_9_0_Microsoft_VC90_MFC_x86.msm' DiskId='1' />\r
-                                       <Merge Id='MFCLOC' Language='0' src='$(env.MergeModules)\Microsoft_VC90_MFCLOC_x86.msm' DiskId='1' />\r
-                                       <Merge Id='MFCLOC Policy' Language='0' src='$(env.MergeModules)\policy_9_0_Microsoft_VC90_MFCLOC_x86.msm' DiskId='1' />\r
-                                       <?endif ?>\r
-\r
-                                       <?if $(env.Platform) = "x64" ?>\r
-                                       <Merge Id='CRT' Language='0' src='$(env.MergeModules)\Microsoft_VC90_CRT_x86_x64.msm' DiskId='1' />\r
-                                       <Merge Id='CRT Policy' Language='0' src='$(env.MergeModules)\policy_9_0_Microsoft_VC90_CRT_x86_x64.msm' DiskId='1' />\r
-                                       <Merge Id='MFC' Language='0' src='$(env.MergeModules)\Microsoft_VC90_MFC_x86_x64.msm' DiskId='1' />\r
-                                       <Merge Id='MFC Policy' Language='0' src='$(env.MergeModules)\policy_9_0_Microsoft_VC90_MFC_x86_x64.msm' DiskId='1' />\r
-                                       <Merge Id='MFCLOC' Language='0' src='$(env.MergeModules)\Microsoft_VC90_MFCLOC_x86_x64.msm' DiskId='1' />\r
-                                       <Merge Id='MFCLOC Policy' Language='0' src='$(env.MergeModules)\policy_9_0_Microsoft_VC90_MFCLOC_x86_x64.msm' DiskId='1' />\r
-                                       <?endif ?>\r
-\r
-                                       <?if $(env.Platform) = "win32" ?>\r
-                                       <Merge Id='Ovlays' Language='0' src='..\..\ext\TortoiseOverlays\TortoiseOverlays-1.0.4.11886-win32.msm' DiskId='1' />\r
-                                       <?endif ?>\r
-\r
-                                       <?if $(env.Platform) = "x64" ?>\r
-                                       <Merge Id='Ovlays' Language='0' src='..\..\ext\TortoiseOverlays\TortoiseOverlays-1.0.4.11886-x64.msm' DiskId='1' />\r
-                                       <?endif ?>\r
-\r
-                                       <Component Id="C__infofiles" Guid="$(var.GuidInfoFiles)" Win64="$(var.Win64YesNo)">\r
-                                               <File Id="F__changelog" Name="CHANGELG.TXT" LongName="Changelog.txt" DiskId="1" src="..\Changelog.txt" KeyPath="yes" />\r
-                                               <File Id="F__subversionlicense" Name="LICENSES.TXT" LongName="Subversion license.txt" DiskId="1" src="..\..\ext\Subversion\subversion\LICENSE" />\r
-                                               <File Id="F__tortoisesvnlicense" Name="LICENSE.TXT" LongName="TortoiseSVN License.txt" DiskId="1" src="..\gpl.txt" />\r
-                                               <File Id="F__openssllicense" Name="OSSL_LIC.TXT" LongName="OpenSSL License.txt" DiskId="1" src="include\OpenSSL_License.txt" />\r
-                                               <File Id="F__aprlicense" Name="APR_LIC.TXT" LongName="apr License.txt" DiskId="1" src="..\..\ext\apr\LICENSE" />\r
-                                               <File Id="F__sasllicense" Name="CYRUSSAS.TXT" LongName="CyrusSASL License.txt" DiskId="1" src="include\CyrusSASL_License.txt" />\r
-                                       </Component>\r
-\r
-                                       <Component Id="C__ProgramMenuFolder" Guid="$(var.GuidProgramMenuFolder)" Win64="$(var.Win64YesNo)">\r
-                                               <RemoveFolder Directory="INSTALLDIR" On="uninstall" Id="RemoveFolder_INSTALLDIR" />\r
-                                               <RemoveFolder Directory="D_TortoisePrgMenu" On="uninstall" Id="RemoveFolder_PrgMenu" />\r
-                                       </Component>\r
-\r
-                                       <Component Id="C__shellregistry" Guid="$(var.GuidShellRegistry)" Win64="$(var.Win64YesNo)">\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Drive\shellex\ContextMenuHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Drive\shellex\ContextMenuHandlers\TortoiseSVN" KeyPath="yes" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Drive\shellex\PropertySheetHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Drive\shellex\PropertySheetHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\ContextMenuHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\ContextMenuHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\DragDropHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\DragDropHandlers\TortoiseSVN" Value="{$(var.GuidDropHandler)}" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\PropertySheetHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\PropertySheetHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Directory\Background\shellex\ContextMenuHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Directory\Background\shellex\ContextMenuHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Folder\shellex\ColumnHandlers\{$(var.GuidUncontrolled)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Folder\shellex\ContextMenuHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Folder\shellex\ContextMenuHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Folder\shellex\DragDropHandlers\TortoiseSVN" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Folder\shellex\DragDropHandlers\TortoiseSVN" Value="{$(var.GuidDropHandler)}" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidAdded)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidAdded)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidAdded)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidAdded)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidLocked)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidLocked)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidLocked)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidLocked)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDeleted)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDeleted)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDeleted)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDeleted)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidNormal)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidNormal)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidNormal)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidNormal)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidReadonly)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidReadonly)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidReadonly)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidReadonly)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUncontrolled)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUncontrolled)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUncontrolled)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUncontrolled)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidModified)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidModified)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidModified)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidModified)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDropHandler)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDropHandler)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDropHandler)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidDropHandler)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidConflict)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidConflict)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidConflict)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidConflict)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidIgnored)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidIgnored)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidIgnored)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidIgnored)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUnversioned)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUnversioned)}\InProcServer32" Name="ThreadingModel" Value="Apartment" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUnversioned)}\InProcServer32" Value="[INSTALLDIR]bin\TortoiseStub.dll" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidUnversioned)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\lnkfile\shellex\ContextMenuHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\InternetShortcut\shellex\ContextMenuHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\*\shellex\ContextMenuHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\*\shellex\PropertySheetHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\Directory\shellex\CopyHookHandlers\TortoiseSVN" Value="{$(var.GuidUncontrolled)}" Type="string" />\r
-                                       </Component>\r
-\r
-                                       <Component Id="C__machineregistry" Guid="$(var.GuidMachineRegistry)" Win64="$(var.Win64YesNo)">\r
-                                               <Registry Root="HKLM" Key="Software\[Manufacturer]" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKLM" Key="Software\[Manufacturer]" Name="ProcPath" Value="[INSTALLDIR]bin\TortoiseProc.exe" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\[Manufacturer]" Name="CachePath" Value="[INSTALLDIR]bin\TSVNCache.exe" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\[Manufacturer]" Name="TMergePath" Value="[INSTALLDIR]bin\TortoiseMerge.exe" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\[Manufacturer]" Name="Directory" Value="[INSTALLDIR]" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\SubWCRev.exe" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\SubWCRev.exe" Name="Path" Value="[INSTALLDIR]bin" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\App Paths\SubWCRev.exe" Value="[INSTALLDIR]bin\SubWCRev.exe" Type="string" />\r
-\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Normal" Action="createKey" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Normal" Name="SVN" Value="{$(var.GuidNormal)}" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Modified" Action="createKey" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Modified" Name="SVN" Value="{$(var.GuidModified)}" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Conflict" Action="createKey" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Conflict" Name="SVN" Value="{$(var.GuidConflict)}" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Deleted" Action="createKey" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Deleted" Name="SVN" Value="{$(var.GuidDeleted)}" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\ReadOnly" Action="createKey" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\ReadOnly" Name="SVN" Value="{$(var.GuidReadonly)}" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Locked" Action="createKey" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Locked" Name="SVN" Value="{$(var.GuidLocked)}" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Added" Action="createKey" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Added" Name="SVN" Value="{$(var.GuidAdded)}" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Ignored" Action="createKey" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Ignored" Name="SVN" Value="{$(var.GuidIgnored)}" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Unversioned" Action="createKey" />\r
-                                               <Registry Root="HKLM" Key="Software\TortoiseOverlays\Unversioned" Name="SVN" Value="{$(var.GuidUnversioned)}" Type="string" />\r
-                                       </Component>\r
-\r
-                                       <Component Id="C__approveshellcomponents" Guid="$(var.GuidApproveShellComponents)" Win64="$(var.Win64YesNo)">\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidConflict)}" Value="TortoiseSVN" KeyPath="yes" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidModified)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidDropHandler)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidDeleted)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidNormal)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidUncontrolled)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidReadonly)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidLocked)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidAdded)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidIgnored)}" Value="TortoiseSVN" Type="string" />\r
-                                               <Registry Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved" Name="{$(var.GuidUnversioned)}" Value="TortoiseSVN" Type="string" />\r
-                                       </Component>\r
-\r
-                                       <Component Id="C__svnprotocoll" Guid="$(var.GuidSvnProtocol)" Win64="$(var.Win64YesNo)">\r
-                                               <Registry Root="HKMU" Key="Software\Classes\svn" KeyPath="yes" Value="URL:SVN Protocol" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\svn" Name="URL Protocol" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\svn\DefaultIcon" Value="[INSTALLDIR]bin\TortoiseProc.exe" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\svn\shell\open\command" Value="[INSTALLDIR]bin\TortoiseProc.exe /command:repobrowser /path:&quot;%1&quot;" Type="string" />\r
-\r
-                                               <Registry Root="HKMU" Key="Software\Classes\svn+ssh" Value="URL:SVN+SSH Protocol" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\svn+ssh" Name="URL Protocol" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\svn+ssh\DefaultIcon" Value="[INSTALLDIR]bin\TortoiseProc.exe" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\svn+ssh\shell\open\command" Value="[INSTALLDIR]bin\TortoiseProc.exe /command:repobrowser /path:&quot;%1&quot;" Type="string" />\r
-\r
-                                               <Registry Root="HKMU" Key="Software\Classes\tsvn" Value="URL:TSVN Protocol" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\tsvn" Name="URL Protocol" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\tsvn\DefaultIcon" Value="[INSTALLDIR]bin\TortoiseProc.exe" Type="string" />\r
-                                               <Registry Root="HKMU" Key="Software\Classes\tsvn\shell\open\command" Value="[INSTALLDIR]bin\TortoiseProc.exe /command:checkout /url:&quot;%1&quot;" Type="string" />\r
-                                       </Component>\r
-\r
-                                       <Component Id="C__ASPDOTNETHACK" Guid="$(var.GuidASPNETHack)" Win64="$(var.Win64YesNo)">\r
-                                               <Registry Root="HKCU" Key="Software\TortoiseSVN" KeyPath="yes" Name="ASP.NET KeyPath" Value="ASP.NET" Type="string" />\r
-                                               <!-- only used because this component needs a key path! -->\r
-                                               <Environment Id="E__ASPDOTNETHACK" Action="create" Name="SVN_ASP_DOT_NET_HACK" Value="1" Permanent="yes" System="yes" />\r
-                                       </Component>\r
-\r
-                                       <Directory Id="D__Bin" Name="BIN" LongName="bin" >\r
-\r
-                                               <Component Id="C__apr" Guid="$(var.GuidAPR)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__libapr" Name="LIBAPR.DLL" LongName="libapr_tsvn.dll" DiskId="1" src="..\..\ext\apr\release_$(var.PlatformPathExtension)\libapr_tsvn.dll" KeyPath="yes" />\r
-                                                       <File Id="F__libaprutil" Name="LIBAPRUT.DLL" LongName="libaprutil_tsvn.dll" DiskId="1" src="..\..\ext\apr-util\release_$(var.PlatformPathExtension)\libaprutil_tsvn.dll" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__sasl" Guid="$(var.GuidSASL)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__libsasl" Name="LIBSASL.DLL" LongName="libsasl.dll" DiskId="1" src="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\libsasl.dll" KeyPath="yes" />\r
-                                                       <File Id="F__saslANONYMOUS" Name="saslANON.DLL" LongName="saslANONYMOUS.dll" DiskId="1" src="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslANONYMOUS.dll" />\r
-                                                       <File Id="F__saslCRAMMD5" Name="saslCRAM.DLL" LongName="saslCRAMMD5.dll" DiskId="1" src="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslCRAMMD5.dll" />\r
-                                                       <File Id="F__saslDIGESTMD5" Name="saslDIGE.DLL" LongName="saslDIGESTMD5.dll" DiskId="1" src="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslDIGESTMD5.dll" />\r
-                                                       <File Id="F__saslLOGIN" Name="saslLOGI.DLL" LongName="saslLOGIN.dll" DiskId="1" src="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslLOGIN.dll" />\r
-                                                       <File Id="F__saslNTLM" Name="saslNTLM.DLL" LongName="saslNTLM.dll" DiskId="1" src="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslNTLM.dll" />\r
-                                                       <File Id="F__saslPLAIN" Name="saslPLAI.DLL" LongName="saslPLAIN.dll" DiskId="1" src="..\..\ext\cyrus-SASL\release_$(var.PlatformPathExtension)\saslPLAIN.dll" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__gettext" Guid="$(var.GuidGettext)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__intl" Name="INTL3_TS.DLL" LongName="intl3_tsvn.dll" DiskId="1" src="..\..\ext\libintl\libintl3-$(var.PlatformPathExtension)\bin\intl3_tsvn.dll" KeyPath="yes" />\r
-                                               </Component>\r
-\r
-                                               <?if $(env.IncludeCrashReportDll) = 1 ?>\r
-                                               <Component Id="C__crash" Guid="$(var.GuidCrashRpt)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__crashrpt" Name="CRASHRPT.DLL" LongName="CrashRpt.dll" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\CrashRpt.dll" KeyPath="yes" />\r
-                                               </Component>\r
-                                               <?endif ?>\r
-\r
-                                               <Component Id="C__help_en" Guid="$(var.GuidHelpEN)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F_TortoiseSVN_en" Name="TSVNHELP.CHM" LongName="TortoiseSVN_en.chm" DiskId="1" src="..\..\doc\output\TortoiseSVN_en.chm" KeyPath="yes" />\r
-                                                       <File Id="F__TortoiseMerge_en" Name="TMEHELP.CHM" LongName="TortoiseMerge_en.chm" DiskId="1" src="..\..\doc\output\TortoiseMerge_en.chm" />\r
-                                                       <RemoveFile Id="F__Tortoise_lang" Name="*.chm" LongName="*.chm" On="uninstall" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__TortoiseSVN" Guid="$(var.GuidTortoiseSVN)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__TortoiseProc" Name="TORTPROC.EXE" LongName="TortoiseProc.exe" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\TortoiseProc.exe" KeyPath="yes" />\r
-                                                       <File Id="F__TortoiseShell" Name="TORTSVN.DLL" LongName="TortoiseSVN.dll" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\TortoiseSVN.dll" />\r
-                                                       <File Id="F__TortoiseStub" Name="TORTSTB.DLL" LongName="TortoiseStub.dll" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\TortoiseStub.dll" />\r
-                                                       <File Id="F__TortoisePlink" Name="TORTPLI.EXE" LongName="TortoisePlink.exe" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\TortoisePlink.exe" />\r
-                                                       <File Id="F__TSVNCache" Name="TSVNCACH.EXE" LongName="TSVNCache.exe" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\TSVNCache.exe" />\r
-                                                       <File Id="F__TSVNAutolist" Name="AUTOLIST.TXT" LongName="autolist.txt" DiskId="1" src="include\autolist.txt" />\r
-                                                       <File Id="F__websiteurl" Name="WEBSITE.URL" LongName="Website.url" src="include\Website.url" DiskId="1" />\r
-\r
-                                                       <File Id="F__SubWCRev" Name="SUBWCREV.EXE" LongName="SubWCRev.exe" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\SubWCRev.exe" />\r
-                                                       <File Id="F__SubWCRevCOM" Name="SUBWCOM.EXE" LongName="SubWCRevCOM.exe" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\SubWCRevCOM.exe" />\r
-                                                       <!-- register the SubWCRev COM-Object -->\r
-                                                       <Environment Id="Environment" Name="PATH" Part="last" System="yes" Value="[INSTALLDIR]bin" Action="set" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidSubWCRev)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidSubWCRev)}\LocalServer32" Value="[INSTALLDIR]bin\SubWCRevCOM.exe /automation" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidSubWCRev)}\ProgID" Value="SubWCRev.object.1" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidSubWCRev)}\VersionIndependentProgID" Value="SubWCRev.object" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidSubWCRev)}\TypeLib" Value="{$(var.GuidSubWCRevTypeLib)}" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\CLSID\{$(var.GuidSubWCRev)}" Value="SubWCRev Server Object" Type="string" />\r
-\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object" Value="SubWCRev Server Object" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object\CLSID" Value="{$(var.GuidSubWCRev)}" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object\CurVer" Value="SubWCRev.object.1" Type="string" />\r
-\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object.1" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object.1" Value="SubWCRev Server Object" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\SubWCRev.object.1\CLSID" Value="{$(var.GuidSubWCRev)}" Type="string" />\r
-\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\TypeLib\{$(var.GuidSubWCRevTypeLib)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\TypeLib\{$(var.GuidSubWCRevTypeLib)}\1.0" Value="LibSubWCRev" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\TypeLib\{$(var.GuidSubWCRevTypeLib)}\1.0\0" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\TypeLib\{$(var.GuidSubWCRevTypeLib)}\1.0\0\win32" Value="[INSTALLDIR]bin\SubWCRevCOM.exe" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\TypeLib\{$(var.GuidSubWCRevTypeLib)}\FLAGS" Value="0" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\TypeLib\{$(var.GuidSubWCRevTypeLib)}\HELPDIR" Value="[INSTALLDIR]" Type="string" />\r
-\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\Interface\{$(var.GuidSubWCRevInterface)}" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\Interface\{$(var.GuidSubWCRevInterface)}" Value="ISubWCRev" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\Interface\{$(var.GuidSubWCRevInterface)}\ProxyStubClsid" Value="{00020424-0000-0000-C000-000000000046}" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\Interface\{$(var.GuidSubWCRevInterface)}\ProxyStubClsid32" Value="{00020424-0000-0000-C000-000000000046}" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\Interface\{$(var.GuidSubWCRevInterface)}\TypeLib" Value="{$(var.GuidSubWCRevTypeLib)}" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\Interface\{$(var.GuidSubWCRevInterface)}\TypeLib" Name="Version" Value="1.0" Type="string" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__TortoiseSVNShortcuts" Guid="$(var.GuidTortoiseSVNShortcuts)" Win64="$(var.Win64YesNo)">\r
-                                                       <Registry Root="HKCU" Key="Software\TortoiseSVN" KeyPath="yes" Name="TortoiseSVN" Value="TortoiseSVN" Type="string" />\r
-                                                       <Shortcut Id="S__Website" Directory="D_TortoisePrgMenu" Name="Web" LongName="Website" Advertise="no"\r
-                                                       Target="[INSTALLDIR]bin\website.url" Description="TortoiseSVN Website" />\r
-                                                       <Shortcut Id="S__RTFM" Directory="D_TortoisePrgMenu" Name="TSVN" LongName="TortoiseSVN" Advertise="no"\r
-                                                       Target="[INSTALLDIR]bin\TortoiseProc.exe" Description="TortoiseSVN" Arguments="/command:rtfm" Show="normal" />\r
-                                                       <Shortcut Id="S__TortoiseProc" Directory="D_TortoisePrgMenu" Name="HELP" LongName="Help" Advertise="no"\r
-                                                       Target="[INSTALLDIR]bin\TortoiseProc.exe" Description="Documentation about TortoiseSVN" Arguments="/command:help" Show="normal" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__TortoiseMerge" Guid="$(var.GuidTortoiseMerge)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__TortoiseMerge" Name="TMERGE.EXE" LongName="TortoiseMerge.exe" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\TortoiseMerge.exe" KeyPath="yes" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__TortoiseMergeShortcuts" Guid="$(var.GuidTortoiseMergeShortcuts)" Win64="$(var.Win64YesNo)">\r
-                                                       <Registry Root="HKCU" Key="Software\TortoiseSVN" KeyPath="yes" Name="TortoiseMerge" Value="TortoiseMerge" Type="string" />\r
-                                                       <Shortcut Id="S__TortoiseMerge" Directory="D_TortoisePrgMenu" Name="TMERGE" LongName="TortoiseMerge" Advertise="no"\r
-                                                       Target="[INSTALLDIR]bin\TortoiseMerge.exe" Description="View Diff's, Merge Diff's, Resolve Conflicted Files and Apply Patches" Show="normal" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__Sounds" Guid="$(var.GuidSounds)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__sounderror" Name="TERROR.WAV" LongName="TortoiseSVN_error.wav" DiskId="1" src="..\Resources\TortoiseSVN_error.wav" KeyPath="yes" />\r
-                                                       <File Id="F__soundwarning" Name="TWARN.WAV" LongName="TortoiseSVN_Warning.wav" DiskId="1" src="..\Resources\TortoiseSVN_Warning.wav" />\r
-                                                       <File Id="F__soundnotification" Name="TNOTIFY.WAV" LongName="TortoiseSVN_Notification.wav" DiskId="1" src="..\Resources\TortoiseSVN_Notification.wav" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__TortoiseBlame" Guid="$(var.GuidTortoiseBlame)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__TortoiseBlame" Name="TBLAME.EXE" LongName="TortoiseBlame.exe" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\TortoiseBlame.exe" KeyPath="yes" />\r
-                                                       <File Id="F__SciLexer" Name="SCILEX.DLL" LongName="SciLexer.dll" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\SciLexer.dll" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__TortoiseIDiff" Guid="$(var.GuidTortoiseIDiff)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__TortoiseIDiff" Name="TIDIFF.EXE" LongName="TortoiseIDiff.exe" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\TortoiseIDiff.exe" KeyPath="yes" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__TortoiseIDiffShortcuts" Guid="$(var.GuidTortoiseIDiffShortcuts)" Win64="$(var.Win64YesNo)">\r
-                                                       <Registry Root="HKCU" Key="Software\TortoiseSVN" KeyPath="yes" Name="TortoiseIDiff" Value="TortoiseIDiff" Type="string" />\r
-                                                       <Shortcut Id="S__TortoiseIDiff" Directory="D_TortoisePrgMenu" Name="TIDIFF" LongName="TortoiseIDiff" Advertise="no"\r
-                                                       Target="[INSTALLDIR]bin\TortoiseIDiff.exe" Description="View Diff's of image files" Show="normal" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__TortoiseUDiff" Guid="$(var.GuidTortoiseUDiff)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__TortoiseUDiff" Name="TUDIFF.EXE" LongName="TortoiseUDiff.exe" DiskId="1" src="..\..\bin\$(var.ReleasePath)\bin\TortoiseUDiff.exe" KeyPath="yes" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__TortoiseUDiffAssoc" Guid="$(var.GuidTortoiseUDiffAssoc)" Win64="$(var.Win64YesNo)">\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\.diff" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\.diff" KeyPath="yes" Value="unified_diff_file" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\.patch" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\.patch" Value="unified_diff_file" Type="string" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\unified_diff_file\shell\open\command" Action="createKeyAndRemoveKeyOnUninstall" />\r
-                                                       <Registry Root="HKMU" Key="Software\Classes\unified_diff_file\shell\open\command" Value="[INSTALLDIR]bin\TortoiseUDiff.exe /patchfile:&quot;%1&quot;" Type="string" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__PlainSettingsShortcuts" Guid="$(var.GuidPlainSettingsShortcuts)" Win64="$(var.Win64YesNo)">\r
-                                                       <Registry Root="HKCU" Key="Software\TortoiseSVN" KeyPath="yes" Name="TortoiseSVN" Value="TortoiseSVN" Type="string" />\r
-                                                       <Condition><![CDATA[NOT VersionNT64]]></Condition>\r
-                                                       <Shortcut Id="S__PlainConfig" Directory="D_TortoisePrgMenu" Name="SETTINGS" LongName="Settings" Advertise="no"\r
-                                                       Target="[INSTALLDIR]bin\TortoiseProc.exe" Description="TortoiseSVN" Arguments="/command:settings" Show="normal" />\r
-                                               </Component>\r
-\r
-                                               <Component Id="C__PlatformSettingsShortcuts" Guid="$(var.GuidPlatformSettingsShortcuts)" Win64="$(var.Win64YesNo)">\r
-                                                       <Registry Root="HKCU" Key="Software\TortoiseSVN" KeyPath="yes" Name="TortoiseSVN" Value="TortoiseSVN" Type="string" />\r
-                                                       <Condition>VersionNT64</Condition>\r
-                                                       <Shortcut Id="S__PlatformConfig" Directory="D_TortoisePrgMenu" Name="SETTINGS" LongName="Settings $(var.PlatformUserVisible)" Advertise="no"\r
-                                                       Target="[INSTALLDIR]bin\TortoiseProc.exe" Description="TortoiseSVN" Arguments="/command:settings" Show="normal" />\r
-                                               </Component>\r
-\r
-                                       </Directory>\r
-\r
-                                       <Directory Id="D__Languages" Name="Language" LongName="Languages" >\r
-\r
-                                               <?if $(env.DictionaryENGB) = 1 ?>\r
-                                               <Component Id="C__DictionaryENGB" Guid="$(var.GuidDictionaryENGB)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__ENGBSPELLAFF" Name="en_GB.aff" LongName="en_GB.aff" src="..\..\..\Common\Spell\en_GB.aff" DiskId="1" />\r
-                                                       <File Id="F__ENGBSPELLDIC" Name="en_GB.dic" LongName="en_GB.dic" src="..\..\..\Common\Spell\en_GB.dic" DiskId="1" />\r
-                                               </Component>\r
-                                               <?endif ?>\r
-\r
-                                               <?if $(env.DictionaryENUS) = 1 ?>\r
-                                               <Component Id="C__DictionaryENUS" Guid="$(var.GuidDictionaryENUS)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__ENSPELLAFF" Name="en_US.aff" LongName="en_US.aff" src="..\..\..\Common\Spell\en_US.aff" DiskId="1" />\r
-                                                       <File Id="F__ENSPELLDIC" Name="en_US.dic" LongName="en_US.dic" src="..\..\..\Common\Spell\en_US.dic" DiskId="1" />\r
-                                               </Component>\r
-                                               <?endif ?>\r
-\r
-                                       </Directory>\r
-\r
-                                       <Directory Id="D__DiffScripts" Name="Diff" LongName="Diff-Scripts" >\r
-\r
-                                               <Component Id="C__DiffScripts" Guid="$(var.GuidDiffScripts)" Win64="$(var.Win64YesNo)">\r
-                                                       <File Id="F__diffxls" Name="diff-xls.vbs" LongName="diff-xls.vbs" src="..\..\contrib\other\diff-scripts\diff-xls.vbs" DiskId="1" KeyPath="yes"/>\r
-                                                       <File Id="F__diffxlsx" Name="diffxlsx.vbs" LongName="diff-xlsx.vbs" src="..\..\contrib\other\diff-scripts\diff-xlsx.vbs" DiskId="1" />\r
-                                                       <File Id="F__diffppt" Name="diff-ppt.js" LongName="diff-ppt.js" src="..\..\contrib\other\diff-scripts\diff-ppt.js" DiskId="1" />\r
-                                                       <File Id="F__diffdoc" Name="diff-doc.js" LongName="diff-doc.js" src="..\..\contrib\other\diff-scripts\diff-doc.js" DiskId="1" />\r
-                                                       <File Id="F__diffdocx" Name="diffdocx.js" LongName="diff-docx.js" src="..\..\contrib\other\diff-scripts\diff-docx.js" DiskId="1" />\r
-                                                       <File Id="F__mergedoc" Name="mergedoc.js" LongName="merge-doc.js" src="..\..\contrib\other\diff-scripts\merge-doc.js" DiskId="1" />\r
-                                                       <File Id="F__mergedocx" Name="mergedcx.js" LongName="merge-docx.js" src="..\..\contrib\other\diff-scripts\merge-docx.js" DiskId="1" />\r
-                                                       <File Id="F__diffsxw" Name="diff-sxw.vbs" LongName="diff-sxw.vbs" src="..\..\contrib\other\diff-scripts\diff-sxw.vbs" DiskId="1" />\r
-                                                       <File Id="F__mergesxw" Name="mergesxw.vbs" LongName="merge-sxw.vbs" src="..\..\contrib\other\diff-scripts\merge-sxw.vbs" DiskId="1" />\r
-                                                       <File Id="F__diffods" Name="diff-ods.vbs" LongName="diff-ods.vbs" src="..\..\contrib\other\diff-scripts\diff-ods.vbs" DiskId="1" />\r
-                                                       <File Id="F__diffodt" Name="diff-odt.vbs" LongName="diff-odt.vbs" src="..\..\contrib\other\diff-scripts\diff-odt.vbs" DiskId="1" />\r
-                                                       <File Id="F__mergeods" Name="mergeods.vbs" LongName="merge-ods.vbs" src="..\..\contrib\other\diff-scripts\merge-ods.vbs" DiskId="1" />\r
-                                                       <File Id="F__mergeodt" Name="mergeodt.vbs" LongName="merge-odt.vbs" src="..\..\contrib\other\diff-scripts\merge-odt.vbs" DiskId="1" />\r
-                                                       <File Id="F__diffnb" Name="diff-nb.vbs" LongName="diff-nb.vbs" src="..\..\contrib\other\diff-scripts\diff-nb.vbs" DiskId="1" />\r
-                                               </Component>\r
-\r
-                                       </Directory>\r
-\r
-                                       <Directory Id="ProgramMenuFolder" Name="." SourceName="USER'S" LongSource="User's Programs Menu">\r
-                                               <Directory Id="D_TortoisePrgMenu" Name="TORTOISE" LongName="TortoiseSVN" />\r
-                                       </Directory>\r
-\r
-                                       <Directory Id='$(var.cf)' Name='Common'>\r
-                                               <Directory Id='TortoioseOverlays' Name='TortOvl' LongName='TortoiseOverlays'>\r
-                                                       <Directory Id="D__icons" Name="ICONS" LongName="icons" >\r
-                                                               <Directory Id="D__iconscvsclassic" Name="CVSClass" LongName="CVSClassic" >\r
-\r
-                                                                       <Component Id="C__iconscvsclassic" Guid="$(var.GuidIconsCVSClassic)" Win64="$(var.Win64YesNo)">\r
-                                                                               <File Id="F__CVSClassicConflictIcon" Name="TORTOI1.ICO" LongName="ConflictIcon.ico" DiskId="1" src="..\Resources\Icons\CVSClassic\ConflictIcon.ico" KeyPath="yes" />\r
-                                                                               <File Id="F__CVSClassicInSubversionIcon" Name="TORTOI2.ICO" LongName="NormalIcon.ico" DiskId="1" src="..\Resources\Icons\CVSClassic\NormalIcon.ico" />\r
-                                                                               <File Id="F__CVSClassicModifiedIcon" Name="TORTOI3.ICO" LongName="ModifiedIcon.ico" DiskId="1" src="..\Resources\Icons\CVSClassic\ModifiedIcon.ico" />\r
-                                                                               <File Id="F__CVSClassicReadOnlyIcon" Name="TORTOI4.ICO" LongName="ReadOnlyIcon.ico" DiskId="1" src="..\Resources\Icons\CVSClassic\ReadOnlyIcon.ico" />\r
-                                                                               <File Id="F__CVSClassicDeletedIcon" Name="TORTOI5.ICO" LongName="DeletedIcon.ico" DiskId="1" src="..\Resources\Icons\CVSClassic\DeletedIcon.ico" />\r
-                                                                               <File Id="F__CVSClassicLockedIcon" Name="TORTOI6.ICO" LongName="LockedIcon.ico" DiskId="1" src="..\Resources\Icons\CVSClassic\LockedIcon.ico" />\r
-                                                                               <File Id="F__CVSClassicAddedIcon" Name="TORTOI7.ICO" LongName="AddedIcon.ico" DiskId="1" src="..\Resources\Icons\CVSClassic\AddedIcon.ico" />\r
-                                                                               <File Id="F__CVSClassicIgnoredIcon" Name="TORTOI8.ICO" LongName="IgnoredIcon.ico" DiskId="1" src="..\Resources\Icons\CVSClassic\IgnoredIcon.ico" />\r
-                                                                               <File Id="F__CVSClassicUnversionedIcon" Name="TORTOI9.ICO" LongName="UnversionedIcon.ico" DiskId="1" src="..\Resources\Icons\CVSClassic\UnversionedIcon.ico" />\r
-                                                                       </Component>\r
-\r
-                                                               </Directory>\r
-\r
-                                                               <Directory Id="D__iconsmodern" Name="Modern" >\r
-\r
-                                                                       <Component Id="C__iconsmodern" Guid="$(var.GuidIconsModern)" Win64="$(var.Win64YesNo)">\r
-                                                                               <File Id="F__ModernConflictIcon" Name="TORTOI1.ICO" LongName="ConflictIcon.ico" DiskId="1" src="..\Resources\Icons\Modern\ConflictIcon.ico" KeyPath="yes" />\r
-                                                                               <File Id="F__ModernInSubversionIcon" Name="TORTOI2.ICO" LongName="NormalIcon.ico" DiskId="1" src="..\Resources\Icons\Modern\NormalIcon.ico" />\r
-                                                                               <File Id="F__ModernModifiedIcon" Name="TORTOI3.ICO" LongName="ModifiedIcon.ico" DiskId="1" src="..\Resources\Icons\Modern\ModifiedIcon.ico" />\r
-                                                                               <File Id="F__ModernReadOnlyIcon" Name="TORTOI4.ICO" LongName="ReadOnlyIcon.ico" DiskId="1" src="..\Resources\Icons\Modern\ReadOnlyIcon.ico" />\r
-                                                                               <File Id="F__ModernDeletedIcon" Name="TORTOI5.ICO" LongName="DeletedIcon.ico" DiskId="1" src="..\Resources\Icons\Modern\DeletedIcon.ico" />\r
-                                                                               <File Id="F__ModernLockedIcon" Name="TORTOI6.ICO" LongName="LockedIcon.ico" DiskId="1" src="..\Resources\Icons\Modern\LockedIcon.ico" />\r
-                                                                               <File Id="F__ModernAddedIcon" Name="TORTOI7.ICO" LongName="AddedIcon.ico" DiskId="1" src="..\Resources\Icons\Modern\AddedIcon.ico" />\r
-                                                                               <File Id="F__ModernIgnoredIcon" Name="TORTOI8.ICO" LongName="IgnoredIcon.ico" DiskId="1" src="..\Resources\Icons\Modern\IgnoredIcon.ico" />\r
-                                                                               <File Id="F__ModernUnversionedIcon" Name="TORTOI9.ICO" LongName="UnversionedIcon.ico" DiskId="1" src="..\Resources\Icons\Modern\UnversionedIcon.ico" />\r
-                                                                       </Component>\r
-\r
-                                                               </Directory>\r
-\r
-                                                               <Directory Id="D__iconssubclipse" Name="SUBCLI1" LongName="Subclipse" >\r
-\r
-                                                                       <Component Id="C__iconsmarkphippard" Guid="$(var.GuidIconsMarkPhippard)" Win64="$(var.Win64YesNo)">\r
-                                                                               <File Id="F__SubclipseConflictIcon" Name="TORTOI1.ICO" LongName="ConflictIcon.ico" DiskId="1" src="..\Resources\Icons\Subclipse\ConflictIcon.ico" KeyPath="yes" />\r
-                                                                               <File Id="F__SubclipseInSubversionIcon" Name="TORTOI2.ICO" LongName="NormalIcon.ico" DiskId="1" src="..\Resources\Icons\Subclipse\NormalIcon.ico" />\r
-                                                                               <File Id="F__SubclipseModifiedIcon" Name="TORTOI3.ICO" LongName="ModifiedIcon.ico" DiskId="1" src="..\Resources\Icons\Subclipse\ModifiedIcon.ico" />\r
-                                                                               <File Id="F__SubclipseReadOnlyIcon" Name="TORTOI4.ICO" LongName="ReadOnlyIcon.ico" DiskId="1" src="..\Resources\Icons\Subclipse\ReadOnlyIcon.ico" />\r
-                                                                               <File Id="F__SubclipseDeletedIcon" Name="TORTOI5.ICO" LongName="DeletedIcon.ico" DiskId="1" src="..\Resources\Icons\Subclipse\DeletedIcon.ico" />\r
-                                                                               <File Id="F__SubclipseLockedIcon" Name="TORTOI6.ICO" LongName="LockedIcon.ico" DiskId="1" src="..\Resources\Icons\Subclipse\LockedIcon.ico" />\r
-                                                                               <File Id="F__SubclipseAddedIcon" Name="TORTOI7.ICO" LongName="AddedIcon.ico" DiskId="1" src="..\Resources\Icons\Subclipse\AddedIcon.ico" />\r
-                                                                               <File Id="F__SubclipseIgnoredIcon" Name="TORTOI8.ICO" LongName="IgnoredIcon.ico" DiskId="1" src="..\Resources\Icons\Subclipse\IgnoredIcon.ico" />\r
-                                                                               <File Id="F__SubclipseUnversionedIcon" Name="TORTOI9.ICO" LongName="UnversionedIcon.ico" DiskId="1" src="..\Resources\Icons\Subclipse\UnversionedIcon.ico" />\r
-                                                                       </Component>\r
-\r
-                                                               </Directory>\r
-\r
-                                                               <Directory Id="D__iconsstraight" Name="Straight" >\r
-\r
-                                                                       <Component Id="C__iconsstraight" Guid="$(var.GuidIconsStraight)" Win64="$(var.Win64YesNo)">\r
-                                                                               <File Id="F__StraightConflictIcon" Name="TORTOI1.ICO" LongName="ConflictIcon.ico" DiskId="1" src="..\Resources\Icons\Straight\ConflictIcon.ico" KeyPath="yes" />\r
-                                                                               <File Id="F__StraightInSubversionIcon" Name="TORTOI2.ICO" LongName="NormalIcon.ico" DiskId="1" src="..\Resources\Icons\Straight\NormalIcon.ico" />\r
-                                                                               <File Id="F__StraightModifiedIcon" Name="TORTOI3.ICO" LongName="ModifiedIcon.ico" DiskId="1" src="..\Resources\Icons\Straight\ModifiedIcon.ico" />\r
-                                                                               <File Id="F__StraightReadOnlyIcon" Name="TORTOI4.ICO" LongName="ReadOnlyIcon.ico" DiskId="1" src="..\Resources\Icons\Straight\ReadOnlyIcon.ico" />\r
-                                                                               <File Id="F__StraightDeletedIcon" Name="TORTOI5.ICO" LongName="DeletedIcon.ico" DiskId="1" src="..\Resources\Icons\Straight\DeletedIcon.ico" />\r
-                                                                               <File Id="F__StraightLockedIcon" Name="TORTOI6.ICO" LongName="LockedIcon.ico" DiskId="1" src="..\Resources\Icons\Straight\LockedIcon.ico" />\r
-                                                                               <File Id="F__StraightAddedIcon" Name="TORTOI7.ICO" LongName="AddedIcon.ico" DiskId="1" src="..\Resources\Icons\Straight\AddedIcon.ico" />\r
-                                                                               <File Id="F__StraightIgnoredIcon" Name="TORTOI8.ICO" LongName="IgnoredIcon.ico" DiskId="1" src="..\Resources\Icons\Straight\IgnoredIcon.ico" />\r
-                                                                               <File Id="F__StraightUnversionedIcon" Name="TORTOI9.ICO" LongName="UnversionedIcon.ico" DiskId="1" src="..\Resources\Icons\Straight\UnversionedIcon.ico" />\r
-                                                                       </Component>\r
-\r
-                                                               </Directory>\r
-                                                       </Directory>\r
-                                               </Directory>\r
-                                       </Directory>\r
-\r
-                               </Directory>\r
-                       </Directory>\r
-               </Directory>\r
-       </Fragment>\r
-</Wix>\r
index 1623e06..70fd7ee 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='windows-1252'?>\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>\r
+<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
   <?include Includes.wxi?>\r
   <Product\r
   UpgradeCode="E973E6F7-CB9B-4f9e-9C04-52FE03F19BF2"\r
index fbde2bf..4db1119 100644 (file)
@@ -4,18 +4,18 @@
        <Product\r
        UpgradeCode="$(var.UpgradeGuid)"\r
        Name="$(var.ProductName) $(var.VersionNumberUserVisible) $(var.PlatformUserVisible)"\r
-       Id="????????-????-????-????-????????????"\r
+       Id="EB66C774-5CFC-41f6-9C03-CE4F9037150A"\r
        Version="$(var.VersionNumberInternal)"\r
-       Manufacturer="TortoiseSVN"\r
+       Manufacturer="TortoiseGit"\r
        Language="1033">\r
                <Package\r
-               Id="????????-????-????-????-????????????"\r
+               Id="82B77BC3-0ACD-4a53-A34F-3F203E59D51A"\r
                Keywords="$(var.PackageKeywords)"\r
                Description="$(var.PackageDescription)"\r
                Comments="$(var.PackageComments)"\r
                Manufacturer="$(var.PackageManufacturer)"\r
                InstallerVersion="300"\r
-               Platforms="$(var.PackagePlatforms)"\r
+               Platform="$(var.PackagePlatforms)"\r
                Languages="1033"\r
                Compressed="yes"\r
                SummaryCodepage="1252"/>\r
                        <UpgradeVersion Property="NEWERVERSIONDETECTED" Minimum="$(var.VersionNumberInternal)" OnlyDetect="yes" />\r
 \r
                        <!-- flag is set if the install will trigger an upgrade of an existing install -->\r
+      <!--\r
                        <UpgradeVersion Property="PREVIOUSVERSIONSINSTALLED" Maximum="$(var.VersionNumberInternal)" IncludeMaximum="no" />\r
-               </Upgrade>\r
+               --></Upgrade>\r
 \r
                <Media Id="1" Cabinet="TSVN.cab" EmbedCab="yes" CompressionLevel="high" />\r
 \r
-               <Icon Id="TSVNIcon" src="..\Resources\Tortoise.ico" />\r
+               <Icon Id="TSVNIcon" SourceFile="..\Resources\Tortoise.ico" />\r
 \r
                <!-- Launch Condition related properties ................................................................................. -->\r
                <Property Id="VERSIONIE">\r
@@ -38,7 +39,7 @@
                </Property>\r
                <Condition Message="[ProductName] needs at least Internet Explorer 5">NOT ((VERSIONIE&lt;&lt;"1") OR (VERSIONIE&lt;&lt;"2") OR (VERSIONIE&lt;&lt;"3") OR (VERSIONIE&lt;&lt;"4"))</Condition>\r
 \r
-               <?if $(env.Platform) = "win32" ?>\r
+               <?if $(var.Platform) = "win32" ?>\r
                <Property Id="GDIPLUSINSTALLED">\r
                        <DirectorySearch Id="WND" Path="[SystemFolder]">\r
                                <FileSearch LongName="GDIPlus.dll" />\r
                </Property>\r
                <CustomAction Id="Set_ShowChangelog" Property="ShowChangelog" Value="Yes" Return="check" />\r
                <CustomAction Id="ShowChangelogAction" Property="TEXTEDITOR" ExeCommand="[INSTALLDIR]changelog.txt" Return="asyncNoWait" />\r
-               <CustomAction Id="ShowDonatePage" BinaryKey="CustomActionsDLL" DllEntry="OpenDonatePage" />\r
-               <CustomAction Id="KillCache" BinaryKey="CustomActionsDLL" DllEntry="TerminateCache" />\r
-               <Binary Id="CustomActionsDLL" src="..\..\bin\$(var.ReleasePath)\bin\CustomActions.dll" />\r
+ <!--          \r
+    <CustomAction Id="ShowDonatePage" BinaryKey="CustomActionsDLL" DllEntry="OpenDonatePage" />\r
+               \r
 \r
+    <CustomAction Id="KillCache" BinaryKey="CustomActionsDLL" DllEntry="TerminateCache" />\r
+               <Binary Id="CustomActionsDLL" src="..\..\bin\$(var.ReleasePath)\bin\CustomActions.dll" />\r
+-->\r
                <!-- Unsafe-check properties and custom actions .......................................................................... -->\r
                <Property Id="VSDUIANDADVERTISED">This advertised application will not be installed because it might be unsafe. Contact your administrator to change the installation user interface option of the package to basic.</Property>\r
                <CustomAction Id="ERRCA_UIANDADVERTISED" Error="[VSDUIANDADVERTISED]" />\r
 \r
                <!-- Figure out where a previous installation was, if any ................................................................ -->\r
-               <?if $(env.Platform) = "x64" ?>\r
+               <?if $(var.Platform) = "x64" ?>\r
                <CustomAction Id="DefaultTargetDir" Property="INSTALLDIR" Value="[ProgramFiles64Folder]$(var.ProductName)" Execute="immediate" />\r
                <Property Id="INSTALLDIR">\r
                        <RegistrySearch Id="PreviousInstallLocationRegistrySearch" Root="HKLM" Key="Software\[Manufacturer]" Name="Directory" Type="raw" Win64="$(var.Win64YesNo)"/>\r
                        <RegistrySearch Id="PreviousInstallLocationRegistrySearch" Root="HKLM" Key="Software\[Manufacturer]" Name="Directory" Type="raw" Win64="$(var.Win64YesNo)"/>\r
                </Property>\r
                <?endif ?>\r
-\r
+    \r
+    <?include FeaturesFragment.wxi?>\r
+    <?include StructureFragment.wxi?>\r
+    <?include UIFragment.wxi?>\r
+    \r
+    <!--\r
                <FragmentRef Id="StructureFragment"/>\r
 \r
                <FragmentRef Id="FeaturesFragment" />\r
 \r
                <FragmentRef Id="UIFragment" />\r
-\r
+    -->\r
                <!-- Execute Sequencing ................................................................................................. -->\r
                <AdminExecuteSequence />\r
                <InstallExecuteSequence>\r
                        <AppSearch Sequence="1"></AppSearch>\r
                        <LaunchConditions After="AppSearch" />\r
                        <Custom Action="DefaultTargetDir" After="LaunchConditions">INSTALLDIR=""</Custom>\r
+      <!--\r
                        <RemoveExistingProducts After="FindRelatedProducts"><![CDATA[PREVIOUSVERSIONSINSTALLED OR (NOT NEWERVERSIONDETECTED AND OKTODOWNGRADE = 1)]]></RemoveExistingProducts>\r
-                       <Custom Action="KillCache" After="RemoveExistingProducts">Installed</Custom>\r
+      -->\r
+      <!--\r
+      <Custom Action="KillCache" After="RemoveExistingProducts">Installed</Custom>\r
+      -->\r
                        <ScheduleReboot After="RegisterProduct" />\r
                </InstallExecuteSequence>\r
 \r
similarity index 98%
rename from src/TortoiseGitSetup/UIFragment.wxs
rename to src/TortoiseGitSetup/UIFragment.wxi
index 12d5030..815bf99 100644 (file)
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>\r
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
-  <?include Includes.wxi?>\r
-  <Fragment Id="UIFragment">\r
+<Include>\r
     <UI>\r
       <!-- Add/Remove Programs (ARP) related properties ................................ -->\r
       <Property Id="ARPCOMMENTS">$(var.PackageComments)</Property>\r
                  <Control Id="DonateText" Type="Text" X="135" Y="150" Width="200" Height="40" Transparent="yes" NoPrefix="yes">\r
                          <Text>Thanks for using TortoiseSVN. You can show your appreciation and support future development by donating!</Text>\r
                  </Control>\r
+        <!--\r
                  <Control Id="DonateButton" Type="PushButton" X="279" Y="190" Width="56" Height="17" Disabled="no" Text="Donate!">\r
                          <Publish Event="DoAction" Value="ShowDonatePage">1</Publish>\r
                  </Control>\r
+      -->\r
                  <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />\r
       </Dialog>\r
 \r
                  <Control Id="DonateText" Type="Text" X="35" Y="150" Width="300" Height="40" Transparent="yes" NoPrefix="yes">\r
                          <Text>Thanks for using TortoiseSVN. You can show your appreciation and support future development by donating!</Text>\r
                  </Control>\r
+        <!--\r
                  <Control Id="DonateButton" Type="PushButton" X="279" Y="190" Width="56" Height="17" Disabled="no" Text="Donate!">\r
                          <Publish Event="DoAction" Value="ShowDonatePage">1</Publish>\r
                  </Control>\r
-\r
+-->\r
         <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />\r
         <Control Id="Title" Type="Text" X="155" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" RightAligned="yes">\r
           <Text>[DlgTitleFont][Progress1] [ProductName]</Text>\r
       <Error Id="1934">User installations are disabled via policy on the machine.</Error>\r
       <Error Id="1935">An error occured during the installation of assembly component [2]. HRESULT: [3]. {{assembly interface: [4], function: [5], assembly name: [6]}}</Error>\r
     </UI>\r
-  </Fragment>\r
-</Wix>\r
+</Include>\r
index 3fd0c80..665602c 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Include Id="VersionNumberInclude">\r
        <?define MajorVersion="0" ?>\r
-       <?define MinorVersion="0" ?>\r
+       <?define MinorVersion="1" ?>\r
        <?define MicroVersion="0" ?>\r
        <?define BuildVersion="0" ?>\r
 </Include>\r
index b5d98e9..c18d36f 100644 (file)
@@ -1,44 +1,48 @@
-<?xml version="1.0" encoding="utf-8" ?>\r
-<VisualStudioProject>\r
-    <WindowsInstallerXML\r
-        ProductVersion="2.0.3116.0"\r
-        ProjectGuid="{E6749100-E168-457A-B680-BAADAF573D75}"\r
-        SchemaVersion="1.0"\r
-    >\r
-        <BuildSettings\r
-            OutputName="Setup"\r
-            OutputType="MSI"\r
-        />\r
-        <Configurations>\r
-            <Configuration\r
-                Name="Debug"\r
-                RelativeOutputDirectory="..\..\bin"\r
-            />\r
-            <Configuration\r
-                Name="Release"\r
-                RelativeOutputDirectory="..\..\bin"\r
-            />\r
-        </Configurations>\r
-        <WixlibReferences />\r
-        <Files>\r
-            <File\r
-                RelativePath="FeaturesFragment.wxs"\r
-            />\r
-            <File\r
-                RelativePath="Includes.wxi"\r
-            />\r
-            <File\r
-                RelativePath="StructureFragment.wxs"\r
-            />\r
-            <File\r
-                RelativePath="TortoiseSVN.wxs"\r
-            />\r
-            <File\r
-                RelativePath="UIFragment.wxs"\r
-            />\r
-            <File\r
-                RelativePath="VersionNumberInclude.in.wxi"\r
-            />\r
-        </Files>\r
-    </WindowsInstallerXML>\r
-</VisualStudioProject>\r
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>\r
+    <ProductVersion>3.0</ProductVersion>\r
+    <ProjectGuid>{150172a5-8d02-4c00-abb5-bd99d4b16b4c}</ProjectGuid>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <OutputName>WixProject1</OutputName>\r
+    <OutputType>Package</OutputType>\r
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">\r
+    <OutputPath>..\..\bin\setup\</OutputPath>\r
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>\r
+    <DefineConstants>Debug;IncludeCrashReportDll=0;DictionaryENGB=0;DictionaryENUS=1;MergeModules=C:\Program Files\Common Files\Merge Modules;</DefineConstants>\r
+    <WixVariables>\r
+    </WixVariables>\r
+    <SuppressSpecificWarnings>\r
+    </SuppressSpecificWarnings>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">\r
+    <OutputPath>..\..\bin\setup\</OutputPath>\r
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>\r
+    <DefineConstants>IncludeCrashReportDll=0;DictionaryENGB=0;DictionaryENUS=1;MergeModules=C:\Program Files\Common Files\Merge Modules;</DefineConstants>\r
+    <SuppressSpecificWarnings>\r
+    </SuppressSpecificWarnings>\r
+  </PropertyGroup>\r
+  <Import Project="$(WixTargetsPath)" />\r
+  <!--\r
+       To modify your build process, add your task inside one of the targets below and uncomment it.\r
+       Other similar extension points exist, see Wix.targets.\r
+       <Target Name="BeforeBuild">\r
+       </Target>\r
+       <Target Name="AfterBuild">\r
+       </Target>\r
+       -->\r
+  <ItemGroup>\r
+    <Compile Include="TortoiseSVN.wxs" />\r
+    <Compile Include="WixUI_Simplest.wxs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Content Include="FeaturesFragment.wxi" />\r
+    <Content Include="Includes.wxi" />\r
+    <Content Include="StructureFragment.wxi" />\r
+    <Content Include="UIFragment.wxi" />\r
+    <Content Include="VersionNumberInclude.wxi" />\r
+  </ItemGroup>\r
+</Project>
\ No newline at end of file
index 042e29d..5009670 100644 (file)
@@ -8,7 +8,7 @@ First-time install dialog sequence:      Maintenance dialog sequence:
                                             - WixUI_VerifyReadyDlg\r
 -->\r
 \r
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">\r
   <Fragment>\r
     <UI Id="WixUI_Simplest">\r
       <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />\r
index 9615d73..0922467 100644 (file)
@@ -17,7 +17,8 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
 //\r
 #pragma once\r
-#include "SVNRev.h"\r
+#if 0\r
+#include "GitRev.h"\r
 #include "StandAloneDlg.h"\r
 #include "HistoryCombo.h"\r
 #include "FileDropEdit.h"\r
@@ -58,7 +59,7 @@ protected:
 \r
        DECLARE_MESSAGE_MAP()\r
 \r
-       void            SetRevision(const SVNRev& rev);\r
+       void            SetRevision(const GitRev& rev);\r
 protected:\r
        CToolTips               m_tooltips;\r
        CString                 m_sRevision;\r
@@ -68,12 +69,13 @@ protected:
 public:\r
        CHistoryCombo   m_URLCombo;\r
        CString                 m_URL;\r
-       SVNRev                  Revision;\r
+       GitRev                  Revision;\r
        BOOL                    m_bNoExternals;\r
        CButton                 m_butBrowse;\r
        CEdit                   m_editRevision;\r
        CString                 m_strCheckoutDirectory;\r
        CFileDropEdit   m_cCheckoutEdit;\r
        CLogDlg *               m_pLogDlg;\r
-       svn_depth_t             m_depth;\r
+       git_depth_t             m_depth;\r
 };\r
+#endif
\ No newline at end of file
index f5101b5..a67b2e8 100644 (file)
@@ -24,3 +24,7 @@
 #include "Hooks.h"\r
 #include "MessageBox.h"\r
 \r
+bool CloneCommand::Execute()\r
+{\r
+       return TRUE;\r
+}\r
index 15e7782..f10b617 100644 (file)
                                Optimization="1"\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;..\TortoiseShell;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r
+                               AdditionalIncludeDirectories="&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"\r
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="delayimp.lib Crypt32.lib Secur32.lib wininet.lib shfolder.lib shell32.lib comctl32.lib mswsock.lib ws2_32.lib rpcrt4.lib shlwapi.lib Version.lib gdiplus.lib ../../obj/ResizableLib/Release/ResizableLib.Lib ../../obj\LogCacheLib\Release\LogCacheLib.lib ../../ext/Subversion\release_win32\libsvn_repos.lib ../../ext/Subversion\release_win32\libsvn_diff.lib ../../ext/Subversion\release_win32\libsvn_fs.lib ../../ext/Subversion\release_win32\libsvn_fs_fs.lib ../../ext/Subversion\release_win32\libsvn_fs_util.lib ../../ext/Subversion\release_win32\libsvn_ra_neon.lib ../../ext/Subversion\release_win32\libsvn_ra_serf.lib ../../ext/Subversion\release_win32\libsvn_ra_local.lib ../../ext/Subversion\release_win32\libsvn_ra.lib ../../ext/Subversion\release_win32\libsvn_ra_svn.lib ../../ext/neon\release_win32\libneon.lib ../../ext/serf\release_win32\libserf.lib ../../ext/Subversion\release_win32\libsvn_wc.lib ../../ext/Subversion\release_win32\libsvn_subr.lib ../../ext/Subversion\release_win32\libsvn_client.lib ../../ext/Subversion\release_win32\libsvn_delta.lib ../../ext/apr\release_win32\libapr_tsvn.lib ../../ext/apr-util\release_win32\libaprutil_tsvn.lib ../../ext/apr-util\xml\expat\lib\release_win32\xml.lib ../../ext/libintl/libintl3-win32/lib/intl3_tsvn.lib ../../ext/cyrus-SASL\release_win32\libsasl.lib"\r
+                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
                                LinkIncremental="1"\r
                                IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\gitstatuslistctrl.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath=".\ProjectProperties.cpp"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\open.ico"\r
+                               RelativePath=".\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\open.ico"\r
+                               RelativePath="..\Resources\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\saveas.ico"\r
+                               RelativePath=".\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\saveas.ico"\r
+                               RelativePath="..\Resources\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
diff --git a/src/TortoiseProc/gitstatuslistctrl.cpp b/src/TortoiseProc/gitstatuslistctrl.cpp
deleted file mode 100644 (file)
index 799c2d6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "StdAfx.h"\r
-#include "..\Git\GitStatusListCtrl.h"\r
-\r
-int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash)\r
-{\r
-       return 0;\r
-}\r
-\r
-void CGitStatusListCtrl::AddEntry(CTGitPath* path, WORD langID, int ListIndex)\r
-{\r
-}\r
index 3d699e7..bb517d5 100644 (file)
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
                                OmitFramePointers="true"\r
-                               AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;..\TortoiseShell;..\Utils;..\svn;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI"\r
+                               AdditionalIncludeDirectories="&quot;../Git&quot;;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\Utils\MiscUI"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
index 7341f80..efc1b40 100644 (file)
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                EnableIntrinsicFunctions="true"\r
+                               AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r