Changeset 802e4954cf8a…
Parent 4d2ab43036ef…
by
Changes to 6 files · Browse files at 802e4954cf8a Showing diff from parent 4d2ab43036ef Diff from another changeset...
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?include thg-guids.wxi ?>
+ <?include guids.wxi ?>
<?define thgcmenulangs =
cs;da;de;en_GB;en_US;es;fa;fr;he;hr;it;ja;ko;nl;nn;pl;pt;pt_BR;ru;tr;uk;zh_CN;zh_TW
|
@@ -32,4 +32,48 @@ <?define templates.spartan.guid = {0686468F-D950-422f-A904-1B09FFD3C852} ?>
<?define templates.static.guid = {9AC0E261-7563-4147-9974-12022C1CBD4E} ?>
+ <!-- cmenu-i18n.wxs -->
+ <?define cmenuI18n.guid = {B0AB4947-248C-4c6b-841C-49284EF99022} ?>
+
+ <!-- icons.wxs -->
+ <?define Icons.guid = {30E997E7-FB02-4d34-AF61-A6FD6C93E268} ?>
+ <?define SvgIcons.guid = {7C87CCC7-8377-49c8-ACFD-1F246ED14747} ?>
+
+ <!-- thg-i18n.wxs -->
+ <?define thgI18nFolder.guid = {69E6E182-BCD2-4b03-A941-7B9A054DF7AF} ?>
+
+ <!-- tortoisehg.wxs -->
+ <?define ProductUpgradeCode = {838657CF-C9EC-452D-800D-0E70FC021D0A} ?>
+
+ <?define ComponentMainExecutableGUID = {5A98EB92-2C82-406E-81A5-1161CA87ED8E} ?>
+
+ <?define thgshellx86dll.guid = {1126CF42-3994-428B-A746-464E1BC680F3} ?>
+ <?define thgshellx64dll.guid = {59FD2A49-BA62-40CC-B155-D11DB11EE611} ?>
+
+ <?define CmenuShellRegistrationX86.guid = {287A355F-3DF6-4f55-9DD5-FABD09498B0C} ?>
+ <?define CmenuShellRegistrationX64.guid = {46DF4532-7BFF-427a-BC59-F3B4D1022F56} ?>
+
+ <?define OverlaysShellRegistrationX86.guid = {5592F837-8C78-43f0-AD8D-2E2EA4B17E45} ?>
+ <?define OverlaysShellRegistrationX64.guid = {9B1300FC-3D05-4c82-991D-96277404C4BA} ?>
+ <?define OverlayServerEXE.guid = {DC5D9CC4-8330-4146-99EC-30D3AA255DD4} ?>
+
+ <?define ExtensionVersions.guid = {1996AB0D-634D-4DC8-9581-326151F38B11} ?>
+ <?define COPYING.guid = {382A8405-CB7B-42E8-8B9D-88B5C5283E73} ?>
+
+ <?define docdiffEXE.guid = {4BA6389A-6A0B-483B-A3FE-86EE436FDD31} ?>
+ <?define KDiff3EXE.guid = {B2A5EFD4-A385-45E0-8467-46B955979672} ?>
+ <?define TortoisePlinkEXE.guid = {A18BFE4D-BED0-4EF9-97CC-5B4326E3CD2F} ?>
+ <?define PageantEXE.guid = {EA7EF381-076C-47CE-8F51-355DB7F86D1A} ?>
+
+ <?define chmFile.guid = {A26038DC-C686-4296-9335-FA4B9ABC769C} ?>
+ <?define pdfFile.guid = {1C5792DA-C48F-4F7F-9CD8-FC467995B8E4} ?>
+ <?define hgbook.guid = {A5F6D094-BCFD-4AC0-8675-7DF8CC94FEE5} ?>
+
+ <?define mercurial.rc.guid = {28ACE5D7-FFCE-488E-A94A-8F13A21DD25D} ?>
+ <?define mergetools.rc.guid = {30CC047C-48B4-4D91-B8EC-79975327A9C7} ?>
+ <?define mergepatterns.rc.guid = {05860DA7-8391-43A4-A4E7-6E9E084D11C6} ?>
+
+ <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
+ <?define ThgAppData.guid = {94B8FBB5-4AE3-4960-B3D8-94BEFC6366E9} ?>
+
</Include>
|
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?include thg-guids.wxi ?>
+ <?include guids.wxi ?>
<Fragment>
<DirectoryRef Id="INSTALLDIR">
|
|
@@ -1,51 +0,0 @@ - <Include>
- <!-- These are component GUIDs used for TortoiseHg installers.
- YOU MUST CHANGE ALL GUIDs below when copying this file
- and replace 'TortoiseHg' in this notice with the name of
- your project. Component GUIDs have global namespace! -->
-
- <!-- cmenu-i18n.wxs -->
- <?define cmenuI18n.guid = {B0AB4947-248C-4c6b-841C-49284EF99022} ?>
-
- <!-- icons.wxs -->
- <?define Icons.guid = {30E997E7-FB02-4d34-AF61-A6FD6C93E268} ?>
- <?define SvgIcons.guid = {7C87CCC7-8377-49c8-ACFD-1F246ED14747} ?>
-
- <!-- thg-i18n.wxs -->
- <?define thgI18nFolder.guid = {69E6E182-BCD2-4b03-A941-7B9A054DF7AF} ?>
-
- <!-- tortoisehg.wxs -->
- <?define ProductUpgradeCode = {838657CF-C9EC-452D-800D-0E70FC021D0A} ?>
-
- <?define ComponentMainExecutableGUID = {5A98EB92-2C82-406E-81A5-1161CA87ED8E} ?>
-
- <?define thgshellx86dll.guid = {1126CF42-3994-428B-A746-464E1BC680F3} ?>
- <?define thgshellx64dll.guid = {59FD2A49-BA62-40CC-B155-D11DB11EE611} ?>
-
- <?define CmenuShellRegistrationX86.guid = {287A355F-3DF6-4f55-9DD5-FABD09498B0C} ?>
- <?define CmenuShellRegistrationX64.guid = {46DF4532-7BFF-427a-BC59-F3B4D1022F56} ?>
-
- <?define OverlaysShellRegistrationX86.guid = {5592F837-8C78-43f0-AD8D-2E2EA4B17E45} ?>
- <?define OverlaysShellRegistrationX64.guid = {9B1300FC-3D05-4c82-991D-96277404C4BA} ?>
- <?define OverlayServerEXE.guid = {DC5D9CC4-8330-4146-99EC-30D3AA255DD4} ?>
-
- <?define ExtensionVersions.guid = {1996AB0D-634D-4DC8-9581-326151F38B11} ?>
- <?define COPYING.guid = {382A8405-CB7B-42E8-8B9D-88B5C5283E73} ?>
-
- <?define docdiffEXE.guid = {4BA6389A-6A0B-483B-A3FE-86EE436FDD31} ?>
- <?define KDiff3EXE.guid = {B2A5EFD4-A385-45E0-8467-46B955979672} ?>
- <?define TortoisePlinkEXE.guid = {A18BFE4D-BED0-4EF9-97CC-5B4326E3CD2F} ?>
- <?define PageantEXE.guid = {EA7EF381-076C-47CE-8F51-355DB7F86D1A} ?>
-
- <?define chmFile.guid = {A26038DC-C686-4296-9335-FA4B9ABC769C} ?>
- <?define pdfFile.guid = {1C5792DA-C48F-4F7F-9CD8-FC467995B8E4} ?>
- <?define hgbook.guid = {A5F6D094-BCFD-4AC0-8675-7DF8CC94FEE5} ?>
-
- <?define mercurial.rc.guid = {28ACE5D7-FFCE-488E-A94A-8F13A21DD25D} ?>
- <?define mergetools.rc.guid = {30CC047C-48B4-4D91-B8EC-79975327A9C7} ?>
- <?define mergepatterns.rc.guid = {05860DA7-8391-43A4-A4E7-6E9E084D11C6} ?>
-
- <?define ProgramMenuDir.guid = {D5A63320-1238-489B-B68B-CF053E9577CA} ?>
- <?define ThgAppData.guid = {94B8FBB5-4AE3-4960-B3D8-94BEFC6366E9} ?>
-
-</Include>
|
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
- <?include thg-guids.wxi ?>
+ <?include guids.wxi ?>
<?define thg_po_langs =
cs;da;de;en_GB;es;fa;fr;he;hr;hu;it;ja;ko;nl;nn;oc;pl;pt;pt_BR;ru;sv;tr;uk;zh_CN;zh_TW
|
@@ -6,7 +6,7 @@ This software may be used and distributed according to the terms of the
GNU General Public License version 2 or any later version. -->
- <?include thg-guids.wxi ?>
+ <?include guids.wxi ?>
<?if $(var.Platform) = "x64" ?>
<?define IsX64 = yes ?>
|
Loading...