Update of /cvsroot/popfile/windows/add-ons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29590
Modified Files:
addssl.nsi
Log Message:
Script now issues a warning if used with a compiler which has not been
tested yet. Sometimes compilers fail to compile scripts developed with
older versions and even if the script can be compiled the installer's
behaviour may differ significantly.
Library items now use the "PFI_" prefix to help identify them.
Index: addssl.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** addssl.nsi 10 Feb 2005 23:04:56 -0000 1.7
--- addssl.nsi 2 Mar 2005 20:03:17 -0000 1.8
***************
*** 33,38 ****
#--------------------------------------------------------------------------
! ; This version of the script has been tested with the "NSIS 2" compiler (final),
! ; released 7 February 2004, with no "official" NSIS patches applied.
;------------------------------------------------
--- 33,55 ----
#--------------------------------------------------------------------------
! ; This version of the script has been tested with the "NSIS 2.0" compiler (final),
! ; released 7 February 2004, with no "official" NSIS patches applied. This compiler
! ; can be downloaded from http://prdownloads.sourceforge.net/nsis/nsis20.exe?download
!
! !define ${NSIS_VERSION}_found
!
! !ifndef v2.0_found
! !warning \
! "$\r$\n\
! $\r$\n*** NSIS COMPILER WARNING:\
! $\r$\n***\
! $\r$\n*** This script has only been tested using the NSIS 2.0 compiler\
! $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\
! $\r$\n***\
! $\r$\n*** The resulting 'installer' program should be tested carefully!\
! $\r$\n$\r$\n"
! !endif
!
! !undef ${NSIS_VERSION}_found
;------------------------------------------------
***************
*** 109,113 ****
Name "POPFile SSL Setup"
! !define C_PFI_VERSION "0.0.14"
; Mention the wizard's version number in the window title
--- 126,130 ----
Name "POPFile SSL Setup"
! !define C_PFI_VERSION "0.0.15"
; Mention the wizard's version number in the window title
***************
*** 517,521 ****
StrCmp $G_PLS_FIELD_1 "No suitable patches were found" close_log
StrCmp $G_PLS_FIELD_1 "OK" 0 show_status
! !insertmacro BACKUP_123_DP "$G_ROOTDIR\POPFile" "Module.pm"
SetDetailsPrint none
Rename "$PLUGINSDIR\Module.ssl" "$G_ROOTDIR\POPFile\Module.pm"
--- 534,538 ----
StrCmp $G_PLS_FIELD_1 "No suitable patches were found" close_log
StrCmp $G_PLS_FIELD_1 "OK" 0 show_status
! !insertmacro PFI_BACKUP_123_DP "$G_ROOTDIR\POPFile" "Module.pm"
SetDetailsPrint none
Rename "$PLUGINSDIR\Module.ssl" "$G_ROOTDIR\POPFile\Module.pm"
***************
*** 528,532 ****
SetDetailsPrint listonly
DetailPrint ""
! Call GetDateTimeStamp
Pop $G_PLS_FIELD_1
DetailPrint "----------------------------------------------------"
--- 545,549 ----
SetDetailsPrint listonly
DetailPrint ""
! Call PFI_GetDateTimeStamp
Pop $G_PLS_FIELD_1
DetailPrint "----------------------------------------------------"
***************
*** 548,552 ****
SetDetailsPrint listonly
DetailPrint ""
! Call GetDateTimeStamp
Pop $G_PLS_FIELD_1
DetailPrint "----------------------------------------------------"
--- 565,569 ----
SetDetailsPrint listonly
DetailPrint ""
! Call PFI_GetDateTimeStamp
Pop $G_PLS_FIELD_1
DetailPrint "----------------------------------------------------"
***************
*** 560,566 ****
DetailPrint "$(PFI_LANG_PROG_SAVELOG)"
SetDetailsPrint none
! !insertmacro BACKUP_123 "$G_ROOTDIR" "addssl.log"
Push "$G_ROOTDIR\addssl.log"
! Call DumpLog
SetDetailsPrint both
--- 577,583 ----
DetailPrint "$(PFI_LANG_PROG_SAVELOG)"
SetDetailsPrint none
! !insertmacro PFI_BACKUP_123 "$G_ROOTDIR" "addssl.log"
Push "$G_ROOTDIR\addssl.log"
! Call PFI_DumpLog
SetDetailsPrint both
***************
*** 668,672 ****
Push "POPFile"
! Call ServiceRunning
Pop ${L_RESULT}
StrCmp ${L_RESULT} "true" manual_shutdown
--- 685,689 ----
Push "POPFile"
! Call PFI_ServiceRunning
Pop ${L_RESULT}
StrCmp ${L_RESULT} "true" manual_shutdown
***************
*** 681,685 ****
Push $G_ROOTDIR
! Call FindLockedPFE
Pop ${L_EXE}
StrCmp ${L_EXE} "" exit
--- 698,702 ----
Push $G_ROOTDIR
! Call PFI_FindLockedPFE
Pop ${L_EXE}
StrCmp ${L_EXE} "" exit
***************
*** 733,737 ****
Push ${L_NEW_GUI}
! Call TrimNewlines
Pop ${L_NEW_GUI}
--- 750,754 ----
Push ${L_NEW_GUI}
! Call PFI_TrimNewlines
Pop ${L_NEW_GUI}
***************
*** 740,744 ****
DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)"
Push ${L_NEW_GUI}
! Call ShutdownViaUI
Pop ${L_RESULT}
StrCmp ${L_RESULT} "success" check_exe
--- 757,761 ----
DetailPrint "$(PFI_LANG_TAKE_A_FEW_SECONDS)"
Push ${L_NEW_GUI}
! Call PFI_ShutdownViaUI
Pop ${L_RESULT}
StrCmp ${L_RESULT} "success" check_exe
***************
*** 749,756 ****
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_now
--- 766,773 ----
DetailPrint "Please be patient, this may take more than 30 seconds"
Push ${L_EXE}
! Call PFI_WaitUntilUnlocked
DetailPrint "Checking if '${L_EXE}' is still locked after NSISdl request..."
Push ${L_EXE}
! Call PFI_CheckIfLocked
Pop ${L_EXE}
StrCmp ${L_EXE} "" unlocked_now
|
