Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv17643
Modified Files:
installer.nsi
Log Message:
Make it easier to change the shutdown delay; use a longer delay to improve reliability.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** installer.nsi 22 Jul 2003 00:50:06 -0000 1.92
--- installer.nsi 23 Jul 2003 18:31:13 -0000 1.93
***************
*** 96,99 ****
--- 96,103 ----
!define C_PERL_DIR "C:\Perl"
+
+ ; Delay (in milliseconds) used after issuing a POPFile 'shutdown' request
+
+ !define C_SHUTDOWN_DELAY 1500
; Define PFI_VERBOSE to get more compiler output
***************
*** 887,891 ****
DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_OLD_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Sleep 250 ; milliseconds
Pop ${L_RESULT}
StrCmp ${L_RESULT} "success" exit_now
--- 891,895 ----
DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_OLD_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Sleep ${C_SHUTDOWN_DELAY}
Pop ${L_RESULT}
StrCmp ${L_RESULT} "success" exit_now
***************
*** 899,903 ****
DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_NEW_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Sleep 250 ; milliseconds
Pop ${L_RESULT} ; Ignore the result
--- 903,907 ----
DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_NEW_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
! Sleep ${C_SHUTDOWN_DELAY}
Pop ${L_RESULT} ; Ignore the result
***************
*** 1616,1620 ****
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep 250 ; milliseconds
goto exit_without_banner
--- 1620,1624 ----
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep ${C_SHUTDOWN_DELAY}
goto exit_without_banner
***************
*** 1639,1643 ****
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep 250 ; milliseconds
ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile.lnk"
--- 1643,1647 ----
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep ${C_SHUTDOWN_DELAY}
ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile.lnk"
***************
*** 1659,1663 ****
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep 250 ; milliseconds
ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile in background.lnk"
--- 1663,1667 ----
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Get the return value (and ignore it)
! Sleep ${C_SHUTDOWN_DELAY}
ExecShell "open" "$SMPROGRAMS\POPFile\Run POPFile in background.lnk"
***************
*** 1673,1677 ****
Pop ${L_RESULT} ; Did POPFile return an HTML page?
StrCmp ${L_RESULT} "success" remove_banner
! Sleep 250 ; milliseconds
IntOp ${L_TEMP} ${L_TEMP} - 1
IntCmp ${L_TEMP} 0 remove_banner remove_banner check_if_ready
--- 1677,1681 ----
Pop ${L_RESULT} ; Did POPFile return an HTML page?
StrCmp ${L_RESULT} "success" remove_banner
! Sleep 500 ; milliseconds
IntOp ${L_TEMP} ${L_TEMP} - 1
IntCmp ${L_TEMP} 0 remove_banner remove_banner check_if_ready
***************
*** 1891,1895 ****
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
! Sleep 250 ; milliseconds
Goto remove_shortcuts
--- 1895,1899 ----
NSISdl::download_quiet http://127.0.0.1:${G_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
! Sleep ${C_SHUTDOWN_DELAY}
Goto remove_shortcuts
***************
*** 1903,1907 ****
NSISdl::download_quiet http://127.0.0.1:${L_OLDUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
! Sleep 250 ; milliseconds
remove_shortcuts:
--- 1907,1911 ----
NSISdl::download_quiet http://127.0.0.1:${L_OLDUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_TEMP}
! Sleep ${C_SHUTDOWN_DELAY}
remove_shortcuts:
|
