[GRASS-SVN] r62108 - grass/branches/develbranch_6/mswindows

[svn_grass at osgeo.org]

Author: hellik
Date: 2014-09-27 01:06:30 -0700 (Sat, 27 Sep 2014)
New Revision: 62108

Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
Log:
nsis: fix installing MS runtimes (merge from relbranch6: r62107)

Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2014-09-27 08:03:44 UTC (rev 62107)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2014-09-27 08:06:30 UTC (rev 62108)
@@ -918,17 +918,6 @@
 	Pop $0
 	StrCmp $0 "success" untar_ok untar_failed
 	
-	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"
-	Delete "$TEMP\$ARCHIVE_NAME"
-	RMDir /r "$TEMP\$ORIGINAL_UNTAR_FOLDER"
-	;the following doesn't work. Maybe because the installer is still running?
-	RMDir "$TEMP\$ORIGINAL_UNTAR_FOLDER"
-	Goto end
-	
 	download_failed:
 	DetailPrint "$0" ;print error message to log
 	MessageBox MB_OK "Download Failed.$\r$\nGRASS will be installed without the $EXTENDED_ARCHIVE_NAME."
@@ -940,6 +929,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:
 
@@ -1050,7 +1052,18 @@
 SectionEnd
 
 ;--------------------------------------------------------------------------
+;Clean downloaded MS runtime files  by .onInstSuccess
 
+Function .onInstSuccess
+	${If} ${SectionIsSelected} ${SecMSRuntime}
+		Delete "$TEMP\$ARCHIVE_NAME"
+		RMDir /r "$TEMP\$ORIGINAL_UNTAR_FOLDER"
+		RMDir "$TEMP\$ORIGINAL_UNTAR_FOLDER"	
+	${EndIf}
+FunctionEnd
+
+;--------------------------------------------------------------------------
+
 ;Uninstaller Section
 
 Section "Uninstall"