[xiph-commits] r15132 - in trunk/oggdsf/build/NSIS/Release: . extra

[cristianadam at svn.xiph.org]

Author: cristianadam
Date: 2008-07-24 12:20:23 -0700 (Thu, 24 Jul 2008)
New Revision: 15132

Modified:
   trunk/oggdsf/build/NSIS/Release/extra/DumpLog.nsh
   trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi
Log:
Fixed Ticket #1404 (Installer doesn't respect the silent command line parameter)

Modified: trunk/oggdsf/build/NSIS/Release/extra/DumpLog.nsh
===================================================================
--- trunk/oggdsf/build/NSIS/Release/extra/DumpLog.nsh	2008-07-24 14:01:54 UTC (rev 15131)
+++ trunk/oggdsf/build/NSIS/Release/extra/DumpLog.nsh	2008-07-24 19:20:23 UTC (rev 15132)
@@ -34,7 +34,7 @@
       System::Free $3
       Goto exit
   error:
-    MessageBox MB_OK error
+    MessageBox MB_OK|MB_ICONSTOP "Error at DumpLog"
   exit:
     Pop $6
     Pop $4

Modified: trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi
===================================================================
--- trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi	2008-07-24 14:01:54 UTC (rev 15131)
+++ trunk/oggdsf/build/NSIS/Release/oggcodecs_release.nsi	2008-07-24 19:20:23 UTC (rev 15132)
@@ -159,6 +159,7 @@
   ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString"
   StrCmp $R0 "" done
  
+  IfSilent +3
   MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the existing version or `Cancel` to cancel this installation." IDOK uninst
   Abort
 
@@ -168,8 +169,13 @@
   ; Copy the uninstaller to a temp location
   GetTempFileName $0
   CopyFiles $R0 $0
+ 
   ;Start the uninstaller using the option to not copy itself
+  IfSilent 0 +3
+  ExecWait '$0 /S /FromInstaller _?=$INSTDIR'
+  Goto AfterSilent 
   ExecWait '$0 /FromInstaller _?=$INSTDIR'
+AfterSilent:
  
   IfErrors no_remove_uninstaller
     ; In most cases the uninstall is successful at this point.
@@ -178,9 +184,9 @@
     ; components page, make sure all sections are uninstalled.
     goto done
   no_remove_uninstaller:
+    IfSilent +4
     MessageBox MB_ICONEXCLAMATION \
     "Unable to remove previous version of ${PRODUCT_NAME}"
-    
     Abort
   
 done:
@@ -327,10 +333,11 @@
   
   ;!insertmacro RegisterCOM "bin\dsfAnxDemux.dll" $INSTDIR\dsfAnxDemux.dll $INSTDIR
   !insertmacro RegisterCOM "bin\dsfAnxMux.dll"  $INSTDIR\dsfAnxMux.dll $INSTDIR\
-                                  
+
+  IfSilent +3
   Push $INSTDIR\Install.log
   Call DumpLog
-  
+
   SetDetailsPrint textonly
   DetailPrint "Writing Registry Entries ..."
   SetDetailsPrint listonly
@@ -763,6 +770,7 @@
   goto done_wmp
   
 fail_wmp:
+  IfSilent +2
   MessageBox MB_OK|MB_ICONEXCLAMATION "A recognised version of Windows Media Player was not found. $\n File extenstion association must be done manually." IDOK done_wmp
 
 done_wmp:
@@ -838,6 +846,7 @@
   StrCpy $option_runFromInstaller 	1
   Pop $R0
     
+  IfSilent +4
   StrCmp $option_runFromInstaller "0" 0 +3
   MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
   Abort
@@ -847,6 +856,7 @@
 Function un.onUninstSuccess
 
 ;  HideWindow
+  IfSilent +3
   StrCmp $option_runFromInstaller "0" 0 +2
   MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
 FunctionEnd