Mercurial > forge

changeset 3667:7f5a849e00e6 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow silent execution of single-package installers
author goffioul
date Wed, 18 Jul 2007 15:44:22 +0000
parents 7edd4e6b07b9
children 98ad3c86c490
files admin/Windows/msvc/octave_package.nsi.in
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/admin/Windows/msvc/octave_package.nsi.in	Wed Jul 18 15:32:53 2007 +0000
+++ b/admin/Windows/msvc/octave_package.nsi.in	Wed Jul 18 15:44:22 2007 +0000
@@ -74,6 +74,7 @@
   FileWrite $0 " "
   FileClose $0
 rebuild:
+  IfSilent +2
   ExecWait '"$OCTAVE_EXEC" -qf --eval "pkg rebuild ${PACKAGE_NAME}"'
 SectionEnd
 
@@ -102,6 +103,7 @@
 !macroend
 
 Function .onInit
+  IfSilent endinit
   ReadRegStr $INSTDIR ${PRODUCT_ROOT_KEY} "${PRODUCT_DIR_REGKEY}" Path
   StrCmp $INSTDIR "" 0 octave_present
   !insertmacro MissingComponent "Octave ${OCTAVE_VERSION}"
@@ -258,7 +260,9 @@
   Exch $0
   Push $2
   Push $3
+  IfSilent dep_ok
   FindFirst $2 $3 "$INSTDIR\share\octave\packages\$0-*"
+  FindClose $2
   StrCmp $3 "" dep_not_ok
   StrCmp $1 "" dep_ok
   ${WordFind} "$3" "-" "-1" $3
@@ -288,7 +292,6 @@
 dep_ok:
   StrCpy $1 1
 done:
-  FindClose $2
   Pop $3
   Pop $2
   Pop $0