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

[svn_grass at osgeo.org]

Author: hellik
Date: 2013-04-16 03:54:03 -0700 (Tue, 16 Apr 2013)
New Revision: 55831

Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
Log:
improved try to fix #1428

Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2013-04-16 10:34:37 UTC (rev 55830)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2013-04-16 10:54:03 UTC (rev 55831)
@@ -984,11 +984,10 @@
 	StrCmp $0 "success" untar_ok untar_failed
 	
 	untar_ok:
-	; execute also vcredist_2005_x86.exe ?
-	Exec  "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2005_x86.exe"
-	; execute also vcredist_2008_x86.exe ?	
-	Exec  "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2008_x86.exe"	
-	Exec  "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2010_x86.exe"
+	Exec  "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2005_x86.exe /q"
+	Exec  "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2008_x86.exe /q"	
+	Exec  "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2010_x86.exe /q"
+	CopyFiles "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\*.dll" "$INSTDIR\extralib"
 	Delete "$TEMP\$ARCHIVE_NAME"
 	Delete "$TEMP\$ORIGINAL_UNTAR_FOLDER"
 	Goto end