Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

iss: disable bundling of vcredist packages

For the 0.8 release, we are going to use mingw32 to build the Mercurial extensions, like
all previous THG releases. MSVC 2005 SP1 (VC8) will be used to build the shell extension
for x86 and x64, but they will be shipped statically linked.

Changeset 0dc43b00a72b…

Parent 4a3c9f880c0d…

by Steve Borho

Changes to one file · Browse files at 0dc43b00a72b Showing diff from parent 4a3c9f880c0d Diff from another changeset...

Change 1 of 2 Show Entire File contrib/​win32/​mercurial.iss Stacked
 
61
62
63
64
65
 
 
66
67
68
 
78
79
80
81
82
 
 
83
84
85
 
61
62
63
 
 
64
65
66
67
68
 
78
79
80
 
 
81
82
83
84
85
@@ -61,8 +61,8 @@
 Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt  Source: COPYING.txt; DestDir: {app}; DestName: Copying.txt  Source: ..\icons\hgicon.ico; DestDir: {app} -Source: ..\contrib\vcredist_x86.exe; DestDir: {tmp}; Check: ShouldInstallVCPPSP1 and not Is64BitInstallMode -Source: ..\contrib\vcredist_x64.exe; DestDir: {tmp}; Check: ShouldInstallVCPPSP1 and Is64BitInstallMode +;Source: ..\contrib\vcredist_x86.exe; DestDir: {tmp}; Check: ShouldInstallVCPPSP1 and not Is64BitInstallMode +;Source: ..\contrib\vcredist_x64.exe; DestDir: {tmp}; Check: ShouldInstallVCPPSP1 and Is64BitInstallMode    Source: ..\files\THgShellx86.dll; DestDir: {app}; DestName: ThgShell.dll; Check: not Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete  Source: ..\files\ThgShellx64.dll; DestDir: {app}; DestName: ThgShell.dll; Check: Is64BitInstallMode; Flags: ignoreversion restartreplace uninsrestartdelete @@ -78,8 +78,8 @@
 Name: {group}\Uninstall TortoiseHg; Filename: {uninstallexe}    [Run] -Filename: {tmp}\vcredist_x86.exe; Parameters: /q; Check: ShouldInstallVCPPSP1 and not Is64BitInstallMode -Filename: {tmp}\vcredist_x64.exe; Parameters: /q; Check: ShouldInstallVCPPSP1 and Is64BitInstallMode +;Filename: {tmp}\vcredist_x86.exe; Parameters: /q; Check: ShouldInstallVCPPSP1 and not Is64BitInstallMode +;Filename: {tmp}\vcredist_x64.exe; Parameters: /q; Check: ShouldInstallVCPPSP1 and Is64BitInstallMode  Filename: {app}\add_path.exe; Parameters: {app}; StatusMsg: Adding the installation path to the search path...  Filename: msiexec.exe; Parameters: "/i ""{app}\TortoiseOverlays\TortoiseOverlays-1.0.6.16523-win32.msi"" /qn /norestart ALLUSERS=1"; Check: not Is64BitInstallMode; StatusMsg: Installing TortoiseOverlays.dll ...  Filename: msiexec.exe; Parameters: "/i ""{app}\TortoiseOverlays\TortoiseOverlays-1.0.6.16523-x64.msi"" /qn /norestart ALLUSERS=1"; Check: Is64BitInstallMode; StatusMsg: Installing TortoiseOverlays.dll ...