installer: install the required MS VC++ runtime files beside the pyth…

…on installation (see takluyver/pynsist/pull/87)
beardypig · Dec 7, 2016 · 7a50314 · 7a50314
1 parent dd74260
commit 7a50314
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/docs/install.rst b/docs/install.rst
@@ -176,6 +176,11 @@ instead.
 Windows binaries
 ----------------
 
+.. important::
+
+    Windows XP is not supported.
+    Windows Vista requires at least SP2 to be installed. 
+
 You can download the latest stable Windows installer `here <https://github.com/streamlink/streamlink/releases>`_.
 
 You can download the latest nightly Windows installer `here <https://streamlink-builds.s3.amazonaws.com/nightly/windows/streamlink-latest.exe>`_.

diff --git a/script/makeinstaller.sh b/script/makeinstaller.sh
@@ -91,6 +91,14 @@ cat >"${build_dir}/installer_tmpl.nsi" <<EOF
 [% block install_files %]
     [[ super() ]]
 
+    ; Install MSVCRT if it's not already on the system
+    IfFileExists "\$SYSDIR\ucrtbase.dll" skip_msvcrt
+    SetOutPath \$INSTDIR\Python
+    [% for file in ib.msvcrt_files %]
+    File msvcrt\[[file]]
+    [% endfor %]
+    skip_msvcrt:
+
     ; Install config file
     SetShellVarContext current # install the config file for the current user
     SetOverwrite off # config file we don't want to overwrite