OSDN Git Service

Merge from feature_merge branch. Build TortoiseMerge successfully.
[tortoisegit/TortoiseGitJp.git] / src / TortoiseGitSetup / Includes.wxi
index f5c42f1..2c308dc 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
-\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
-\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
-\r
-       <?define GuidHelpEN="53416983-DD93-4b57-BC13-F246057B592A"?>\r
-\r
-       <?define GuidTortoiseSVN="AE3E4132-4EF5-4297-8444-32B73D916FA0"?>\r
+       <?define GuidInfoFiles="78ACAFC6-6F62-4a58-85DC-E4FE52AEA41E"?>\r
+       <?define GuidProgramMenuFolder="B776F75C-B019-44b1-957A-3F58D3A225CF"?>\r
+\r
+       <?define GuidShellRegistry="9E011A3C-F5D1-47ab-8BE2-443C2FFF9499"?>\r
+       <?define GuidMachineRegistry="E61BA450-C3DF-4ea5-98D4-240E4B05C9C4"?>\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="CB2A61D8-AE23-4b9b-AC7D-473E2610367E"?>\r
+       <?define GuidBerkeleyDB="D1002679-2234-4c1e-AEBD-F65DAE45A02E"?>\r
+       <?define GuidAPR="72EB77A1-E5CD-4cdb-BFC2-77FDCFD04ACF"?>\r
+       <?define GuidGitLib="61EC5A0E-0B76-4e47-90A9-E0CF2E893444"?>\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="7AB0A6AA-1283-4a2a-B989-D8117ACB9FC4"?>\r
+\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
-\r
-       <?define GuidDictionaryENGB="1CC29BB2-023E-4d59-82DD-8C26E59F4280"?>\r
-       <?define GuidDictionaryENUS="46A24184-E5C0-4f6e-BD24-9EA6BDCD6DE2"?>\r
-\r
-       <?define GuidDiffScripts="448D99A8-A18D-45d4-9DC7-E389C5D03CCC"?>\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
-\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="03B4BF1F-7CBB-4f14-BE09-5DAA6F38B976"?>\r
+       <?define GuidDictionaryENUS="5E7DDA35-1078-40c1-8428-14808AF7DB96"?>\r
+\r
+       <?define GuidDiffScripts="A4FB4DC3-489C-4144-A286-C2693356E04A"?>\r
+\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="96412A1D-3EE2-4874-8CFC-8EF4D0E36467"?>\r
+       <?define GuidIconsMarkPhippard="9151E386-6DD8-45a8-8C04-EBEBD9D8E179"?>\r
+       <?define GuidIconsStraight="669EE534-B358-489e-AD81-544A32172FE7"?>\r
+  <?define RegSSHPLINK="112230AA-AB13-4667-AD78-DC8EBEA2ED26"?>\r
+  <?define RegSSHOpen="0E21B3B2-FA54-411b-9AF3-BB275F169A27"?>\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
-\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 GuidGitLib="45615857-0FA0-43c1-9595-4C72A03AD1AC"?>\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
+       <?define RegSSHPLINK="112230AA-AB13-4667-AD78-DC8EBEA2ED26"?>\r
+       <?define RegSSHOpen="0E21B3B2-FA54-411b-9AF3-BB275F169A27"?>\r
        <?endif?>\r
 \r
 </Include>\r