[GRASS-SVN] r71469 - grass/branches/releasebranch_7_2/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2017-09-06 00:18:13 -0700 (Wed, 06 Sep 2017)
New Revision: 71469

Modified:
   grass/branches/releasebranch_7_2/mswindows/GRASS-Installer.nsi.tmpl
Log:
WinGRASS: add msvcrt2015 as dependency (merge r71468 from trunk)

Modified: grass/branches/releasebranch_7_2/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_7_2/mswindows/GRASS-Installer.nsi.tmpl	2017-09-06 07:17:19 UTC (rev 71468)
+++ grass/branches/releasebranch_7_2/mswindows/GRASS-Installer.nsi.tmpl	2017-09-06 07:18:13 UTC (rev 71469)
@@ -497,6 +497,7 @@
     Var /GLOBAL ARCHIVE_NAME2012
 !endif
 Var /GLOBAL ARCHIVE_NAME2013
+Var /GLOBAL ARCHIVE_NAME2015
 Var /GLOBAL EXTENDED_ARCHIVE_NAME
 Var /GLOBAL ORIGINAL_UNTAR_FOLDER
 Var /GLOBAL CUSTOM_UNTAR_FOLDER
@@ -818,6 +819,7 @@
             NSISdl::download "$HTTP_PATH/msvcrt2012/$ARCHIVE_NAME2012" "$TEMP\$ARCHIVE_NAME2012"
         !endif
 	NSISdl::download "$HTTP_PATH/msvcrt2013/$ARCHIVE_NAME2013" "$TEMP\$ARCHIVE_NAME2013"
+	NSISdl::download "$HTTP_PATH/msvcrt2015/$ARCHIVE_NAME2015" "$TEMP\$ARCHIVE_NAME2015"
 
 	Pop $0
 	StrCmp $0 "success" download_ok download_failed
@@ -834,6 +836,7 @@
             untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME2012"
         !endif
         untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME2013"
+        untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME2015"
 	Pop $0
 	StrCmp $0 "success" untar_ok untar_failed
 	
@@ -861,6 +864,8 @@
 	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2010_x86.exe" /q' 
 	    DetailPrint "Installing vcredist_2013_x86.exe ..."
 	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2013_x86.exe" /q'
+	    DetailPrint "Installing vcredist_2015_x86.exe ..."
+	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2015_x86.exe" /q'
         !else
             DetailPrint "Installing vcredist_2008_x64.exe ..."
 	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist-2008-sp1-x64.exe" /q'
@@ -871,6 +876,8 @@
 	    ;ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist-2012-x64.exe" /q' 
 	    DetailPrint "Installing vcredist_2013_x64.exe ..."
 	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist-2013-x64.exe" /q'
+	    DetailPrint "Installing vcredist_2015_x64.exe ..."
+	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2015_x64.exe" /q'
         !endif
 	DetailPrint "Copying runtime files ..."
 	CopyFiles "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\*.dll" "$INSTALL_DIR\extrabin"
@@ -896,12 +903,14 @@
             StrCpy $ARCHIVE_NAME2010 "msvcrt2010-1.0.0-1.tar.bz2"
             StrCpy $ARCHIVE_NAME2012 "msvcrt2012-1.0.0-1.tar.bz2"
             StrCpy $ARCHIVE_NAME2013 "msvcrt2013-1.0.0-1.tar.bz2"
+            StrCpy $ARCHIVE_NAME2015 "msvcrt2015-1.0.0-1.tar.bz2"
         !else
             StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-14.tar.bz2"
             ;StrCpy $ARCHIVE_NAME2005 "msvcrt2005-1.0-1.tar.bz2"
             StrCpy $ARCHIVE_NAME2008 "msvcrt2008-1.0-1.tar.bz2"
             StrCpy $ARCHIVE_NAME2010 "msvcrt2010-1.0-1.tar.bz2"
             StrCpy $ARCHIVE_NAME2013 "msvcrt2013-1.0-1.tar.bz2"
+            StrCpy $ARCHIVE_NAME2013 "msvcrt2015-1.0-1.tar.bz2"
         !endif
 	StrCpy $EXTENDED_ARCHIVE_NAME "Microsoft Visual C++ Redistributable Packages"
 	StrCpy $ORIGINAL_UNTAR_FOLDER "install_msruntime"