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

stable contrib/wix: add sdk_build_extensions.cmd

Moved from thg-winbuild.

But now creating terminate-x86.exe and terminate-x64.exe and using
different paths.

Taking now terminate-x86.exe to run the CallTerminate custom action
(fixes issue 2 of thg-winbuild)

Changeset 8f26a4aa2ff5…

Parent eb1db3f71ce9…

by Adrian Buehlmann

Changes to 2 files · Browse files at 8f26a4aa2ff5 Showing diff from parent eb1db3f71ce9 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​sdk_build_extensions.cmd Stacked
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
@@ -0,0 +1,25 @@
+:: %1 - TortoiseHg Version first level +:: %2 - second level +:: %3 - third level +:: %4 - platform (x86 or x64) +:: %5 - msi product id (GUID) + +set _SDKBIN_=%PROGRAMFILES%\Microsoft SDKs\Windows\v7.0\Bin +if exist "%_SDKBIN_%" goto :ok +set _SDKBIN_=%ProgramW6432%\Microsoft SDKs\Windows\v7.0\Bin +if exist "%_SDKBIN_%" goto :ok +echo Microsoft Windows SDK 7 SP1 not installed +pause +exit 1 +:ok + +cd win32\shellext + +call "%_SDKBIN_%\SetEnv.cmd" /xp /%4 /release +set DEBUG=1 +set THG_EXTRA_CPPFLAGS=/DTHG_MSI_INSTALL /DTHG_PRODUCT_ID=%5 +set THG_EXTRA_RCFLAGS=/dTHG_VERSION_FIRST=%1 /dTHG_VERSION_SECOND=%2 /dTHG_VERSION_THIRD=%3 /dTHG_PRODUCT_ID="%5" +nmake /f Makefile.nmake clean +nmake /f Makefile.nmake +move ThgShell.dll ..\ThgShell%4.dll +move terminate.exe ..\terminate-%4.exe
Change 1 of 3 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
77
78
79
80
 
81
82
83
 
186
187
188
189
 
190
191
192
 
290
291
292
293
 
294
295
 
296
297
298
 
77
78
79
 
80
81
82
83
 
186
187
188
 
189
190
191
192
 
290
291
292
 
293
294
 
295
296
297
298
@@ -77,7 +77,7 @@
  Name='TortoiseHgRpcServer' Value='[INSTALLDIR]thgtaskbar.exe' />   </Component>   <Component Id='thgshellx86dll' Guid='1126CF42-3994-428B-A746-464E1BC680F3'> - <File Id='thgshellx86dll' Name='ThgShellx86.dll' DiskId='1' Source='..\misc\ThgShellx86.dll' KeyPath='yes'/> + <File Id='thgshellx86dll' Name='ThgShellx86.dll' DiskId='1' Source='win32\ThgShellx86.dll' KeyPath='yes'/>   <RegistryValue Root='HKMU' Key='Software\TortoiseHg' Type='string' Value='[INSTALLDIR]' />   <RegistryValue Root='HKCR' Key='CLSID\{46605027-5B8C-4DCE-BFE0-051B7972D64C}\InProcServer32'   Type='string' Value='[INSTALLDIR]ThgShellx86.dll' /> @@ -186,7 +186,7 @@
  <Directory Id="CommonFiles64Folder" Name="Programs64" >   <Directory Id="Common64" Name="TortoiseHg" >   <Component Id='thgshellx64dll' Guid='59FD2A49-BA62-40CC-B155-D11DB11EE611' Win64='yes'> - <File Id='thgshellx64dll' Name='ThgShellx64.dll' DiskId='1' Source='..\misc\ThgShellx64.dll' KeyPath='yes' /> + <File Id='thgshellx64dll' Name='ThgShellx64.dll' DiskId='1' Source='win32\ThgShellx64.dll' KeyPath='yes' />   <RegistryValue Root='HKMU' Key='Software\TortoiseHg' Type='string' Value='[INSTALLDIR]' />   <RegistryValue Root='HKCR' Key='CLSID\{46605027-5B8C-4DCE-BFE0-051B7972D64C}\InProcServer32'   Type='string' Value='[Common64]ThgShellx64.dll' /> @@ -290,9 +290,9 @@
  the command pipe. Windows installer sometimes fails to shutdown thgtaskbar.exe, which   occasionally leads to a crash of thgtaskbar.exe during install, which in turn pops up   an ugly crash report dialog pointing to faulting module PYTHON26.DLL. --> - <Binary Id='TerminateEXE' SourceFile='..\misc\terminate.exe' /> + <Binary Id='TerminateEXE' SourceFile='win32\terminate-x86.exe' />   <CustomAction Id='CallTerminate' BinaryKey='TerminateEXE' ExeCommand='' Return='ignore' /> - +   <CustomAction Id='StartThgtaskbarEXE' FileKey='thgtaskbarEXE' ExeCommand='' Return='asyncNoWait' />     <InstallExecuteSequence>