Merge pull request #2108 from lfdversluis/builder-add-redists

Builder add redists and ignore dlls so they are not shipped but installed.
Tribler · Apr 29, 2016 · 89bebb7 · 89bebb7
2 parents 02bd47f + fd71ad5
commit 89bebb7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/Tribler/Main/Build/Win/setuptribler.py b/Tribler/Main/Build/Win/setuptribler.py
@@ -67,8 +67,10 @@
                         "optimize": 2,
                         "skip_archive": True,
                         "dist_dir": os.path.join("dist", "installdir"),
-                        "dll_excludes": ["mswsock.dll", "MSVCR90.dll", "msvcr71.dll",
-                                         "IPHLPAPI.dll", "NSI.dll", "WINNSI.dll", "WTSAPI32.dll"]
+                        "dll_excludes": ["mswsock.dll", "MSVCR90.dll", "MSVCP90.dll",
+                                         "msvcr71.dll", "msvcp71.dll", "MSVCR100.dll", "MSVCP100.dll",
+                                         "MSVCR110.dll", "MSVCP110.dll", "IPHLPAPI.dll", "NSI.dll",
+                                         "WINNSI.dll", "WTSAPI32.dll"]
                        }
             },
     data_files=[(".", [r"C:\build\libsodium.dll"])],

diff --git a/Tribler/Main/Build/Win/tribler.nsi b/Tribler/Main/Build/Win/tribler.nsi
@@ -177,10 +177,20 @@ Section "!Main EXE" SecMain
  File Tribler\Core\DecentralizedTracking\pymdht\core\bootstrap_stable
  File Tribler\Core\DecentralizedTracking\pymdht\core\bootstrap_unstable
 
- ; Install MSVCR 2010
+ ; Install MSVCR 2008, 2010, 2012
  SetOutPath "$INSTDIR"
- File vc_redist.exe
- ExecWait "$INSTDIR\vc_redist.exe /q /norestart"
+
+ ; Libraries dependant on 2008 are: Python, APSW
+ File vc_redist_90.exe
+ ExecWait "$INSTDIR\vc_redist_90.exe /q /norestart"
+
+ ; Libraries dependant on 2010 are:M2Crypto, netifaces
+ File vc_redist_100.exe
+ ExecWait "$INSTDIR\vc_redist_100.exe /q /norestart"
+
+ ; Libraries dependant on 2012 are: LevelDB, LibTorrent
+ File vc_redist_110.exe
+ ExecWait "$INSTDIR\vc_redist_110.exe /q /norestart"
 
 FileOpen $9 "$INSTDIR\tribler.exe.log" w
 FileWrite $9 ""

diff --git a/win/makedist_win.bat b/win/makedist_win.bat
@@ -140,7 +140,10 @@ copy vlc.py dist\installdir\vlc.py
 mkdir dist\installdir\tools
 copy win\tools\reset*.bat dist\installdir\tools
 
-copy C:\build\vc_redist.exe dist\installdir
+REM Laurens, 2016-04-20: Copy the redistributables of 2008, 2010 and 2012 to the install dir
+copy C:\build\vc_redist_90.exe dist\installdir
+copy C:\build\vc_redist_100.exe dist\installdir
+copy C:\build\vc_redist_110.exe dist\installdir
 
 REM MainClient specific