[GRASS-SVN] r62106 - grass/branches/releasebranch_7_0/mswindows

[svn_grass at osgeo.org]

Author: hellik
Date: 2014-09-27 00:57:05 -0700 (Sat, 27 Sep 2014)
New Revision: 62106

Modified:
   grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl
Log:
nsis: attempt to fix optional MS runtime installation (merge from trunk: r62082)

Modified: grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl	2014-09-27 03:10:02 UTC (rev 62105)
+++ grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl	2014-09-27 07:57:05 UTC (rev 62106)
@@ -931,14 +931,6 @@
 	untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME"
 	Pop $0
 	StrCmp $0 "success" untar_ok untar_failed
-
-	;move ExecWait, CopyFiles, Delete, RMDir commands out of the download function as these seems not to work if these are nested in a function
-	untar_ok:
-	ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2005_x86.exe" /q'
-	ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2008_x86.exe" /q'	
-	ExecWait '"$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2010_x86.exe" /q'
-	CopyFiles "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\*.dll" "$INSTALL_DIR\extrabin"
-	Goto end
 	
 	download_failed:
 	DetailPrint "$0" ;print error message to log
@@ -951,6 +943,19 @@
 	
 	untar_failed:
 	DetailPrint "$0" ;print error message to log
+
+	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'
+	DetailPrint "Copying runtime files ..."
+	CopyFiles "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\*.dll" "$INSTALL_DIR\extrabin"
+	DetailPrint "MS runtime files installed."
+	Goto end
 	
 	end: