Menu
▾
▴
[popfile-commit] windows MonitorCC.nsi, 1.19.4.8, 1.19.4.9 pfi-languages.nsh, 1.2.6.6, 1.2.6.7 runpopfile.nsi, 1.11.4.8, 1.11.4.9 runsqlite.nsi, 1.1.4.7, 1.1.4.8 stop_popfile.nsi, 1.14.4.8, 1.14.4.9
|
From: Brian S. <xue...@us...> - 2008-04-02 20:17:34
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25905 Modified Files: Tag: b0_22_2 MonitorCC.nsi pfi-languages.nsh runpopfile.nsi runsqlite.nsi stop_popfile.nsi Log Message: Updated to work with current NSIS compiler (v2.36) Index: stop_popfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v retrieving revision 1.14.4.8 retrieving revision 1.14.4.9 diff -C2 -d -r1.14.4.8 -r1.14.4.9 *** stop_popfile.nsi 5 Oct 2007 18:39:25 -0000 1.14.4.8 --- stop_popfile.nsi 2 Apr 2008 20:17:33 -0000 1.14.4.9 *************** *** 3,7 **** # stop_popfile.nsi --- A simple 'command-line' utility to shutdown POPFile silently. # ! # Copyright (c) 2003-2007 John Graham-Cumming # # This file is part of POPFile --- 3,7 ---- # stop_popfile.nsi --- A simple 'command-line' utility to shutdown POPFile silently. # ! # Copyright (c) 2003-2008 John Graham-Cumming # # This file is part of POPFile *************** *** 82,97 **** #------------------------------------------------------------------------------------------- ! ; 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***\ --- 82,99 ---- #------------------------------------------------------------------------------------------- ! ; 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***\ *************** *** 101,104 **** --- 103,107 ---- !undef ${NSIS_VERSION}_found + !undef C_EXPECTED_VERSION ;-------------------------------------------------------------------------- *************** *** 123,127 **** Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.6.6" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" --- 126,130 ---- Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.6.7" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" Index: runpopfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v retrieving revision 1.11.4.8 retrieving revision 1.11.4.9 diff -C2 -d -r1.11.4.8 -r1.11.4.9 *** runpopfile.nsi 5 May 2007 12:28:07 -0000 1.11.4.8 --- runpopfile.nsi 2 Apr 2008 20:17:33 -0000 1.11.4.9 *************** *** 11,15 **** # mode is selected in 'popfile.cfg'. # ! # Copyright (c) 2004-2007 John Graham-Cumming # # This file is part of POPFile --- 11,15 ---- # mode is selected in 'popfile.cfg'. # ! # Copyright (c) 2004-2008 John Graham-Cumming # # This file is part of POPFile *************** *** 29,44 **** #------------------------------------------------------------------------------------------- ! ; 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***\ --- 29,46 ---- #------------------------------------------------------------------------------------------- ! ; 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***\ *************** *** 48,51 **** --- 50,54 ---- !undef ${NSIS_VERSION}_found + !undef C_EXPECTED_VERSION #-------------------------------------------------------------------------- *************** *** 117,121 **** ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.7" !define C_OUTFILE "runpopfile.exe" --- 120,124 ---- ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.8" !define C_OUTFILE "runpopfile.exe" Index: pfi-languages.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-languages.nsh,v retrieving revision 1.2.6.6 retrieving revision 1.2.6.7 diff -C2 -d -r1.2.6.6 -r1.2.6.7 *** pfi-languages.nsh 5 Dec 2006 20:33:50 -0000 1.2.6.6 --- pfi-languages.nsh 2 Apr 2008 20:17:33 -0000 1.2.6.7 *************** *** 5,9 **** # utilities. This makes maintenance easier. # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile --- 5,9 ---- # utilities. This makes maintenance easier. # ! # Copyright (c) 2004-2008 John Graham-Cumming # # This file is part of POPFile *************** *** 38,42 **** # (1) an up-to-date main NSIS language file (${NSISDIR}\Contrib\Language files\*.nlf) # and ! # (2) an up-to-date NSIS MUI Language file (${NSISDIR}\Contrib\Modern UI\Language files\*.nsh) # # To add support for a language which is already supported by the NSIS MUI package, an extra --- 38,42 ---- # (1) an up-to-date main NSIS language file (${NSISDIR}\Contrib\Language files\*.nlf) # and ! # (2) an up-to-date NSIS MUI Language file (${NSISDIR}\Contrib\Language files\*.nsh) # # To add support for a language which is already supported by the NSIS MUI package, an extra *************** *** 51,55 **** # # If there is a suitable POPFile UI language file for the new language, some changes will be ! # required to the code in 'adduser.nsi' which attempts to select an appropriate UI language. #-------------------------------------------------------------------------- # USAGE EXAMPLES --- 51,56 ---- # # If there is a suitable POPFile UI language file for the new language, some changes will be ! # required to the code in 'adduser.nsi' which attempts to select an appropriate UI language ! # (see "Section "-Languages" SecLangs" in adduser.nsi). #-------------------------------------------------------------------------- # USAGE EXAMPLES *************** *** 91,102 **** ; selection menu (NB we override the normal "Japanese" menu entry with "Nihongo" here) ! ; Currently a subset of the languages supported by NSIS MUI 1.75 (using the NSIS names) ! ; NSIS 2.0 compiler messages use language ID codes when referring to problems with ! ; language strings, e.g. ! ; ! ; LangString "PFI_LANG_NSISDL_PLURAL" is not set in language table of language 1041 ! ; ! ; NSIS 2.08 (or later) compiler messages usually mention names instead of ID codes, e.g. ; ; LangString "PFI_LANG_NSISDL_PLURAL" is not set in language table of language Japanese --- 92,99 ---- ; selection menu (NB we override the normal "Japanese" menu entry with "Nihongo" here) ! ; Currently a subset of the languages supported by NSIS MUI 1.8 (using the NSIS names) ! ; NSIS 2.08 (or later) compiler messages usually use language names when referring to problems ! ; with language strings, e.g. ; ; LangString "PFI_LANG_NSISDL_PLURAL" is not set in language table of language Japanese Index: runsqlite.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v retrieving revision 1.1.4.7 retrieving revision 1.1.4.8 diff -C2 -d -r1.1.4.7 -r1.1.4.8 *** runsqlite.nsi 5 May 2007 12:28:07 -0000 1.1.4.7 --- runsqlite.nsi 2 Apr 2008 20:17:33 -0000 1.1.4.8 *************** *** 10,14 **** # utility is used to access the specified SQLite database file. # ! # Copyright (c) 2004-2007 John Graham-Cumming # # This file is part of POPFile --- 10,14 ---- # utility is used to access the specified SQLite database file. # ! # Copyright (c) 2004-2008 John Graham-Cumming # # This file is part of POPFile *************** *** 39,54 **** #------------------------------------------------------------------------------------------- ! ; 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***\ --- 39,56 ---- #------------------------------------------------------------------------------------------- ! ; 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***\ *************** *** 58,61 **** --- 60,64 ---- !undef ${NSIS_VERSION}_found + !undef C_EXPECTED_VERSION ;-------------------------------------------------------------------------- *************** *** 75,79 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.5" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" --- 78,82 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.6" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" Index: MonitorCC.nsi =================================================================== RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v retrieving revision 1.19.4.8 retrieving revision 1.19.4.9 diff -C2 -d -r1.19.4.8 -r1.19.4.9 *** MonitorCC.nsi 21 Sep 2007 01:13:42 -0000 1.19.4.8 --- MonitorCC.nsi 2 Apr 2008 20:17:33 -0000 1.19.4.9 *************** *** 5,9 **** # needs to be converted to the new SQL database format. # ! # Copyright (c) 2004-2007 John Graham-Cumming # # This file is part of POPFile --- 5,9 ---- # needs to be converted to the new SQL database format. # ! # Copyright (c) 2004-2008 John Graham-Cumming # # This file is part of POPFile *************** *** 24,39 **** #-------------------------------------------------------------------------- ! ; 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***\ --- 24,41 ---- #-------------------------------------------------------------------------- ! ; 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***\ *************** *** 43,46 **** --- 45,49 ---- !undef ${NSIS_VERSION}_found + !undef C_EXPECTED_VERSION #-------------------------------------------------------------------------- *************** *** 111,115 **** Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.7" !define C_OUTFILE "monitorcc.exe" --- 114,118 ---- Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.8" !define C_OUTFILE "monitorcc.exe" |
