Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

shellext: introduce new GUIDs used for WiX msi installer

The new GUIDs may be used by setting environment variable THG_EXTRA_CPPFLAGS
to "/DTHG_MSI_INSTALL" with

set THG_EXTRA_CPPFLAGS=/DTHG_MSI_INSTALL

in the build script.

If THG_EXTRA_CPPFLAGS has not been set, then the old innosetup GUIDs are used.

Changeset 31992e55cfd4…

Parent 65717f6312cf…

by Adrian Buehlmann

Changes to 2 files · Browse files at 31992e55cfd4 Showing diff from parent 65717f6312cf Diff from another changeset...

Change 1 of 1 Show Entire File win32/​shellext/​Makefile.nmake Stacked
 
32
33
34
35
 
 
36
37
38
 
32
33
34
 
35
36
37
38
39
@@ -32,7 +32,8 @@
     # /MT = statically linked runtime libraries /MD = dynamically linked -CPPFLAGS = /nologo /Ox /W2 /EHsc /MT /DAPPMAIN /DTHG_DEBUG +# THG_EXTRA_CPPFLAGS is taken from environment (may be undefined) +CPPFLAGS = /nologo /Ox /W2 /EHsc /MT /DAPPMAIN /DTHG_DEBUG $(THG_EXTRA_CPPFLAGS)  BASE_LDFLAGS = /nologo /INCREMENTAL:NO /MANIFEST $(LIBS)  LDFLAGS_THGSHELL = $(BASE_LDFLAGS) /DLL /DEF:$(DEFFILE)  LDFLAGS_DIRSTATE = $(BASE_LDFLAGS) /SUBSYSTEM:CONSOLE
Change 1 of 1 Show Entire File win32/​shellext/​ShellExt.cpp Stacked
 
12
13
14
 
 
 
 
 
 
 
 
 
 
15
16
17
18
19
20
21
22
23
 
24
25
26
 
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
 
 
 
30
31
32
33
34
@@ -12,15 +12,23 @@
 #define INITGUID  #include <initguid.h>   +#ifdef THG_MSI_INSTALL +// GUIDs used by WiX msi installer +DEFINE_GUID(CLSID_TortoiseHgCmenu, 0x46605027L, 0x5B8C, 0x4DCE, 0xBF, 0xE0, 0x05, 0x1B, 0x79, 0x72, 0xD6, 0x4C); + +DEFINE_GUID(CLSID_TortoiseHg0, 0x869C8877L, 0x2C3C, 0x438D, 0x84, 0x4B, 0x31, 0xB8, 0x6B, 0xFE, 0x5E, 0x8A); +DEFINE_GUID(CLSID_TortoiseHg1, 0xAF42ADABL, 0x8C2E, 0x4285, 0xB7, 0x46, 0x99, 0xB3, 0x10, 0x94, 0x70, 0x8E); +DEFINE_GUID(CLSID_TortoiseHg2, 0xCDA1C89DL, 0xE9B5, 0x4981, 0xA8, 0x57, 0x82, 0xDD, 0x93, 0x2E, 0xA2, 0xFD); +DEFINE_GUID(CLSID_TortoiseHg6, 0x9E3D4EC9L, 0x0624, 0x4393, 0x8B, 0x48, 0x20, 0x4C, 0x21, 0x7E, 0xD1, 0xFF); +#else +// GUIDs used by innosetup installer  DEFINE_GUID(CLSID_TortoiseHgCmenu, 0xb456db9fL, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e);    DEFINE_GUID(CLSID_TortoiseHg0, 0xb456dba0L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e);  DEFINE_GUID(CLSID_TortoiseHg1, 0xb456dba1L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e);  DEFINE_GUID(CLSID_TortoiseHg2, 0xb456dba2L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e); -DEFINE_GUID(CLSID_TortoiseHg3, 0xb456dba3L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e); -DEFINE_GUID(CLSID_TortoiseHg4, 0xb456dba4L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e); -DEFINE_GUID(CLSID_TortoiseHg5, 0xb456dba5L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e);  DEFINE_GUID(CLSID_TortoiseHg6, 0xb456dba6L, 0x7bf4, 0x478c, 0x93, 0x7a, 0x5, 0x13, 0xc, 0x2c, 0x21, 0x2e); +#endif    UINT g_cRefThisDll = 0;  HINSTANCE g_hmodThisDll = NULL;