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

[svn_grass at osgeo.org]

Author: martinl
Date: 2016-12-21 10:35:04 -0800 (Wed, 21 Dec 2016)
New Revision: 70114

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
Log:
wingrass: attempt to fix standalone installer to download and execute vcredist - cleanup dependencies (see #2996)

Modified: grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2016-12-21 16:22:54 UTC (rev 70113)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2016-12-21 18:35:04 UTC (rev 70114)
@@ -490,9 +490,10 @@
 ;Declares the variables for optional Sample Data Sections
 Var /GLOBAL HTTP_PATH
 Var /GLOBAL ARCHIVE_NAME
-Var /GLOBAL ARCHIVE_NAME2005
+;Var /GLOBAL ARCHIVE_NAME2005
 Var /GLOBAL ARCHIVE_NAME2008
 Var /GLOBAL ARCHIVE_NAME2010
+Var /GLOBAL ARCHIVE_NAME2012
 Var /GLOBAL ARCHIVE_NAME2013
 Var /GLOBAL EXTENDED_ARCHIVE_NAME
 Var /GLOBAL ORIGINAL_UNTAR_FOLDER
@@ -806,11 +807,14 @@
 	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
+        ;!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"
+        !if ${PLATFORM} == "x86_64"
+            NSISdl::download "$HTTP_PATH/msvcrt2012/$ARCHIVE_NAME2012" "$TEMP\$ARCHIVE_NAME2012"
+        !endif
 	NSISdl::download "$HTTP_PATH/msvcrt2013/$ARCHIVE_NAME2013" "$TEMP\$ARCHIVE_NAME2013"
 
 	Pop $0
@@ -819,11 +823,14 @@
 	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
+        ;!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"
+        !if ${PLATFORM} == "x86_64"
+            untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME2012"
+        !endif
         untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME2013"
 	Pop $0
 	StrCmp $0 "success" untar_ok untar_failed
@@ -843,8 +850,9 @@
 	untar_ok:
 	DetailPrint "Archive successfully unzipped."
         !if ${PLATFORM} == "x86"     
-	    DetailPrint "Installing vcredist_2005_x86.exe ..."
-	    ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2005_x86.exe" /q'
+            ; seems to be not needed, see #2996
+            ;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 ..."
@@ -856,6 +864,9 @@
 	    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' 
+            ; msvcrt2012 package contains dll files
+	    ;DetailPrint "Installing vcredist_2012_x64.exe ..."
+	    ;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'
         !endif
@@ -881,10 +892,11 @@
             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_NAME2012 "msvcrt2012-1.0.0-1.tar.bz2"
             StrCpy $ARCHIVE_NAME2013 "msvcrt2013-1.0.0-1.tar.bz2"
         !else
             StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-13.tar.bz2"
-            StrCpy $ARCHIVE_NAME2005 "msvcrt2005-1.0-1.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"