[popfile-commit] windows msgcapture.nsi,1.10,1.11 runpopfile.nsi,1.12,1.13 runsqlite.nsi,1.2,1.3 sto

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28598

Modified Files:
	msgcapture.nsi runpopfile.nsi runsqlite.nsi stop_popfile.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: stop_popfile.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** stop_popfile.nsi	8 Jan 2005 14:49:05 -0000	1.15
--- stop_popfile.nsi	2 Mar 2005 20:01:32 -0000	1.16
***************
*** 82,87 ****
  # The '/WAIT' parameter is important, otherwise the 'failed' case will not be detected.
  #-------------------------------------------------------------------------------------------
! #  This version was tested using "NSIS 2 Release Candidate 2" released 5 January 2004
! #-------------------------------------------------------------------------------------------

    ;--------------------------------------------------------------------------
--- 82,105 ----
  # The '/WAIT' parameter is important, otherwise the 'failed' case will not be detected.
  #-------------------------------------------------------------------------------------------
! 
!   ; 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

    ;--------------------------------------------------------------------------
***************
*** 106,110 ****
    Caption "POPFile Silent Shutdown Utility"

!   !define C_VERSION     "0.5.10"       ; see 'VIProductVersion' comment below for format details

    !define C_OUTFILE     "stop_pf.exe"
--- 124,128 ----
    Caption "POPFile Silent Shutdown Utility"

!   !define C_VERSION     "0.5.11"     ; see 'VIProductVersion' comment below for format details

    !define C_OUTFILE     "stop_pf.exe"
***************
*** 182,186 ****
    ; It does not matter if the first command-line parameter uses uppercase or lowercase

!   Call GetParameters
    Pop ${L_PARAMS}
    StrCmp ${L_PARAMS} "" usage
--- 200,204 ----
    ; It does not matter if the first command-line parameter uses uppercase or lowercase

!   Call PFI_GetParameters
    Pop ${L_PARAMS}
    StrCmp ${L_PARAMS} "" usage
***************
*** 199,203 ****
    StrCpy ${L_TEMP} ${L_RESULT} 1
    Push ${L_TEMP}
!   Call StrCheckDecimal
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" 0 port_checks
--- 217,221 ----
    StrCpy ${L_TEMP} ${L_RESULT} 1
    Push ${L_TEMP}
!   Call PFI_StrCheckDecimal
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" 0 port_checks
***************
*** 211,215 ****
  usage:
    MessageBox MB_OK "POPFile Silent Shutdown Utility v${C_VERSION}            \
!     Copyright (c) 2004  John Graham-Cumming\
      ${MB_NL}${MB_NL}\
      This command-line utility shuts POPFile down silently, without opening a browser window.\
--- 229,233 ----
  usage:
    MessageBox MB_OK "POPFile Silent Shutdown Utility v${C_VERSION}            \
!     Copyright (c) 2005  John Graham-Cumming\
      ${MB_NL}${MB_NL}\
      This command-line utility shuts POPFile down silently, without opening a browser window.\
***************
*** 259,263 ****
    StrCmp ${L_RESULT} "" no_port_supplied
    Push ${L_RESULT}
!   Call StrCheckDecimal
    Pop ${L_GUI}
    StrCmp ${L_GUI} "" integer_error
--- 277,281 ----
    StrCmp ${L_RESULT} "" no_port_supplied
    Push ${L_RESULT}
!   Call PFI_StrCheckDecimal
    Pop ${L_GUI}
    StrCmp ${L_GUI} "" integer_error
***************
*** 298,302 ****
    StrCmp ${L_RESULT} "success" 0 password_ok
    Push "$PLUGINSDIR\shutdown_2.htm"
!   Call GetFileSize
    Pop ${L_RESULT}
    StrCmp ${L_RESULT} 0 password_ok
--- 316,320 ----
    StrCmp ${L_RESULT} "success" 0 password_ok
    Push "$PLUGINSDIR\shutdown_2.htm"
!   Call PFI_GetFileSize
    Pop ${L_RESULT}
    StrCmp ${L_RESULT} 0 password_ok
***************
*** 339,343 ****
    StrCmp ${L_RESULT} "success" 0 shutdown_ok
    Push "$PLUGINSDIR\shutdown_2.htm"
!   Call GetFileSize
    Pop ${L_RESULT}
    StrCmp ${L_RESULT} 0 shutdown_ok
--- 357,361 ----
    StrCmp ${L_RESULT} "success" 0 shutdown_ok
    Push "$PLUGINSDIR\shutdown_2.htm"
!   Call PFI_GetFileSize
    Pop ${L_RESULT}
    StrCmp ${L_RESULT} 0 shutdown_ok

Index: runpopfile.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** runpopfile.nsi	8 Jan 2005 14:49:05 -0000	1.12
--- runpopfile.nsi	2 Mar 2005 20:01:32 -0000	1.13
***************
*** 29,36 ****
  #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  #-------------------------------------------------------------------------------------------
! #
! # This version of the script has been tested with the "NSIS 2" compiler (final),
! # released 7 February 2004, with no "official" NSIS patches/CVS updates applied.
! #
  #--------------------------------------------------------------------------
  # Optional run-time command-line switches (used by 'runpopfile.exe')
--- 29,53 ----
  #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  #-------------------------------------------------------------------------------------------
! 
!   ; 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
! 
  #--------------------------------------------------------------------------
  # Optional run-time command-line switches (used by 'runpopfile.exe')
***************
*** 90,94 ****
    ;--------------------------------------------------------------------------

!   !define C_PFI_VERSION   "0.1.14"

    !define C_OUTFILE       "runpopfile.exe"
--- 107,111 ----
    ;--------------------------------------------------------------------------

!   !define C_PFI_VERSION   "0.1.15"

    !define C_OUTFILE       "runpopfile.exe"
***************
*** 197,201 ****

  found_popfile:
!   Call GetParameters
    Pop ${L_PARAMS}
    StrCmp ${L_PARAMS} "" use_reg_dirdata
--- 214,218 ----

  found_popfile:
!   Call PFI_GetParameters
    Pop ${L_PARAMS}
    StrCmp ${L_PARAMS} "" use_reg_dirdata
***************
*** 230,234 ****
    Push ${L_EXEFILE}
    Push ${L_PARAMS}
!   Call GetDataPath
    Pop ${L_PFI_USER}
    IfFileExists "${L_PFI_USER}\popfile.cfg" config_found
--- 247,251 ----
    Push ${L_EXEFILE}
    Push ${L_PARAMS}
!   Call PFI_GetDataPath
    Pop ${L_PFI_USER}
    IfFileExists "${L_PFI_USER}\popfile.cfg" config_found
***************
*** 271,275 ****
    Push ${L_PFI_USER}
    Push ' '
!   Call StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" config_is_valid
--- 288,292 ----
    Push ${L_PFI_USER}
    Push ' '
!   Call PFI_StrStr
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" config_is_valid

Index: msgcapture.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** msgcapture.nsi	18 Feb 2005 17:06:08 -0000	1.10
--- msgcapture.nsi	2 Mar 2005 20:01:32 -0000	1.11
***************
*** 27,32 ****
  #--------------------------------------------------------------------------

! ; This version of the script has been tested with the "NSIS 2" compiler (final),
! ; released 7 February 2004, with no "official" NSIS patches/CVS updates applied.

  #--------------------------------------------------------------------------
--- 27,49 ----
  #--------------------------------------------------------------------------

!   ; 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

  #--------------------------------------------------------------------------
***************
*** 94,98 ****
    ;--------------------------------------------------------------------------

!   !define C_VERSION             "0.0.60"

    !define C_OUTFILE             "msgcapture.exe"
--- 111,115 ----
    ;--------------------------------------------------------------------------

!   !define C_VERSION             "0.0.61"

    !define C_OUTFILE             "msgcapture.exe"
***************
*** 293,297 ****
    StrCpy $G_MODE_FLAG ""      ; select 'normal' mode by default

!   Call GetParameters
    Pop $G_TIMEOUT
    StrCmp $G_TIMEOUT "" default
--- 310,314 ----
    StrCpy $G_MODE_FLAG ""      ; select 'normal' mode by default

!   Call PFI_GetParameters
    Pop $G_TIMEOUT
    StrCmp $G_TIMEOUT "" default
***************
*** 301,305 ****
    StrCmp ${L_TEMP} "PFI" installer_mode
    Push ${L_TEMP}
!   Call StrCheckDecimal
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" usage_error
--- 318,322 ----
    StrCmp ${L_TEMP} "PFI" installer_mode
    Push ${L_TEMP}
!   Call PFI_StrCheckDecimal
    Pop ${L_TEMP}
    StrCmp ${L_TEMP} "" usage_error
***************
*** 452,456 ****
    DetailPrint "------------------------------------------------------------"

!   Call GetDateTimeStamp
    Pop ${L_TEMP}
    DetailPrint "(report started ${L_TEMP})"
--- 469,473 ----
    DetailPrint "------------------------------------------------------------"

!   Call PFI_GetDateTimeStamp
    Pop ${L_TEMP}
    DetailPrint "(report started ${L_TEMP})"
***************
*** 476,480 ****
    DetailPrint "Status code: ${L_RESULT}"

!   Call GetDateTimeStamp
    Pop ${L_TEMP}
    DetailPrint "------------------------------------------------------------"
--- 493,497 ----
    DetailPrint "Status code: ${L_RESULT}"

!   Call PFI_GetDateTimeStamp
    Pop ${L_TEMP}
    DetailPrint "------------------------------------------------------------"

Index: runsqlite.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** runsqlite.nsi	8 Jan 2005 14:49:05 -0000	1.2
--- runsqlite.nsi	2 Mar 2005 20:01:32 -0000	1.3
***************
*** 40,45 ****
  #-------------------------------------------------------------------------------------------

! ; This version of the script has been tested with the "NSIS 2" compiler (final),
! ; released 7 February 2004, with no "official" NSIS patches/CVS updates applied.

    ;--------------------------------------------------------------------------
--- 40,62 ----
  #-------------------------------------------------------------------------------------------

!   ; 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

    ;--------------------------------------------------------------------------
***************
*** 59,63 ****
    ;--------------------------------------------------------------------------

!   !define C_VERSION   "0.0.2"     ; see 'VIProductVersion' comment below for format details
    !define C_OUTFILE   "runsqlite.exe"

--- 76,80 ----
    ;--------------------------------------------------------------------------

!   !define C_VERSION   "0.0.3"     ; see 'VIProductVersion' comment below for format details
    !define C_OUTFILE   "runsqlite.exe"

***************
*** 156,160 ****
    SetOutPath "${L_TEMP}"

!   Call GetParameters
    Pop $G_DATABASE
    StrCmp $G_DATABASE "" no_file_supplied
--- 173,177 ----
    SetOutPath "${L_TEMP}"

!   Call PFI_GetParameters
    Pop $G_DATABASE
    StrCmp $G_DATABASE "" no_file_supplied
***************
*** 170,174 ****
  continue:
    Push $G_DATABASE
!   Call GetSQLiteFormat
    Pop $G_DBFORMAT
    StrCpy $G_SQLITEUTIL "sqlite.exe"
--- 187,191 ----
  continue:
    Push $G_DATABASE
!   Call PFI_GetSQLiteFormat
    Pop $G_DBFORMAT
    StrCpy $G_SQLITEUTIL "sqlite.exe"

[popfile-commit] windows msgcapture.nsi,1.10,1.11 runpopfile.nsi,1.12,1.13 runsqlite.nsi,1.2,1.3 sto

[popfile-commit] windows msgcapture.nsi,1.10,1.11 runpopfile.nsi,1.12,1.13 runsqlite.nsi,1.2,1.3 stop_popfile.nsi,1.15,1.16