Menu
▾
▴
[popfile-commit] windows installer.nsi,1.139,1.140
|
From: <xue...@us...> - 2003-10-16 14:30:03
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv15250
Modified Files:
installer.nsi
Log Message:
Shutdown debug messages added immediately before the files get installed. Hopefully these will show where the problem lies?
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** installer.nsi 15 Oct 2003 20:40:12 -0000 1.139
--- installer.nsi 16 Oct 2003 13:41:09 -0000 1.140
***************
*** 286,292 ****
!define MUI_FINISHPAGE_SHOWREADME_FUNCTION "ShowReadMe"
! ; Debug aid: Allow log file checking (by clicking "Show Details" button on the "Install" page)
! # !define MUI_FINISHPAGE_NOAUTOCLOSE
;-----------------------------------------
--- 286,293 ----
!define MUI_FINISHPAGE_SHOWREADME_FUNCTION "ShowReadMe"
! ; Debug aid: Display the log during the installation and wait for user to click 'Next' at end
! ShowInstDetails show
! !define MUI_FINISHPAGE_NOAUTOCLOSE
;-----------------------------------------
***************
*** 850,854 ****
; Remove redundant links (used by earlier versions of POPFile)
!
Delete "$SMSTARTUP\Run POPFile in background.lnk"
Delete "$SMPROGRAMS\${MUI_PRODUCT}\Run POPFile in background.lnk"
--- 851,855 ----
; Remove redundant links (used by earlier versions of POPFile)
!
Delete "$SMSTARTUP\Run POPFile in background.lnk"
Delete "$SMPROGRAMS\${MUI_PRODUCT}\Run POPFile in background.lnk"
***************
*** 1221,1224 ****
--- 1222,1227 ----
; Earlier versions of POPFile (up to and including 0.19.1) may be using wperl.exe or perl.exe.
+ DetailPrint "Checking $INSTDIR\popfileb.exe"
+
Push "$INSTDIR\popfileb.exe"
Call CheckIfLocked
***************
*** 1226,1229 ****
--- 1229,1234 ----
StrCmp ${L_EXE} "" 0 attempt_shutdown
+ DetailPrint "Checking $INSTDIR\popfileib.exe"
+
Push "$INSTDIR\popfileib.exe"
Call CheckIfLocked
***************
*** 1231,1234 ****
--- 1236,1241 ----
StrCmp ${L_EXE} "" 0 attempt_shutdown
+ DetailPrint "Checking $INSTDIR\popfilef.exe"
+
Push "$INSTDIR\popfilef.exe"
Call CheckIfLocked
***************
*** 1236,1239 ****
--- 1243,1248 ----
StrCmp ${L_EXE} "" 0 attempt_shutdown
+ DetailPrint "Checking $INSTDIR\popfileif.exe"
+
Push "$INSTDIR\popfileif.exe"
Call CheckIfLocked
***************
*** 1241,1244 ****
--- 1250,1255 ----
StrCmp ${L_EXE} "" 0 attempt_shutdown
+ DetailPrint "Checking $INSTDIR\wperl.exe"
+
Push "$INSTDIR\wperl.exe"
Call CheckIfLocked
***************
*** 1246,1249 ****
--- 1257,1262 ----
StrCmp ${L_EXE} "" 0 attempt_shutdown
+ DetailPrint "Checking $INSTDIR\perl.exe"
+
Push "$INSTDIR\perl.exe"
Call CheckIfLocked
***************
*** 1260,1264 ****
StrCmp ${L_OLD_GUI} "" try_other_port
! DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_OLD_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT}
--- 1273,1277 ----
StrCmp ${L_OLD_GUI} "" try_other_port
! DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_OLD_GUI} [old style port]"
NSISdl::download_quiet http://127.0.0.1:${L_OLD_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT}
***************
*** 1271,1281 ****
StrCmp ${L_NEW_GUI} "" check_exe
! DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_NEW_GUI}"
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Ignore the result
check_exe:
Push ${L_EXE}
Call WaitUntilUnlocked
exit_now:
--- 1284,1357 ----
StrCmp ${L_NEW_GUI} "" check_exe
! DetailPrint "$(PFI_LANG_INST_LOG_1) ${L_NEW_GUI} [new style port]"
NSISdl::download_quiet http://127.0.0.1:${L_NEW_GUI}/shutdown "$PLUGINSDIR\shutdown.htm"
Pop ${L_RESULT} ; Ignore the result
check_exe:
+ DetailPrint "Waiting for '${L_EXE}' to unlock after NSISdl request..."
+ DetailPrint "Please be patient, this may take more than 30 seconds"
+ Push ${L_EXE}
+ Call WaitUntilUnlocked
+ DetailPrint "Checking if '${L_EXE}' is still locked after NSISdl request..."
+ Push ${L_EXE}
+ Call CheckIfLocked
+ Pop ${L_EXE}
+ StrCmp ${L_EXE} "" unlocked_exit
+
+ StrCmp ${L_OLD_GUI} "" try_new_style
+
+ DetailPrint "Trying browser request for ${L_OLD_GUI} [old style port]"
+ ClearErrors
+ ExecShell "open" "http://127.0.0.1:${L_OLD_GUI}/shutdown"
+ IfErrors 0 old_ok
+ DetailPrint "ExecShell error detected"
+
+ old_ok:
+ DetailPrint "Waiting for 5 seconds..."
+ Sleep 5000
+ BringToFront
+ DetailPrint "Waiting for '${L_EXE}' to unlock after browser request..."
+ DetailPrint "Please be patient, this may take more than 30 seconds"
Push ${L_EXE}
Call WaitUntilUnlocked
+ DetailPrint "Checking if '${L_EXE}' is still locked after browser request..."
+ Push ${L_EXE}
+ Call CheckIfLocked
+ Pop ${L_EXE}
+ StrCmp ${L_EXE} "" unlocked_exit
+
+ try_new_style:
+ StrCmp ${L_NEW_GUI} "" manual_shutdown_required
+ DetailPrint "Trying browser request for ${L_NEW_GUI} [new style port]"
+ ClearErrors
+ ExecShell "open" "http://127.0.0.1:${L_NEW_GUI}/shutdown"
+ IfErrors 0 new_ok
+ DetailPrint "ExecShell error detected"
+
+ new_ok:
+ DetailPrint "Waiting for 5 seconds..."
+ Sleep 5000
+ BringToFront
+ DetailPrint "Waiting for '${L_EXE}' to unlock after browser request..."
+ DetailPrint "Please be patient, this may take more than 30 seconds"
+ Push ${L_EXE}
+ Call WaitUntilUnlocked
+ DetailPrint "Checking if '${L_EXE}' is still locked after browser request..."
+ Push ${L_EXE}
+ Call CheckIfLocked
+ Pop ${L_EXE}
+ StrCmp ${L_EXE} "" unlocked_exit
+
+ manual_shutdown_required:
+ DetailPrint "Unable to shutdown automatically - manual intervention requested"
+ MessageBox MB_OK|MB_TOPMOST "Unable to shutdown POPFile automatically.\
+ $\r$\n$\r$\n\
+ Please shutdown POPFile manually now.\
+ $\r$\n$\r$\n\
+ When POPFile has been shutdown, click 'OK' to continue."
+ Goto exit_now
+
+ unlocked_exit:
+ DetailPrint "File is now unlocked"
exit_now:
***************
*** 2240,2243 ****
--- 2316,2320 ----
StrCmp ${L_TEMP} "console" exit_without_banner
StrCmp ${L_TEMP} "no" lastaction_console
+ StrCmp ${L_TEMP} "" lastaction_console
StrCpy ${L_EXE} "$INSTDIR\popfile${L_TRAY}b.exe"
***************
*** 2251,2254 ****
--- 2328,2332 ----
StrCmp ${L_TEMP} "background" exit_without_banner
StrCmp ${L_TEMP} "no" lastaction_background
+ StrCmp ${L_TEMP} "" lastaction_background
StrCpy ${L_EXE} "$INSTDIR\popfile${L_TRAY}f.exe"
***************
*** 2280,2284 ****
Click 'OK' when the 'POPFile Engine v0.20.0 running' message appears."
Goto exit_without_banner
!
continue:
--- 2358,2362 ----
Click 'OK' when the 'POPFile Engine v0.20.0 running' message appears."
Goto exit_without_banner
!
continue:
|
