[GRASS-SVN] r70106 - grass/trunk/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-12-20 14:03:52 -0800 (Tue, 20 Dec 2016)
New Revision: 70106

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
Log:
wingrass: attempt to fix standalone installer to download and execute vcredist exe files

Modified: grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2016-12-20 22:03:29 UTC (rev 70105)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2016-12-20 22:03:52 UTC (rev 70106)
@@ -802,12 +802,25 @@
 	SetShellVarContext current	
 	InitPluginsDir
 	NSISdl::download "$HTTP_PATH/$ARCHIVE_NAME" "$TEMP\$ARCHIVE_NAME"
+        !if ${PLATFORM} == "x86"
+            NSISdl::download "$HTTP_PATH/msvcrt2005/$ARCHIVE_NAME2005" "$TEMP\$ARCHIVE_NAME2005"
+        !endif
+	NSISdl::download "$HTTP_PATH/msvcrt2008/$ARCHIVE_NAME2008" "$TEMP\$ARCHIVE_NAME2008"
+	NSISdl::download "$HTTP_PATH/msvcrt2010/$ARCHIVE_NAME2010" "$TEMP\$ARCHIVE_NAME2010"
+	NSISdl::download "$HTTP_PATH/msvcrt2013/$ARCHIVE_NAME2013" "$TEMP\$ARCHIVE_NAME2013"
+
 	Pop $0
 	StrCmp $0 "success" download_ok download_failed
 		
 	download_ok:	
 	InitPluginsDir
 	untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME"
+        !if ${PLATFORM} == "x86"
+            untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME2005"
+        !endif
+        untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME2008"
+        untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME2010"
+        untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME2013"
 	Pop $0
 	StrCmp $0 "success" untar_ok untar_failed
 	
@@ -825,12 +838,23 @@
 
 	untar_ok:
 	DetailPrint "Archive successfully unzipped."
-	DetailPrint "Installing vcredist_2005_x86.exe ..."
-	ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2005_x86.exe" /q'
-	DetailPrint "Installing vcredist_2008_x86.exe ..."
-	ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2008_x86.exe" /q'	
-	DetailPrint "Installing vcredist_2010_x86.exe ..."
-	ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2010_x86.exe" /q'
+        !if ${PLATFORM} == "x86"     
+	    DetailPrint "Installing vcredist_2005_x86.exe ..."
+	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2005_x86.exe" /q'
+            DetailPrint "Installing vcredist_2008_x86.exe ..."
+	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2008_x86.exe" /q'	
+	    DetailPrint "Installing vcredist_2010_x86.exe ..."
+	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2010_x86.exe" /q' 
+	    DetailPrint "Installing vcredist_2013_x86.exe ..."
+	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2010_x86.exe" /q'
+        !else
+            DetailPrint "Installing vcredist_2008_x64.exe ..."
+	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist-2008-sp1-x64.exe" /q'
+	    DetailPrint "Installing vcredist_2010_x64.exe ..."
+	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist-2010-x64.exe" /q' 
+	    DetailPrint "Installing vcredist_2013_x64.exe ..."
+	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist-2013-x64.exe" /q'
+        !endif
 	DetailPrint "Copying runtime files ..."
 	CopyFiles "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\*.dll" "$INSTALL_DIR\extrabin"
 	DetailPrint "MS runtime files installed."
@@ -843,7 +867,7 @@
 Section "Important Microsoft Runtime DLLs" SecMSRuntime
 
 	;Set the size (in KB)  of the archive file
-	StrCpy $ARCHIVE_SIZE_KB 12521
+	StrCpy $ARCHIVE_SIZE_KB 18512
 	
 	;Set the size (in KB) of the unpacked archive file
 	AddSize 13500
@@ -851,8 +875,15 @@
 	StrCpy $HTTP_PATH "http://download.osgeo.org/osgeo4w/${PLATFORM}/release/msvcrt/"
         !if ${PLATFORM} == "x86_64"
             StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-8.tar.bz2"
+            StrCpy $ARCHIVE_NAME2008 "msvcrt2008-1.0.0-1.tar.bz2"
+            StrCpy $ARCHIVE_NAME2010 "msvcrt2010-1.0.0-1.tar.bz2"
+            StrCpy $ARCHIVE_NAME2013 "msvcrt2013-1.0.0-1.tar.bz2"
         !else
-            StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-12.tar.bz2"
+            StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-13.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"
         !endif
 	StrCpy $EXTENDED_ARCHIVE_NAME "Microsoft Visual C++ Redistributable Packages"
 	StrCpy $ORIGINAL_UNTAR_FOLDER "install_msruntime"
@@ -882,6 +913,7 @@
 	SetShellVarContext current	
 	InitPluginsDir
 	NSISdl::download "$HTTP_PATH/$ARCHIVE_NAME" "$TEMP\$ARCHIVE_NAME"
+
 	Pop $0
 	StrCmp $0 "success" download_ok download_failed