Commits

Steve Borho committed c2b641f

iss: prune dangling bits

Taking a wild stab this cleans up the new warning message from the
installer, that showed up a couple of days ago

Comments (0)

Files changed (1)

contrib/win32/mercurial.iss

 Source: ..\build-hg\contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
 Source: ..\build-hg\templates\*.*; DestDir: {app}\templates; Flags: recursesubdirs createallsubdirs
 Source: ..\build-hg\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs
-Source: ..\build-hg\i18n\*.*; DestDir: {app}\i18n; Flags:
-Source: ..\build-hg\doc\*.html; DestDir: {app}\docs; Flags: ; Components: help
+Source: ..\build-hg\i18n\*.*; DestDir: {app}\i18n
+Source: ..\build-hg\doc\*.html; DestDir: {app}\docs; Components: help
 Source: {app}\Mercurial.ini; DestDir: {app}\backup; Flags: external skipifsourcedoesntexist uninsneveruninstall
 Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; AfterInstall: FileExpandString('{app}\Mercurial.ini')
 Source: contrib\win32\mercurialuser.ini; DestDir: {%USERPROFILE}; DestName: Mercurial.ini; AfterInstall: FileExpandStringEx('{%USERPROFILE}\Mercurial.ini'); Flags: onlyifdoesntexist 
 Source: ReleaseNotes.txt; DestDir: {app}; DestName: ReleaseNotes.txt
-Source: ..\contrib\*.exe; DestDir: {app}; Flags: 
-Source: ..\contrib\*.dll; DestDir: {app}; Flags: 
+Source: ..\contrib\*.exe; DestDir: {app}
+Source: ..\contrib\*.dll; DestDir: {app}
 Source: ..\contrib\TortoiseOverlays\*.*; DestDir: {app}/TortoiseOverlays
 Source: contrib\refreshicons.cmd; DestDir: {app}/contrib
 Source: dist\*.exe; Excludes: thgtaskbar.exe; DestDir: {app}; Flags: ignoreversion
 Source: dist\thgtaskbar.exe; DestDir: {app}; Flags: ignoreversion; Components: shell
 Source: dist\*.dll; DestDir: {app}; Flags: ignoreversion
 Source: dist\library.zip; DestDir: {app}
-Source: doc\build\pdf\*.pdf; DestDir: {app}/docs; Flags: ; Components: help
-Source: doc\build\chm\*.chm; DestDir: {app}/docs; Flags: ; Components: help
+Source: doc\build\pdf\*.pdf; DestDir: {app}/docs; Components: help
+Source: doc\build\chm\*.chm; DestDir: {app}/docs; Components: help
 Source: icons\*; DestDir: {app}\icons; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: dist\gtk\*; DestDir: {app}\gtk; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs
 Source: i18n\*.*; DestDir: {app}\i18n; Flags: recursesubdirs createallsubdirs
-Source: win32\*.reg; DestDir: {app}\cmenu_i18n;
+Source: win32\*.reg; DestDir: {app}\cmenu_i18n
 Source: COPYING.txt; DestDir: {app}; DestName: Copying.txt
 Source: icons\thg_logo.ico; DestDir: {app}
 Source: ..\misc\hgbook.pdf; DestDir: {app}/docs; Components: hgbook
 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: {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"; Components: shell; StatusMsg: Installing TortoiseOverlays.dll ...
 Filename: msiexec.exe; Parameters: "/i ""{app}\TortoiseOverlays\TortoiseOverlays-1.0.6.16523-x64.msi"" /qn /norestart ALLUSERS=1"; Check: Is64BitInstallMode; Components: shell; StatusMsg: Installing TortoiseOverlays.dll ...
 end;
 
 var IsUpgrade: Boolean;
-var SP1Missing: Boolean;
-
-function ShouldInstallVCPPSP1(): Boolean;
-begin
-    Result := SP1Missing;
-end;
 
 function InitializeSetup(): Boolean;
 var
     Result := False; {quit and abort installation}
   end;
  end;
-
- {Detect whether VC2005-SP1 Redistributable package is installed}
- if (not(RegValueExists(HKLM, 'SOFTWARE\Microsoft\NET Framework Setup\NDP\v2.0.50727', 'SP'))) then
-    SP1Missing := True;
 end;
 
 var UserInfoPage: TInputQueryWizardPage;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.