[GRASS-SVN] r55877 - grass/branches/develbranch_6/mswindows
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Apr 18 01:00:09 PDT 2013
Author: hellik
Date: 2013-04-18 01:00:08 -0700 (Thu, 18 Apr 2013)
New Revision: 55877
Modified:
grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
Log:
avoid race condition during installation of MSVCRT
Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl 2013-04-18 07:00:21 UTC (rev 55876)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl 2013-04-18 08:00:08 UTC (rev 55877)
@@ -993,9 +993,9 @@
StrCmp $0 "success" untar_ok untar_failed
untar_ok:
- 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"
+ 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" "$INSTDIR\extralib"
Delete "$TEMP\$ARCHIVE_NAME"
Delete "$TEMP\$ORIGINAL_UNTAR_FOLDER"
More information about the grass-commit
mailing list