Menu
▾
▴
[popfile-commit] windows dbicapture.nsi, 1.1.2.5, 1.1.2.6 msgcapture.nsi, 1.7.4.7, 1.7.4.8
|
From: Brian S. <xue...@us...> - 2008-04-02 20:12:31
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24311 Modified Files: Tag: b0_22_2 dbicapture.nsi msgcapture.nsi Log Message: Updated to work with current NSIS compiler (v2.36). Simplify the code by using the new $EXEFILE constant. Index: msgcapture.nsi =================================================================== RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v retrieving revision 1.7.4.7 retrieving revision 1.7.4.8 diff -C2 -d -r1.7.4.7 -r1.7.4.8 *** msgcapture.nsi 5 May 2007 12:28:07 -0000 1.7.4.7 --- msgcapture.nsi 2 Apr 2008 20:12:36 -0000 1.7.4.8 *************** *** 7,11 **** # used by earlier installers it caused confusion amongst some users). # ! # Copyright (c) 2004-2007 John Graham-Cumming # # This file is part of POPFile --- 7,11 ---- # used by earlier installers it caused confusion amongst some users). # ! # Copyright (c) 2004-2008 John Graham-Cumming # # This file is part of POPFile *************** *** 26,41 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.22" compiler, ! ; released 27 November 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.22-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.22_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.22 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 26,43 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found ! !ifndef ${C_EXPECTED_VERSION}_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS ${C_EXPECTED_VERSION} compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 45,48 **** --- 47,51 ---- !undef ${NSIS_VERSION}_found + !undef C_EXPECTED_VERSION #-------------------------------------------------------------------------- *************** *** 115,119 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.6" !define C_OUTFILE "msgcapture.exe" --- 118,122 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.7" !define C_OUTFILE "msgcapture.exe" *************** *** 293,297 **** !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_CLICKCANCEL" "Please click 'Cancel' to continue with the installation" ! !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_MBOPTIONERROR" "'$G_TIMEOUT' is not a valid option for this utility${MB_NL}${MB_NL}Usage: $R1 /TIMEOUT=x${MB_NL}where x is in the range 0 to 99 and specifies the timeout in seconds${MB_NL}${MB_NL}(use 0 to make the utility wait for POPFile to exit)" #-------------------------------------------------------------------------- --- 296,302 ---- !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_CLICKCANCEL" "Please click 'Cancel' to continue with the installation" ! ; This utility's executable file might have been renamed so we need to ensure we use the correct name in the 'usage' message. ! ! !insertmacro PFI_MSGCAP_TEXT "PFI_LANG_MSGCAP_MBOPTIONERROR" "'$G_TIMEOUT' is not a valid option for this utility${MB_NL}${MB_NL}Usage: $EXEFILE /TIMEOUT=x${MB_NL}where x is in the range 0 to 99 and specifies the timeout in seconds${MB_NL}${MB_NL}(use 0 to make the utility wait for POPFile to exit)" #-------------------------------------------------------------------------- *************** *** 342,355 **** usage_error: - - ; This utility is sometimes renamed as 'pfimsgcapture.exe' so we need - ; to ensure we use the correct name in the 'usage' message. The first - ; system call gets the full pathname (returned in $R0) and the second call - ; extracts the filename (and possibly the extension) part (returned in $R1) - - ; No need to worry about corrupting $R0 and $R1 (we abort after displaying the message) - - System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024)' - System::Call 'comdlg32::GetFileTitleA(t R0, t .R1, i 1024)' MessageBox MB_OK|MB_ICONSTOP "$(PFI_LANG_MSGCAP_MBOPTIONERROR)" Abort --- 347,350 ---- Index: dbicapture.nsi =================================================================== RCS file: /cvsroot/popfile/windows/Attic/dbicapture.nsi,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** dbicapture.nsi 13 Feb 2008 22:50:46 -0000 1.1.2.5 --- dbicapture.nsi 2 Apr 2008 20:12:36 -0000 1.1.2.6 *************** *** 25,40 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.22" compiler, ! ; released 27 November 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.22-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.22_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.22 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 25,42 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.36" compiler, ! ; released 29 March 2008. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.36-setup.exe?download ! ! !define C_EXPECTED_VERSION "v2.36" !define ${NSIS_VERSION}_found ! !ifndef ${C_EXPECTED_VERSION}_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS ${C_EXPECTED_VERSION} compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 44,47 **** --- 46,50 ---- !undef ${NSIS_VERSION}_found + !undef C_EXPECTED_VERSION ; Although this utility was originally created for use with the 1.0.0 release it is *************** *** 86,90 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.5" !define C_OUTFILE "dbicapture.exe" --- 89,93 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.6" !define C_OUTFILE "dbicapture.exe" *************** *** 114,117 **** --- 117,121 ---- ; Avoid compiler warnings by disabling the functions and definitions we do not use + ; (this is a modified version of the Message Capture utility so we re-use MSGCAPTURE here) !define MSGCAPTURE *************** *** 281,285 **** !insertmacro PFI_DBICAP_TEXT "PFI_LANG_DBICAP_RIGHTCLICK" "Right-click in the window below to copy the report to the clipboard" ! !insertmacro PFI_DBICAP_TEXT "PFI_LANG_DBICAP_MBOPTIONERROR" "'$G_TRACELEVEL' is not a valid option for this utility${MB_NL}${MB_NL}Usage: $R1 /TRACE_LEVEL=x${MB_NL}where x is in the range 0 to 15${MB_NL}${MB_NL}(use 0 to disable database tracing)" !insertmacro PFI_DBICAP_TEXT "PFI_LANG_DBICAP_STARTBUTTON" "Start" --- 285,291 ---- !insertmacro PFI_DBICAP_TEXT "PFI_LANG_DBICAP_RIGHTCLICK" "Right-click in the window below to copy the report to the clipboard" ! ; This utility's executable file might have been renamed so we need to ensure we use the correct name in the 'usage' message. ! ! !insertmacro PFI_DBICAP_TEXT "PFI_LANG_DBICAP_MBOPTIONERROR" "'$G_TRACELEVEL' is not a valid option for this utility${MB_NL}${MB_NL}Usage: $EXEFILE /TRACE_LEVEL=x${MB_NL}where x is in the range 0 to 15${MB_NL}${MB_NL}(use 0 to disable database tracing)" !insertmacro PFI_DBICAP_TEXT "PFI_LANG_DBICAP_STARTBUTTON" "Start" *************** *** 336,349 **** usage_error: - - ; This utility's executable file might have been renamed so we need - ; to ensure we use the correct name in the 'usage' message. The first - ; system call gets the full pathname (returned in $R0) and the second call - ; extracts the filename (and possibly the extension) part (returned in $R1) - - ; No need to worry about corrupting $R0 and $R1 (we abort after displaying the message) - - System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024)' - System::Call 'comdlg32::GetFileTitleA(t R0, t .R1, i 1024)' MessageBox MB_OK|MB_ICONSTOP "$(PFI_LANG_DBICAP_MBOPTIONERROR)" Abort --- 342,345 ---- |
