Menu
▾
▴
popfile-commit — CVS commit list messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(160) |
Mar
(119) |
Apr
(111) |
May
(118) |
Jun
(101) |
Jul
(304) |
Aug
(113) |
Sep
(140) |
Oct
(137) |
Nov
(87) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(78) |
Feb
(125) |
Mar
(131) |
Apr
(59) |
May
(121) |
Jun
(166) |
Jul
(150) |
Aug
(137) |
Sep
(73) |
Oct
(58) |
Nov
(27) |
Dec
(60) |
| 2005 |
Jan
(131) |
Feb
(84) |
Mar
(36) |
Apr
(8) |
May
(28) |
Jun
(20) |
Jul
(10) |
Aug
(72) |
Sep
(76) |
Oct
(34) |
Nov
(3) |
Dec
(29) |
| 2006 |
Jan
(13) |
Feb
(92) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(17) |
Sep
(5) |
Oct
(2) |
Nov
(8) |
Dec
(12) |
| 2007 |
Jan
(28) |
Feb
(15) |
Mar
|
Apr
|
May
(8) |
Jun
(4) |
Jul
(5) |
Aug
(8) |
Sep
(20) |
Oct
(38) |
Nov
(65) |
Dec
(92) |
| 2008 |
Jan
(21) |
Feb
(56) |
Mar
(27) |
Apr
(174) |
May
(25) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Joseph C. <tex...@us...> - 2007-01-18 08:56:37
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12153 Modified Files: Tag: b0_22_2 view-page.thtml Log Message: Add UI for downloading plaintext message from Single Message View. Probably not final placement for 0.23. Index: view-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/view-page.thtml,v retrieving revision 1.9 retrieving revision 1.9.6.1 diff -C2 -d -r1.9 -r1.9.6.1 *** view-page.thtml 10 Aug 2004 01:53:25 -0000 1.9 --- view-page.thtml 18 Jan 2007 08:56:36 -0000 1.9.6.1 *************** *** 229,232 **** --- 229,236 ---- </td> <tr> + <td> + <a class="messageLink" href="/view?view=<TMPL_VAR NAME="View_This">&session=<TMPL_VAR NAME="Session_Key">&text=1"><TMPL_VAR NAME="Localize_View_DownloadMessage"></a> + </td> + <td class="openMessageCloser"> <a class="messageLink" href="/history?<TMPL_VAR NAME="View_All_Fields">"><span class="historyLabel"><TMPL_VAR NAME="Localize_Close"></span></a> |
|
From: Joseph C. <tex...@us...> - 2007-01-18 08:45:35
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8111 Modified Files: view-page.thtml Log Message: Add UI for downloading plaintext message from Single Message View. Probably not final placement for 0.23. Index: view-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/view-page.thtml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** view-page.thtml 20 Feb 2006 09:36:35 -0000 1.11 --- view-page.thtml 18 Jan 2007 08:45:33 -0000 1.12 *************** *** 228,231 **** --- 228,235 ---- </td> <tr> + <td> + <a class="messageLink" href="/view?view=<TMPL_VAR NAME="View_This">&session=<TMPL_VAR NAME="Session_Key">&text=1"><TMPL_VAR NAME="Localize_View_DownloadMessage"></a> + </td> + <td class="openMessageCloser"> <a class="messageLink" href="/history?<TMPL_VAR NAME="View_All_Fields">"><span class="historyLabel"><TMPL_VAR NAME="Localize_Close"></span></a> |
|
From: Joseph C. <tex...@us...> - 2007-01-18 08:44:56
|
Update of /cvsroot/popfile/engine/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7732 Modified Files: English-UK.msg English.msg Log Message: Add UI for downloading plaintext message from Single Message View. Probably not final placement for 0.23. Index: English-UK.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English-UK.msg,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** English-UK.msg 20 Feb 2006 02:08:27 -0000 1.11 --- English-UK.msg 18 Jan 2007 08:44:43 -0000 1.12 *************** *** 334,337 **** --- 334,338 ---- View_WordScores showing word scores View_Chart Decision Chart + View_DownloadMessage Download Message Windows_TrayIcon Show POPFile icon in Windows system tray? Index: English.msg =================================================================== RCS file: /cvsroot/popfile/engine/languages/English.msg,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** English.msg 29 Jul 2006 19:44:12 -0000 1.103 --- English.msg 18 Jan 2007 08:44:43 -0000 1.104 *************** *** 365,368 **** --- 365,369 ---- View_WordScores showing word scores View_Chart Decision Chart + View_DownloadMessage Download Message Windows_TrayIcon Show POPFile icon in Windows system tray? |
|
From: Joseph C. <tex...@us...> - 2007-01-17 03:16:26
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30051 Modified Files: Tag: b0_22_2 HTML.pm Log Message: Partial solution to RFE [ 1634827 ] Download Message from Detailed View. Appending &text=text to the Detailed Message View URL will output the message in plain text. Probably needs a UI link for 0.23, but unlikely for 0.22.x. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.311.4.8 retrieving revision 1.311.4.9 diff -C2 -d -r1.311.4.8 -r1.311.4.9 *** HTML.pm 16 Feb 2006 09:19:45 -0000 1.311.4.8 --- HTML.pm 17 Jan 2007 03:16:24 -0000 1.311.4.9 *************** *** 2573,2576 **** --- 2573,2583 ---- } + # Provide message in plain text for user download/recovery purposes. + + if ( defined( $self->{form_}{text} ) ) { + $self->http_file_( $client, $self->{history__}->get_slot_file( $self->{form_}{view} ), 'text/plain' ); + return 1; + } + # If a format change was requested for the word matrix, record it in the # configuration and in the classifier options. |
|
From: Joseph C. <tex...@us...> - 2007-01-17 03:16:15
|
Update of /cvsroot/popfile/engine/UI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30029 Modified Files: HTML.pm Log Message: Partial solution to RFE [ 1634827 ] Download Message from Detailed View. Appending &text=text to the Detailed Message View URL will output the message in plain text. Probably needs a UI link for 0.23, but unlikely for 0.22.x. Index: HTML.pm =================================================================== RCS file: /cvsroot/popfile/engine/UI/HTML.pm,v retrieving revision 1.372 retrieving revision 1.373 diff -C2 -d -r1.372 -r1.373 *** HTML.pm 20 Feb 2006 09:21:28 -0000 1.372 --- HTML.pm 17 Jan 2007 03:16:11 -0000 1.373 *************** *** 3174,3177 **** --- 3174,3184 ---- } + # Provide message in plain text for user download/recovery purposes. + + if ( defined( $self->{form_}{text} ) ) { + $self->http_file_( $client, $self->{history__}->get_slot_file( $self->{form_}{view} ), 'text/plain' ); + return 1; + } + # If a format change was requested for the word matrix, record it # in the configuration and in the classifier options. |
|
From: Brian S. <xue...@us...> - 2007-01-02 14:09:31
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15356 Modified Files: updateimap.nsi Log Message: Updated for the new "1 January 2007" version of the Inetc plugin. Index: updateimap.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/updateimap.nsi,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** updateimap.nsi 9 Nov 2006 19:15:09 -0000 1.7 --- updateimap.nsi 2 Jan 2007 14:09:30 -0000 1.8 *************** *** 8,12 **** # releases). # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile --- 8,12 ---- # releases). # ! # Copyright (c) 2004-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 27,42 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.21" compiler, ! ; released 20 October 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.21-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.21_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.21 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 27,42 ---- #-------------------------------------------------------------------------- ! ; 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***\ *************** *** 64,68 **** ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 24 September 2006 19:29:22 --- 64,68 ---- ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 1 January 2007 19:03:52 *************** *** 125,129 **** Name "POPFile IMAP Updater" ! !define C_PFI_VERSION "0.0.11" ; Mention the wizard's version number in the window title --- 125,129 ---- Name "POPFile IMAP Updater" ! !define C_PFI_VERSION "0.0.13" ; Mention the wizard's version number in the window title |
|
From: Brian S. <xue...@us...> - 2007-01-02 14:05:52
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14302 Modified Files: Tag: b0_22_2 getssl.nsh Log Message: Updated for the new "1 January 2007" version of the Inetc plugin. Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.10 retrieving revision 1.6.2.11 diff -C2 -d -r1.6.2.10 -r1.6.2.11 *** getssl.nsh 5 Dec 2006 23:15:54 -0000 1.6.2.10 --- getssl.nsh 2 Jan 2007 14:05:44 -0000 1.6.2.11 *************** *** 21,25 **** # utility will apply a patch to downgrade this to the compatible v0.97 version. # ! # Copyright (c) 2005-2006 John Graham-Cumming # # This file is part of POPFile --- 21,25 ---- # utility will apply a patch to downgrade this to the compatible v0.97 version. # ! # Copyright (c) 2005-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 57,61 **** ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 12 November 2006 15:32:16 ;------------------------------------------------ --- 57,61 ---- ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 1 January 2007 19:03:52 ;------------------------------------------------ *************** *** 466,470 **** DetailPrint "$(PFI_LANG_PROG_STARTDOWNLOAD)" ! ; The current version of the Inetc plugin (dated 8 September 2006) leaves the "Show Details" ; button in view so we temporarily disable it during the download to avoid a messy display ; (if the user has already clicked the button then they'll just need to put up with the mess) --- 466,470 ---- DetailPrint "$(PFI_LANG_PROG_STARTDOWNLOAD)" ! ; Unlike the NSISdl plugin shipped with NSIS, the Inetc plugin leaves the "Show Details" ; button in view so we temporarily disable it during the download to avoid a messy display ; (if the user has already clicked the button then they'll just need to put up with the mess) |
|
From: Brian S. <xue...@us...> - 2007-01-02 14:05:46
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14302/add-ons Modified Files: Tag: b0_22_2 addssl.nsi Log Message: Updated for the new "1 January 2007" version of the Inetc plugin. Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.3.4.6 retrieving revision 1.3.4.7 diff -C2 -d -r1.3.4.6 -r1.3.4.7 *** addssl.nsi 5 Dec 2006 20:33:50 -0000 1.3.4.6 --- addssl.nsi 2 Jan 2007 14:05:44 -0000 1.3.4.7 *************** *** 34,38 **** # installer download and install the same SSL support files. # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile --- 34,38 ---- # installer download and install the same SSL support files. # ! # Copyright (c) 2004-2007 John Graham-Cumming # # This file is part of POPFile *************** *** 87,91 **** ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 12 November 2006 15:32:16 ;------------------------------------------------ --- 87,91 ---- ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 1 January 2007 19:03:52 ;------------------------------------------------ *************** *** 230,234 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.4" ; Mention the wizard's version number in the window title --- 230,234 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.5" ; Mention the wizard's version number in the window title |
|
From: Brian S. <xue...@us...> - 2006-12-05 23:15:57
|
Update of /cvsroot/popfile/windows/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7056/test Modified Files: Tag: b0_22_2 pfidbstatus.nsi pfidiag.nsi Log Message: Updated for the current NSIS compiler (v2.22, released 27 Nov 2006) Index: pfidbstatus.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidbstatus.nsi,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -C2 -d -r1.3.2.4 -r1.3.2.5 *** pfidbstatus.nsi 29 Aug 2006 16:00:54 -0000 1.3.2.4 --- pfidbstatus.nsi 5 Dec 2006 23:15:55 -0000 1.3.2.5 *************** *** 30,45 **** #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 30,45 ---- #------------------------------------------------------------------------------------------- ! ; 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***\ *************** *** 157,161 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.0" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" --- 157,161 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.2" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "pfidbstatus.exe" Index: pfidiag.nsi =================================================================== RCS file: /cvsroot/popfile/windows/test/pfidiag.nsi,v retrieving revision 1.8.4.4 retrieving revision 1.8.4.5 diff -C2 -d -r1.8.4.4 -r1.8.4.5 *** pfidiag.nsi 29 Aug 2006 16:00:54 -0000 1.8.4.4 --- pfidiag.nsi 5 Dec 2006 23:15:55 -0000 1.8.4.5 *************** *** 24,39 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 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***\ *************** *** 104,108 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.0" !define C_OUTFILE "pfidiag.exe" --- 104,108 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.2" !define C_OUTFILE "pfidiag.exe" |
|
From: Brian S. <xue...@us...> - 2006-12-05 23:15:56
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7056 Modified Files: Tag: b0_22_2 getssl.nsh msgcapture.nsi runpopfile.nsi runsqlite.nsi stop_popfile.nsi Log Message: Updated for the current NSIS compiler (v2.22, released 27 Nov 2006) Index: stop_popfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v retrieving revision 1.14.4.4 retrieving revision 1.14.4.5 diff -C2 -d -r1.14.4.4 -r1.14.4.5 *** stop_popfile.nsi 29 Aug 2006 15:59:40 -0000 1.14.4.4 --- stop_popfile.nsi 5 Dec 2006 23:15:55 -0000 1.14.4.5 *************** *** 82,97 **** #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 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***\ *************** *** 123,127 **** Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.6.0" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" --- 123,127 ---- Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.6.2" ; 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.5 retrieving revision 1.11.4.6 diff -C2 -d -r1.11.4.5 -r1.11.4.6 *** runpopfile.nsi 28 Sep 2006 18:28:06 -0000 1.11.4.5 --- runpopfile.nsi 5 Dec 2006 23:15:55 -0000 1.11.4.6 *************** *** 29,44 **** #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 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***\ *************** *** 117,121 **** ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.1" !define C_OUTFILE "runpopfile.exe" --- 117,121 ---- ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.2.3" !define C_OUTFILE "runpopfile.exe" Index: msgcapture.nsi =================================================================== RCS file: /cvsroot/popfile/windows/msgcapture.nsi,v retrieving revision 1.7.4.4 retrieving revision 1.7.4.5 diff -C2 -d -r1.7.4.4 -r1.7.4.5 *** msgcapture.nsi 29 Aug 2006 15:59:40 -0000 1.7.4.4 --- msgcapture.nsi 5 Dec 2006 23:15:54 -0000 1.7.4.5 *************** *** 26,41 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 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***\ *************** *** 115,119 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.0" !define C_OUTFILE "msgcapture.exe" --- 115,119 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.2" !define C_OUTFILE "msgcapture.exe" Index: runsqlite.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -C2 -d -r1.1.4.4 -r1.1.4.5 *** runsqlite.nsi 29 Aug 2006 15:59:40 -0000 1.1.4.4 --- runsqlite.nsi 5 Dec 2006 23:15:55 -0000 1.1.4.5 *************** *** 39,54 **** #------------------------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 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***\ *************** *** 75,79 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.0" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" --- 75,79 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.1.2" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.9 retrieving revision 1.6.2.10 diff -C2 -d -r1.6.2.9 -r1.6.2.10 *** getssl.nsh 19 Nov 2006 20:35:50 -0000 1.6.2.9 --- getssl.nsh 5 Dec 2006 23:15:54 -0000 1.6.2.10 *************** *** 43,50 **** #-------------------------------------------------------------------------- - ; This version of the script has been tested with the "NSIS v2.21" compiler, - ; released 20 October 2006. This particular compiler can be downloaded from - ; http://prdownloads.sourceforge.net/nsis/nsis-2.21-setup.exe?download - ;------------------------------------------------ ; This script requires the 'Inetc' NSIS plugin --- 43,46 ---- |
|
From: Brian S. <xue...@us...> - 2006-12-05 23:13:22
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6702 Modified Files: Tag: b0_22_2 installer-SecMinPerl-body.nsh Log Message: Updated to work with ActivePerl 5.8.8 Build 819 Index: installer-SecMinPerl-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecMinPerl-body.nsh,v retrieving revision 1.2.2.5 retrieving revision 1.2.2.6 diff -C2 -d -r1.2.2.5 -r1.2.2.6 *** installer-SecMinPerl-body.nsh 6 Feb 2006 16:52:03 -0000 1.2.2.5 --- installer-SecMinPerl-body.nsh 5 Dec 2006 23:13:20 -0000 1.2.2.6 *************** *** 49,53 **** SetDetailsPrint listonly ! ; Install the minimal Perl "core" ; (extra Perl files are added by the "Kakasi", "SOCKS" & "XMLRPC" sections in installer.nsi) --- 49,53 ---- SetDetailsPrint listonly ! ; Install the minimal Perl "core" based upon ActivePerl 5.8.8 Build 819 ; (extra Perl files are added by the "Kakasi", "SOCKS" & "XMLRPC" sections in installer.nsi) *************** *** 107,111 **** SetOutPath "$G_MPLIBDIR\HTML" ! File "${C_PERL_DIR}\site\lib\HTML\Tagset.pm" File "${C_PERL_DIR}\site\lib\HTML\Template.pm" --- 107,111 ---- SetOutPath "$G_MPLIBDIR\HTML" ! File "${C_PERL_DIR}\lib\HTML\Tagset.pm" File "${C_PERL_DIR}\site\lib\HTML\Template.pm" *************** *** 182,205 **** File "${C_PERL_DIR}\lib\base.pm" File "${C_PERL_DIR}\lib\overload.pm" ! File "${C_PERL_DIR}\site\lib\DBI.pm" ; Required in order to use any version of SQLite SetOutPath "$G_MPLIBDIR\auto\DBI" ! File "${C_PERL_DIR}\site\lib\auto\DBI\DBI.bs" ! File "${C_PERL_DIR}\site\lib\auto\DBI\DBI.dll" ! File "${C_PERL_DIR}\site\lib\auto\DBI\DBI.exp" ! File "${C_PERL_DIR}\site\lib\auto\DBI\DBI.lib" ! ; Install SQLite support (using an old SQLite 2.x version of the SQLite module) SetOutPath "$G_MPLIBDIR\DBD" ! File "${C_PERL_DIR}\site\lib\DBD\SQLite.pm" ! SetOutPath "$G_MPLIBDIR\auto\DBD\SQLite" ! File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite\SQLite.bs" ! File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite\SQLite.dll" ! File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite\SQLite.exp" ! File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite\SQLite.lib" SetDetailsPrint textonly --- 182,208 ---- File "${C_PERL_DIR}\lib\base.pm" File "${C_PERL_DIR}\lib\overload.pm" ! File "${C_PERL_DIR}\lib\DBI.pm" ; Required in order to use any version of SQLite SetOutPath "$G_MPLIBDIR\auto\DBI" ! File "${C_PERL_DIR}\lib\auto\DBI\DBI.bs" ! File "${C_PERL_DIR}\lib\auto\DBI\DBI.dll" ! File "${C_PERL_DIR}\lib\auto\DBI\DBI.exp" ! File "${C_PERL_DIR}\lib\auto\DBI\DBI.lib" ! ; Install SQLite2 support. The 0.22.5 release is based upon ActivePerl 5.8.8 Build 819 ! ; which includes the 3.x flavour of the DBD::SQLite module so we now default to using ! ; DBD::SQLite2 since POPFile 0.22.x is not compatible with SQLite 3.x. The 0.23.0 release ! ; of POPFile ia expected to use SQLite 3.x. SetOutPath "$G_MPLIBDIR\DBD" ! File "${C_PERL_DIR}\site\lib\DBD\SQLite2.pm" ! SetOutPath "$G_MPLIBDIR\auto\DBD\SQLite2" ! File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite2\SQLite2.bs" ! File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite2\SQLite2.dll" ! File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite2\SQLite2.exp" ! File "${C_PERL_DIR}\site\lib\auto\DBD\SQLite2\SQLite2.lib" SetDetailsPrint textonly |
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12199 Modified Files: Tag: b0_22_2 adduser-Version.nsh adduser.nsi installer.nsi MonitorCC.nsi pfi-languages.nsh pfi-library.nsh Log Message: Avoid the need to patch the standard NSIS MUI Japanese language file in order to change the language selection menu entry from "Japanese" to "Nihongo". Index: installer.nsi =================================================================== RCS file: /cvsroot/popfile/windows/installer.nsi,v retrieving revision 1.242.4.6 retrieving revision 1.242.4.7 diff -C2 -d -r1.242.4.6 -r1.242.4.7 *** installer.nsi 29 Aug 2006 15:55:45 -0000 1.242.4.6 --- installer.nsi 5 Dec 2006 20:33:50 -0000 1.242.4.7 *************** *** 48,63 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 48,63 ---- #-------------------------------------------------------------------------- ! ; 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***\ *************** *** 72,79 **** ; These "PFI_LANG_NSISDL_PLURAL" warnings can be safely ignored (at present only the ; 'Japanese-pfi.nsh' file generates this warning). - ; - ; NOTE: The language selection menu order used in this script assumes that the NSIS MUI - ; 'Japanese.nsh' language file has been patched to use 'Nihongo' instead of 'Japanese' - ; [see 'SMALL NSIS PATCH REQUIRED' in the 'pfi-languages.nsh' file] ; INSTALLER SIZE: The LZMA compression method is used to reduce the size of the 'setup.exe' --- 72,75 ---- *************** *** 168,173 **** # (assuming that the default compression method is used). If the command-line switch # /DNO_KAKASI is used then a smaller installer can be built by omitting the Japanese support. - # - # SMALL NSIS PATCH REQUIRED: See 'pfi-languages.nsh' for details. #-------------------------------------------------------------------------- --- 164,167 ---- *************** *** 618,622 **** ; At least one language must be specified for the installer (the default is "English") ! !insertmacro PFI_LANG_LOAD "English" ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English' --- 612,616 ---- ; At least one language must be specified for the installer (the default is "English") ! !insertmacro PFI_LANG_LOAD "English" "-" ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English' *************** *** 677,684 **** --- 671,680 ---- ReserveFile "${NSISDIR}\Plugins\Banner.dll" ReserveFile "${NSISDIR}\Plugins\DumpLog.dll" + ReserveFile "${NSISDIR}\Plugins\inetc.dll" ReserveFile "${NSISDIR}\Plugins\NSISdl.dll" ReserveFile "${NSISDIR}\Plugins\System.dll" ReserveFile "${NSISDIR}\Plugins\untgz.dll" ReserveFile "${NSISDIR}\Plugins\UserInfo.dll" + ReserveFile "${NSISDIR}\Plugins\vpatch.dll" ReserveFile "ioG.ini" ReserveFile "${C_RELEASE_NOTES}" *************** *** 1203,1221 **** SetOutPath "$G_MPLIBDIR" ! File "${C_PERL_DIR}\site\lib\LWP.pm" File "${C_PERL_DIR}\lib\re.pm" ! File "${C_PERL_DIR}\site\lib\URI.pm" SetOutPath "$G_MPLIBDIR\HTTP" ! File /r "${C_PERL_DIR}\site\lib\HTTP\*" SetOutPath "$G_MPLIBDIR\LWP" ! File /r "${C_PERL_DIR}\site\lib\LWP\*" SetOutPath "$G_MPLIBDIR\Net" ! File "${C_PERL_DIR}\site\lib\Net\HTT*" SetOutPath "$G_MPLIBDIR\Net\HTTP" ! File "${C_PERL_DIR}\site\lib\Net\HTTP\*" SetOutPath "$G_MPLIBDIR\SOAP" --- 1199,1217 ---- SetOutPath "$G_MPLIBDIR" ! File "${C_PERL_DIR}\lib\LWP.pm" File "${C_PERL_DIR}\lib\re.pm" ! File "${C_PERL_DIR}\lib\URI.pm" SetOutPath "$G_MPLIBDIR\HTTP" ! File /r "${C_PERL_DIR}\lib\HTTP\*" SetOutPath "$G_MPLIBDIR\LWP" ! File /r "${C_PERL_DIR}\lib\LWP\*" SetOutPath "$G_MPLIBDIR\Net" ! File "${C_PERL_DIR}\lib\Net\HTT*" SetOutPath "$G_MPLIBDIR\Net\HTTP" ! File "${C_PERL_DIR}\lib\Net\HTTP\*" SetOutPath "$G_MPLIBDIR\SOAP" *************** *** 1226,1233 **** SetOutPath "$G_MPLIBDIR\URI" ! File /r "${C_PERL_DIR}\site\lib\URI\*" SetOutPath "$G_MPLIBDIR\XML" ! File /r "${C_PERL_DIR}\site\lib\XML\*" SetOutPath "$G_MPLIBDIR\XMLRPC" --- 1222,1229 ---- SetOutPath "$G_MPLIBDIR\URI" ! File /r "${C_PERL_DIR}\lib\URI\*" SetOutPath "$G_MPLIBDIR\XML" ! File /r "${C_PERL_DIR}\lib\XML\*" SetOutPath "$G_MPLIBDIR\XMLRPC" Index: pfi-languages.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-languages.nsh,v retrieving revision 1.2.6.5 retrieving revision 1.2.6.6 diff -C2 -d -r1.2.6.5 -r1.2.6.6 *** pfi-languages.nsh 29 Aug 2006 15:49:19 -0000 1.2.6.5 --- pfi-languages.nsh 5 Dec 2006 20:33:50 -0000 1.2.6.6 *************** *** 29,33 **** # For example, to remove support for the 'Dutch' language, comment-out the line # ! # !insertmacro PFI_LANG_LOAD "Dutch" # #-------------------------------------------------------------------------- --- 29,33 ---- # For example, to remove support for the 'Dutch' language, comment-out the line # ! # !insertmacro PFI_LANG_LOAD "Dutch" "-" ; Language 1043 # #-------------------------------------------------------------------------- *************** *** 53,76 **** # required to the code in 'adduser.nsi' which attempts to select an appropriate UI language. #-------------------------------------------------------------------------- - # SMALL NSIS PATCH REQUIRED: - # - # The POPFile User Interface 'Language' menu uses the name 'Nihongo' to select the Japanese - # language texts. The NSIS default name used to select the Japanese language texts is 'Japanese' - # which can cause some confusion. - # - # It is an easy matter to make the installer display 'Nihongo' in the list of languages offered. - # However this requires a small change to one of the NSIS MUI language files: - # - # In the file ${NSISDIR}\Contrib\Modern UI\Language files\Japanese.nsh, change the value of the - # MUI_LANGNAME string from "Japanese" to "Nihongo". For example, using the file supplied with - # NSIS 2.19, released 6 August 2006, change line 13 from: - # - # !define MUI_LANGNAME "Japanese" ;(ú{ê) Use only ASCII characters (if this is not possible, use the English name) - # - # to: - # - # !define MUI_LANGNAME "Nihongo" ;(ú{ê) Use only ASCII characters (if this is not possible, use the English name) - # - #-------------------------------------------------------------------------- # USAGE EXAMPLES # --- 53,56 ---- *************** *** 82,86 **** # ; At least one language must be specified for the installer (the default is "English") # ! # !insertmacro PFI_LANG_LOAD "English" # # ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English' --- 62,66 ---- # ; At least one language must be specified for the installer (the default is "English") # ! # !insertmacro PFI_LANG_LOAD "English" "-" # # ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English' *************** *** 94,98 **** # ; Default language (appears first in the drop-down list) # ! # !insertmacro PFI_LANG_LOAD "English" # # ; Additional languages supported by the utility --- 74,78 ---- # ; Default language (appears first in the drop-down list) # ! # !insertmacro PFI_LANG_LOAD "English" "-" # # ; Additional languages supported by the utility *************** *** 108,113 **** ; before including this file (which is why "English" does not appear in the list below). ! ; NOTE: The order used here assumes that the NSIS MUI 'Japanese.nsh' language file has ! ; been patched to use 'Nihongo' instead of 'Japanese' [see 'SMALL NSIS PATCH REQUIRED' above] ; Currently a subset of the languages supported by NSIS MUI 1.75 (using the NSIS names) --- 88,93 ---- ; before including this file (which is why "English" does not appear in the list below). ! ; NOTE: The order used here makes the names appear in alphabetic order in the language ! ; 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) *************** *** 124,153 **** ; Note: 'English' is 'Language 1033' ! !insertmacro PFI_LANG_LOAD "Arabic" ; Language 1025 ! !insertmacro PFI_LANG_LOAD "Bulgarian" ; Language 1026 ! !insertmacro PFI_LANG_LOAD "Catalan" ; Language 1027 ! !insertmacro PFI_LANG_LOAD "SimpChinese" ; Language 2052 ! !insertmacro PFI_LANG_LOAD "TradChinese" ; Language 1028 ! !insertmacro PFI_LANG_LOAD "Czech" ; Language 1029 ! !insertmacro PFI_LANG_LOAD "Danish" ; Language 1030 ! !insertmacro PFI_LANG_LOAD "German" ; Language 1031 ! !insertmacro PFI_LANG_LOAD "Spanish" ; Language 1034 ! !insertmacro PFI_LANG_LOAD "French" ; Language 1036 ! !insertmacro PFI_LANG_LOAD "Greek" ; Language 1032 ! !insertmacro PFI_LANG_LOAD "Italian" ; Language 1040 ! !insertmacro PFI_LANG_LOAD "Korean" ; Language 1042 ! !insertmacro PFI_LANG_LOAD "Hungarian" ; Language 1038 ! !insertmacro PFI_LANG_LOAD "Dutch" ; Language 1043 ! !insertmacro PFI_LANG_LOAD "Japanese" ; Language 1041 ! !insertmacro PFI_LANG_LOAD "Norwegian" ; Language 1044 ! !insertmacro PFI_LANG_LOAD "Polish" ; Language 1045 ! !insertmacro PFI_LANG_LOAD "Portuguese" ; Language 2070 ! !insertmacro PFI_LANG_LOAD "PortugueseBR" ; Language 1046 ! !insertmacro PFI_LANG_LOAD "Russian" ; Language 1049 ! !insertmacro PFI_LANG_LOAD "Slovak" ; Language 1051 ! !insertmacro PFI_LANG_LOAD "Finnish" ; Language 1035 ! !insertmacro PFI_LANG_LOAD "Swedish" ; Language 1053 ! !insertmacro PFI_LANG_LOAD "Turkish" ; Language 1055 ! !insertmacro PFI_LANG_LOAD "Ukrainian" ; Language 1058 #-------------------------------------------------------------------------- --- 104,136 ---- ; Note: 'English' is 'Language 1033' ! ; Note: The "-" parameter means "use the language name specified in the standard NSIS ! ; MUI language file when adding the language to the installer's language selection menu" ! ! !insertmacro PFI_LANG_LOAD "Arabic" "-" ; Language 1025 ! !insertmacro PFI_LANG_LOAD "Bulgarian" "-" ; Language 1026 ! !insertmacro PFI_LANG_LOAD "Catalan" "-" ; Language 1027 ! !insertmacro PFI_LANG_LOAD "SimpChinese" "-" ; Language 2052 ! !insertmacro PFI_LANG_LOAD "TradChinese" "-" ; Language 1028 ! !insertmacro PFI_LANG_LOAD "Czech" "-" ; Language 1029 ! !insertmacro PFI_LANG_LOAD "Danish" "-" ; Language 1030 ! !insertmacro PFI_LANG_LOAD "German" "-" ; Language 1031 ! !insertmacro PFI_LANG_LOAD "Spanish" "-" ; Language 1034 ! !insertmacro PFI_LANG_LOAD "French" "-" ; Language 1036 ! !insertmacro PFI_LANG_LOAD "Greek" "-" ; Language 1032 ! !insertmacro PFI_LANG_LOAD "Italian" "-" ; Language 1040 ! !insertmacro PFI_LANG_LOAD "Korean" "-" ; Language 1042 ! !insertmacro PFI_LANG_LOAD "Hungarian" "-" ; Language 1038 ! !insertmacro PFI_LANG_LOAD "Dutch" "-" ; Language 1043 ! !insertmacro PFI_LANG_LOAD "Japanese" "Nihongo" ; Language 1041 ! !insertmacro PFI_LANG_LOAD "Norwegian" "-" ; Language 1044 ! !insertmacro PFI_LANG_LOAD "Polish" "-" ; Language 1045 ! !insertmacro PFI_LANG_LOAD "Portuguese" "-" ; Language 2070 ! !insertmacro PFI_LANG_LOAD "PortugueseBR" "-" ; Language 1046 ! !insertmacro PFI_LANG_LOAD "Russian" "-" ; Language 1049 ! !insertmacro PFI_LANG_LOAD "Slovak" "-" ; Language 1051 ! !insertmacro PFI_LANG_LOAD "Finnish" "-" ; Language 1035 ! !insertmacro PFI_LANG_LOAD "Swedish" "-" ; Language 1053 ! !insertmacro PFI_LANG_LOAD "Turkish" "-" ; Language 1055 ! !insertmacro PFI_LANG_LOAD "Ukrainian" "-" ; Language 1058 #-------------------------------------------------------------------------- Index: MonitorCC.nsi =================================================================== RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v retrieving revision 1.19.4.4 retrieving revision 1.19.4.5 diff -C2 -d -r1.19.4.4 -r1.19.4.5 *** MonitorCC.nsi 29 Aug 2006 15:59:40 -0000 1.19.4.4 --- MonitorCC.nsi 5 Dec 2006 20:33:50 -0000 1.19.4.5 *************** *** 24,39 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 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***\ *************** *** 111,115 **** Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.0" !define C_OUTFILE "monitorcc.exe" --- 111,115 ---- Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.2.3" !define C_OUTFILE "monitorcc.exe" *************** *** 306,311 **** ; (1) The MUI_LANGUAGE macro loads the standard MUI text strings for a particular language ; (2) '*-pfi.nsh' contains the text strings used for pages, progress reports, logs etc ! !macro PFI_LANG_LOAD LANG !insertmacro MUI_LANGUAGE "${LANG}" !include "languages\${LANG}-pfi.nsh" --- 306,319 ---- ; (1) The MUI_LANGUAGE macro loads the standard MUI text strings for a particular language ; (2) '*-pfi.nsh' contains the text strings used for pages, progress reports, logs etc + ; (3) Normally the MUI's language selection menu uses the name defined in the MUI language + ; file, however it is possible to override this by supplying an alternative string + ; (the MENUNAME parameter in this macro). At present the only alternative string used + ; is "Nihongo" which replaces "Japanese" to make things easier for non-English-speaking + ; users. ! !macro PFI_LANG_LOAD LANG MENUNAME ! !if "${MENUNAME}" != "-" ! !define MUI_${LANG}_LANGNAME "${MENUNAME}" ! !endif !insertmacro MUI_LANGUAGE "${LANG}" !include "languages\${LANG}-pfi.nsh" *************** *** 318,322 **** ; Default language (appears first in the drop-down list) ! !insertmacro PFI_LANG_LOAD "English" ; Additional languages supported by the utility --- 326,330 ---- ; Default language (appears first in the drop-down list) ! !insertmacro PFI_LANG_LOAD "English" "-" ; Additional languages supported by the utility Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.53.4.5 retrieving revision 1.53.4.6 diff -C2 -d -r1.53.4.5 -r1.53.4.6 *** pfi-library.nsh 3 Dec 2006 15:28:36 -0000 1.53.4.5 --- pfi-library.nsh 5 Dec 2006 20:33:50 -0000 1.53.4.6 *************** *** 58,62 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.2.1" #-------------------------------------------------------------------------- --- 58,62 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.2.3" #-------------------------------------------------------------------------- *************** *** 142,157 **** ; (1) The MUI_LANGUAGE macro loads the standard MUI text strings for a particular language ; (2) '*-pfi.nsh' contains the text strings used for pages, progress reports, logs etc ! !ifdef ADDSSL | TRANSLATOR | TRANSLATOR_AUW ! !macro PFI_LANG_LOAD LANG ! !insertmacro MUI_LANGUAGE "${LANG}" ! !include "..\languages\${LANG}-pfi.nsh" ! !macroend ! !else ! !macro PFI_LANG_LOAD LANG ! !insertmacro MUI_LANGUAGE "${LANG}" ! !include "languages\${LANG}-pfi.nsh" ! !macroend ! !endif #-------------------------------------------------------------------------- --- 142,162 ---- ; (1) The MUI_LANGUAGE macro loads the standard MUI text strings for a particular language ; (2) '*-pfi.nsh' contains the text strings used for pages, progress reports, logs etc + ; (3) Normally the MUI's language selection menu uses the name defined in the MUI language + ; file, however it is possible to override this by supplying an alternative string + ; (the MENUNAME parameter in this macro). At present the only alternative string used + ; is "Nihongo" which replaces "Japanese" to make things easier for non-English-speaking + ; users - see 'pfi-languages.nsh' for details. ! !macro PFI_LANG_LOAD LANG MENUNAME ! !if "${MENUNAME}" != "-" ! !define MUI_${LANG}_LANGNAME "${MENUNAME}" ! !endif ! !insertmacro MUI_LANGUAGE "${LANG}" ! !ifdef ADDSSL | TRANSLATOR | TRANSLATOR_AUW ! !include "..\languages\${LANG}-pfi.nsh" ! !else ! !include "languages\${LANG}-pfi.nsh" ! !endif ! !macroend #-------------------------------------------------------------------------- *************** *** 4124,4127 **** --- 4129,4133 ---- !undef DECIMAL_DIGIT + !undef BAD_OFFSET FunctionEnd Index: adduser-Version.nsh =================================================================== RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v retrieving revision 1.6.2.8 retrieving revision 1.6.2.9 diff -C2 -d -r1.6.2.8 -r1.6.2.9 *** adduser-Version.nsh 28 Sep 2006 18:30:06 -0000 1.6.2.8 --- adduser-Version.nsh 5 Dec 2006 20:33:50 -0000 1.6.2.9 *************** *** 7,11 **** #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.1" #-------------------------------------------------------------------------- --- 7,11 ---- #-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.3.4" #-------------------------------------------------------------------------- Index: adduser.nsi =================================================================== RCS file: /cvsroot/popfile/windows/adduser.nsi,v retrieving revision 1.59.4.9 retrieving revision 1.59.4.10 diff -C2 -d -r1.59.4.9 -r1.59.4.10 *** adduser.nsi 28 Sep 2006 18:30:06 -0000 1.59.4.9 --- adduser.nsi 5 Dec 2006 20:33:50 -0000 1.59.4.10 *************** *** 34,49 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 34,49 ---- #-------------------------------------------------------------------------- ! ; 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***\ *************** *** 54,60 **** !undef ${NSIS_VERSION}_found ! ; NOTE: The language selection menu order used in this script assumes that the NSIS MUI ! ; 'Japanese.nsh' language file has been patched to use 'Nihongo' instead of 'Japanese' ! ; [see 'SMALL NSIS PATCH REQUIRED' in the 'pfi-languages.nsh' file] #-------------------------------------------------------------------------- --- 54,59 ---- !undef ${NSIS_VERSION}_found ! ; NOTE: The language selection menu order used in this script assumes that "Nihongo" is ! ; used instead of "Japanese" in the language selection menu (see the 'pfi-languages.nsh' file) #-------------------------------------------------------------------------- *************** *** 127,131 **** # For example, to remove support for the 'Dutch' language, comment-out the line # ! # !insertmacro PFI_LANG_LOAD "Dutch" # # in the 'pfi-languages.nsh' file, and comment-out the line --- 126,130 ---- # For example, to remove support for the 'Dutch' language, comment-out the line # ! # !insertmacro PFI_LANG_LOAD "Dutch" "-" ; Language 1043 # # in the 'pfi-languages.nsh' file, and comment-out the line *************** *** 665,669 **** ; At least one language must be specified for the installer (the default is "English") ! !insertmacro PFI_LANG_LOAD "English" ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English' --- 664,668 ---- ; At least one language must be specified for the installer (the default is "English") ! !insertmacro PFI_LANG_LOAD "English" "-" ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English' |
|
From: Brian S. <xue...@us...> - 2006-12-05 20:33:51
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12199/add-ons Modified Files: Tag: b0_22_2 addssl.nsi Log Message: Avoid the need to patch the standard NSIS MUI Japanese language file in order to change the language selection menu entry from "Japanese" to "Nihongo". Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.3.4.5 retrieving revision 1.3.4.6 diff -C2 -d -r1.3.4.5 -r1.3.4.6 *** addssl.nsi 19 Nov 2006 20:35:50 -0000 1.3.4.5 --- addssl.nsi 5 Dec 2006 20:33:50 -0000 1.3.4.6 *************** *** 53,68 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.21" compiler, ! ; released 20 October 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.21-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.21_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.21 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 53,68 ---- #-------------------------------------------------------------------------- ! ; 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***\ *************** *** 133,137 **** ; ; POPFile 0.22.3 and 0.22.4 are based upon ActivePerl 5.8.7 (Builds 813 & 815 respectively). ! ; Up until 18 July 2006 is was safe for POPFile 0.22.3 and 0.22.4 to use the latest versions ; of the SSL files. ; --- 133,137 ---- ; ; POPFile 0.22.3 and 0.22.4 are based upon ActivePerl 5.8.7 (Builds 813 & 815 respectively). ! ; Up until 18 July 2006 it was safe for POPFile 0.22.3 and 0.22.4 to use the latest versions ; of the SSL files. ; *************** *** 182,188 **** # 'Japanese-pfi.nsh' file generates this warning). # - # NOTE: The language selection menu order used in this script assumes that the NSIS MUI - # 'Japanese.nsh' language file has been patched to use 'Nihongo' instead of 'Japanese' - # [see 'SMALL NSIS PATCH REQUIRED' in the '..\pfi-languages.nsh' file] #-------------------------------------------------------------------------- --- 182,185 ---- *************** *** 233,237 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.2" ; Mention the wizard's version number in the window title --- 230,234 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.4" ; Mention the wizard's version number in the window title *************** *** 502,506 **** ; At least one language must be specified for the wizard (the default is "English") ! !insertmacro PFI_LANG_LOAD "English" ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English' --- 499,503 ---- ; At least one language must be specified for the wizard (the default is "English") ! !insertmacro PFI_LANG_LOAD "English" "-" ; Conditional compilation: if ENGLISH_MODE is defined, support only 'English' |
|
From: Brian S. <xue...@us...> - 2006-12-05 20:28:49
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11079 Modified Files: pfi-library.nsh Log Message: Fix the bug introduced in the "Make future maintenance a little easier" change (oops!) Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** pfi-library.nsh 3 Dec 2006 15:24:36 -0000 1.70 --- pfi-library.nsh 5 Dec 2006 20:28:46 -0000 1.71 *************** *** 59,63 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.15" #-------------------------------------------------------------------------- --- 59,63 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.16" #-------------------------------------------------------------------------- *************** *** 4142,4145 **** --- 4142,4146 ---- !undef DECIMAL_DIGIT + !undef BAD_OFFSET FunctionEnd |
|
From: Brian S. <xue...@us...> - 2006-12-03 15:28:38
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16661 Modified Files: Tag: b0_22_2 pfi-library.nsh Log Message: Make future maintenance a little easier. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.53.4.4 retrieving revision 1.53.4.5 diff -C2 -d -r1.53.4.4 -r1.53.4.5 *** pfi-library.nsh 29 Aug 2006 16:02:57 -0000 1.53.4.4 --- pfi-library.nsh 3 Dec 2006 15:28:36 -0000 1.53.4.5 *************** *** 58,62 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.2.0" #-------------------------------------------------------------------------- --- 58,62 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.2.1" #-------------------------------------------------------------------------- *************** *** 4084,4088 **** Function ${UN}PFI_StrCheckDecimal ! !define DECIMAL_DIGIT "0123456789" Exch $0 ; The input string --- 4084,4089 ---- Function ${UN}PFI_StrCheckDecimal ! !define DECIMAL_DIGIT "0123456789" ; accept only these digits ! !define BAD_OFFSET 10 ; length of DECIMAL_DIGIT string Exch $0 ; The input string *************** *** 4106,4110 **** StrCpy $4 $5 1 $3 ; Extract next "valid" character (from "validity check" string) StrCmp $2 $4 0 next_valid_char ! IntCmp $3 10 invalid 0 invalid ; If match is with the char we added, input string is bad StrCpy $1 $1$4 ; Add "valid" character to the result goto next_input_char --- 4107,4111 ---- StrCpy $4 $5 1 $3 ; Extract next "valid" character (from "validity check" string) StrCmp $2 $4 0 next_valid_char ! IntCmp $3 ${BAD_OFFSET} invalid 0 invalid ; If match is with the char we added, input is bad StrCpy $1 $1$4 ; Add "valid" character to the result goto next_input_char |
|
From: Brian S. <xue...@us...> - 2006-12-03 15:24:49
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15214 Modified Files: pfi-library.nsh Log Message: Make future maintenance a little easier. Index: pfi-library.nsh =================================================================== RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** pfi-library.nsh 7 Nov 2006 15:38:46 -0000 1.69 --- pfi-library.nsh 3 Dec 2006 15:24:36 -0000 1.70 *************** *** 59,63 **** #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.14" #-------------------------------------------------------------------------- --- 59,63 ---- #-------------------------------------------------------------------------- ! !define C_PFI_LIBRARY_VERSION "0.1.15" #-------------------------------------------------------------------------- *************** *** 4102,4106 **** Function ${UN}PFI_StrCheckDecimal ! !define DECIMAL_DIGIT "0123456789" Exch $0 ; The input string --- 4102,4107 ---- Function ${UN}PFI_StrCheckDecimal ! !define DECIMAL_DIGIT "0123456789" ; accept only these digits ! !define BAD_OFFSET 10 ; length of DECIMAL_DIGIT string Exch $0 ; The input string *************** *** 4124,4128 **** StrCpy $4 $5 1 $3 ; Extract next "valid" character (from "validity check" string) StrCmp $2 $4 0 next_valid_char ! IntCmp $3 10 invalid 0 invalid ; If match is with the char we added, input string is bad StrCpy $1 $1$4 ; Add "valid" character to the result goto next_input_char --- 4125,4129 ---- StrCpy $4 $5 1 $3 ; Extract next "valid" character (from "validity check" string) StrCmp $2 $4 0 next_valid_char ! IntCmp $3 ${BAD_OFFSET} invalid 0 invalid ; If match is with the char we added, input is bad StrCpy $1 $1$4 ; Add "valid" character to the result goto next_input_char |
|
From: naoki i. <am...@us...> - 2006-12-02 17:46:49
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6067/skins/default Modified Files: bucket-page.thtml Log Message: Fixed a bug that the word link in the bucket tab is not url-encoded. Index: bucket-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/bucket-page.thtml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** bucket-page.thtml 9 Sep 2005 23:00:42 -0000 1.12 --- bucket-page.thtml 2 Dec 2006 17:46:46 -0000 1.13 *************** *** 115,119 **** <td> ! <a class="wordListLink" href="/buckets?lookup=Lookup&word=<TMPL_VAR NAME="Bucket_Word">#Lookup"> <b> <TMPL_VAR NAME="Bucket_Word"> --- 115,119 ---- <td> ! <a class="wordListLink" href="/buckets?lookup=Lookup&word=<TMPL_VAR NAME="Bucket_Word" ESCAPE=URL>#Lookup"> <b> <TMPL_VAR NAME="Bucket_Word"> |
|
From: naoki i. <am...@us...> - 2006-12-02 17:45:04
|
Update of /cvsroot/popfile/engine/POPFile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5357/POPFile Modified Files: Configuration.pm Log Message: Following Japanese support: - Performance update for convert_encoding. - Fix the problem with HTML entity. - Clear the character set per mail to avoid using the wrong charsets. - Fix the problem that 'uninitialized value' warnings occur on Japanese environment. Index: Configuration.pm =================================================================== RCS file: /cvsroot/popfile/engine/POPFile/Configuration.pm,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** Configuration.pm 20 Feb 2006 02:01:57 -0000 1.59 --- Configuration.pm 2 Dec 2006 17:45:02 -0000 1.60 *************** *** 689,693 **** } ! return $self->{configuration_parameters__}{$name}{value}; } --- 689,699 ---- } ! # If $self->{configuration_parameters__}{$name} is undefined, simply ! # return undef to avoid defining $self->{configuration_parameters__}{$name}. ! if ( defined($self->{configuration_parameters__}{$name}) ) { ! return $self->{configuration_parameters__}{$name}{value}; ! } else { ! return undef; ! } } |
|
From: naoki i. <am...@us...> - 2006-12-02 17:45:03
|
Update of /cvsroot/popfile/engine/Classifier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5357/Classifier Modified Files: MailParse.pm Log Message: Following Japanese support: - Performance update for convert_encoding. - Fix the problem with HTML entity. - Clear the character set per mail to avoid using the wrong charsets. - Fix the problem that 'uninitialized value' warnings occur on Japanese environment. Index: MailParse.pm =================================================================== RCS file: /cvsroot/popfile/engine/Classifier/MailParse.pm,v retrieving revision 1.225 retrieving revision 1.226 diff -C2 -d -r1.225 -r1.226 *** MailParse.pm 20 Feb 2006 09:16:34 -0000 1.225 --- MailParse.pm 2 Dec 2006 17:45:02 -0000 1.226 *************** *** 584,591 **** if ( defined( $to ) ) { ! # HTML entities confilict with DBCS chars. Replace ! # entities with blanks. ! if ( $self->{lang__} eq 'Korean' ) { $to = ' '; } else { --- 584,591 ---- if ( defined( $to ) ) { ! # HTML entities confilict with DBCS and EUC-JP ! # chars. Replace entities with blanks. ! if ( $self->{lang__} eq 'Korean' || $self->{lang__} eq 'Nihongo' ) { $to = ' '; } else { *************** *** 1582,1585 **** --- 1582,1588 ---- $self->{colorized__} .= "<tt>" if ( $self->{color__} ne '' ); + # Clear the character set to avoid using the wrong charsets + $self->{charset__} = ''; + # Since Text::Kakasi is not thread-safe, we use it under the # control of a Mutex to avoid a crash if we are running on *************** *** 1689,1698 **** } - # Decode \x?? - if ( $self->{lang__} eq 'Nihongo' && !$self->{in_headers__} ) { - $line =~ s/\\x([8-9A-F][A-F0-9])/pack("C", hex($1))/eig; - } - if ( $self->{lang__} eq 'Nihongo' ) { $line = convert_encoding( $line, $self->{charset__}, 'euc-jp', '7bit-jis', @{$encoding_candidates{$self->{lang__}}} ); $line = parse_line_with_kakasi( $self, $line ); --- 1692,1701 ---- } if ( $self->{lang__} eq 'Nihongo' ) { + # Decode \x?? + if ( !$self->{in_headers__} ) { + $line =~ s/\\x([8-9A-F][A-F0-9])/pack("C", hex($1))/eig; + } + $line = convert_encoding( $line, $self->{charset__}, 'euc-jp', '7bit-jis', @{$encoding_candidates{$self->{lang__}}} ); $line = parse_line_with_kakasi( $self, $line ); *************** *** 2550,2553 **** --- 2553,2559 ---- my ( $string, $from, $to, $default, @candidates ) = @_; + # If the string contains only ascii characters, do nothing. + return $string if ( $string =~ /^[\r\n\t\x20-\x7E]*$/ ); + require Encode; require Encode::Guess; |
|
From: naoki i. <am...@us...> - 2006-12-02 17:40:38
|
Update of /cvsroot/popfile/engine/skins/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3842/skins/default Modified Files: Tag: b0_22_2 bucket-page.thtml Log Message: Fixed a bug that the word link in the bucket tab is not url-encoded. Index: bucket-page.thtml =================================================================== RCS file: /cvsroot/popfile/engine/skins/default/bucket-page.thtml,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -C2 -d -r1.7 -r1.7.4.1 *** bucket-page.thtml 5 Oct 2004 13:12:46 -0000 1.7 --- bucket-page.thtml 2 Dec 2006 17:40:15 -0000 1.7.4.1 *************** *** 116,120 **** <td> ! <a class="wordListLink" href="/buckets?session=<TMPL_VAR NAME="Session_Key">&lookup=Lookup&word=<TMPL_VAR NAME="Bucket_Word">#Lookup"> <b> <TMPL_VAR NAME="Bucket_Word"> --- 116,120 ---- <td> ! <a class="wordListLink" href="/buckets?session=<TMPL_VAR NAME="Session_Key">&lookup=Lookup&word=<TMPL_VAR NAME="Bucket_Word" ESCAPE=URL>#Lookup"> <b> <TMPL_VAR NAME="Bucket_Word"> |
|
From: Brian S. <xue...@us...> - 2006-11-19 20:35:52
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31672/add-ons Modified Files: Tag: b0_22_2 addssl.nsi Log Message: Update the SSL Setup wizard to use the latest Inetc plugin. Stop trying to apply the SSL.pm "downgrade" patch when using the built-in SSL files. Index: addssl.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v retrieving revision 1.3.4.4 retrieving revision 1.3.4.5 diff -C2 -d -r1.3.4.4 -r1.3.4.5 *** addssl.nsi 14 Sep 2006 13:53:35 -0000 1.3.4.4 --- addssl.nsi 19 Nov 2006 20:35:50 -0000 1.3.4.5 *************** *** 53,68 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.19_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.19 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ --- 53,68 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.21" compiler, ! ; released 20 October 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.21-setup.exe?download !define ${NSIS_VERSION}_found ! !ifndef v2.21_found !warning \ "$\r$\n\ $\r$\n*** NSIS COMPILER WARNING:\ $\r$\n***\ ! $\r$\n*** This script has only been tested using the NSIS v2.21 compiler\ $\r$\n*** and may not work properly with this NSIS ${NSIS_VERSION} compiler\ $\r$\n***\ *************** *** 87,91 **** ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 8 September 2006 10:13:18 ;------------------------------------------------ --- 87,91 ---- ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 12 November 2006 15:32:16 ;------------------------------------------------ *************** *** 233,237 **** Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.1" ; Mention the wizard's version number in the window title --- 233,237 ---- Name "POPFile SSL Setup" ! !define C_PFI_VERSION "0.2.2" ; Mention the wizard's version number in the window title *************** *** 243,246 **** --- 243,251 ---- !define C_OUTFILE "addssl.exe" + ; Values used for the $G_SSL_SOURCE flag which indicates where we get the SSL files from + ; (to make maintenance easier, constants are used for these values) + + !define C_BUILTIN "built-in" ; use old SSL files compatible with pre-0.22.3 releases + !define C_INTERNET "internet" ; download latest SSL Support files from the Internet #-------------------------------------------------------------------------- *************** *** 253,256 **** --- 258,264 ---- Var G_MPLIBDIR ; full path to the folder used for most of the minimal Perl files + Var G_SSL_SOURCE ; indicates the source of the SSL files we are to install + ; (the possible values are either ${C_BUILTIN} or ${C_INTERNET}) + Var G_PLS_FIELD_1 ; used to customize some language strings |
|
From: Brian S. <xue...@us...> - 2006-11-19 20:35:52
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31672 Modified Files: Tag: b0_22_2 getssl.nsh Log Message: Update the SSL Setup wizard to use the latest Inetc plugin. Stop trying to apply the SSL.pm "downgrade" patch when using the built-in SSL files. Index: getssl.nsh =================================================================== RCS file: /cvsroot/popfile/windows/getssl.nsh,v retrieving revision 1.6.2.8 retrieving revision 1.6.2.9 diff -C2 -d -r1.6.2.8 -r1.6.2.9 *** getssl.nsh 14 Sep 2006 13:55:38 -0000 1.6.2.8 --- getssl.nsh 19 Nov 2006 20:35:50 -0000 1.6.2.9 *************** *** 43,49 **** #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.19" compiler, ! ; released 6 August 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.19-setup.exe?download ;------------------------------------------------ --- 43,49 ---- #-------------------------------------------------------------------------- ! ; This version of the script has been tested with the "NSIS v2.21" compiler, ! ; released 20 October 2006. This particular compiler can be downloaded from ! ; http://prdownloads.sourceforge.net/nsis/nsis-2.21-setup.exe?download ;------------------------------------------------ *************** *** 61,65 **** ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 24 June 2006 12:40 ;------------------------------------------------ --- 61,65 ---- ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 12 November 2006 15:32:16 ;------------------------------------------------ *************** *** 85,91 **** ;------------------------------------------------ ! ; The patch used to downgrade either SSL.pm v0.99 or SSL.pm v0.999 to v0.97 was created ! ; using the VPATCH package which is supplied with NSIS. This special patch was made using ! ; the commands: ; ; GenPat.exe SSL_0.99.pm SSL_0.97.pm SSL_pm.pat --- 85,91 ---- ;------------------------------------------------ ! ; The patch used to downgrade SSL.pm v0.99, SSL.pm v0.999 or SSL.pm v1.01 to v0.97 was ! ; created using the VPATCH package which is supplied with NSIS. The following commands ! ; were used to create the patch: ; ; GenPat.exe SSL_0.99.pm SSL_0.97.pm SSL_pm.pat *************** *** 150,153 **** --- 150,157 ---- !ifdef ADDSSL + ; Assume we will use the built-in SSL files which are compatible with pre-0.22.3 releases + + StrCpy $G_SSL_SOURCE "${C_BUILTIN}" + ; For POPFile 0.22.3 (and later) releases this stand-alone utility will download and, ; if necessary, patch the SSL support files from the University of Winnipeg repository. *************** *** 195,201 **** DetailPrint "Minimal Perl version ${L_VER_X}.${L_VER_Y}.${L_VER_Z} detected in '$G_ROOTDIR' folder" ! ; Only download the SSL files if the minimal Perl is version 5.8.7 or higher ! ! StrCpy ${L_RESULT} "built-in" IntCmp ${L_VER_X} 5 0 restore_vars set_download_flag --- 199,203 ---- DetailPrint "Minimal Perl version ${L_VER_X}.${L_VER_Y}.${L_VER_Z} detected in '$G_ROOTDIR' folder" ! ; Only download the SSL files if the minimal Perl version is 5.8.7 or higher IntCmp ${L_VER_X} 5 0 restore_vars set_download_flag *************** *** 204,208 **** set_download_flag: ! StrCpy ${L_RESULT} "download" restore_vars: --- 206,210 ---- set_download_flag: ! StrCpy $G_SSL_SOURCE "${C_INTERNET}" restore_vars: *************** *** 215,223 **** !undef L_VER_Z ! StrCmp ${L_RESULT} "download" download_ssl assume_pre_0_22_3: ! ; Pretend we've just downloaded these files from the repository DetailPrint "therefore built-in SSL files used instead of downloading the latest versions" --- 217,225 ---- !undef L_VER_Z ! StrCmp $G_SSL_SOURCE "${C_INTERNET}" download_ssl assume_pre_0_22_3: ! ; Pretend we've just downloaded the SSL archives and OpenSSL DLLs from the Internet DetailPrint "therefore built-in SSL files used instead of downloading the latest versions" *************** *** 235,239 **** !endif ! ; Download the archives and OpenSSL DLLs Push "${C_UWR_IO_SOCKET_SSL}" --- 237,241 ---- !endif ! ; Download the SSL archives and OpenSSL DLLs Push "${C_UWR_IO_SOCKET_SSL}" *************** *** 282,287 **** StrCmp ${L_RESULT} "success" 0 error_exit ! ; If IO::Socket::SSL v0.99 has been downloaded and installed, apply the patch which ! ; downgrades the SSL.pm file from v0.99 to v0.97 to make it compatible with POPFile DetailPrint "" --- 284,296 ---- StrCmp ${L_RESULT} "success" 0 error_exit ! !ifdef ADDSSL ! ! ; If the built-in SSL Support files are being used then there is no need to patch SSL.pm ! ! StrCmp $G_SSL_SOURCE "${C_BUILTIN}" extract_Net_SSLeay_files ! !endif ! ! ; If IO::Socket::SSL v0.99 (or v0.999 or v1.01) has been downloaded and installed, apply ! ; the patch which downgrades the SSL.pm file to v0.97 to make it compatible with POPFile DetailPrint "" *************** *** 290,296 **** SetDetailsPrint none !ifdef INSTALLER ! File "/oname=$PLUGINSDIR\SSL_pm.pat" "SSL_pm.pat" !else ! File "/oname=$PLUGINSDIR\SSL_pm.pat" "..\SSL_pm.pat" !endif SetDetailsPrint listonly --- 299,305 ---- SetDetailsPrint none !ifdef INSTALLER ! File "/oname=$PLUGINSDIR\SSL_pm.pat" "SSL_pm.pat" !else ! File "/oname=$PLUGINSDIR\SSL_pm.pat" "..\SSL_pm.pat" !endif SetDetailsPrint listonly *************** *** 315,319 **** SetDetailsPrint both DetailPrint "$(PFI_LANG_SSLPATCHFAILED)" ! Goto label_a downgrade_success: --- 324,328 ---- SetDetailsPrint both DetailPrint "$(PFI_LANG_SSLPATCHFAILED)" ! Goto extract_Net_SSLeay_files downgrade_success: *************** *** 324,331 **** show_downgrade_status: !ifdef ADDSSL ! MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_SSLPATCHSTATUS)" !endif ! label_a: DetailPrint "" StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\Net" --- 333,340 ---- show_downgrade_status: !ifdef ADDSSL ! MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_SSLPATCHSTATUS)" !endif ! extract_Net_SSLeay_files: DetailPrint "" StrCpy $G_PLS_FIELD_1 "$G_MPLIBDIR\Net" *************** *** 407,413 **** IfFileExists "$G_PLS_FIELD_1\SSLeay.bs" done !ifdef INSTALLER ! File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "zerobyte.file" !else ! File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "..\zerobyte.file" !endif --- 416,422 ---- IfFileExists "$G_PLS_FIELD_1\SSLeay.bs" done !ifdef INSTALLER ! File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "zerobyte.file" !else ! File "/oname=$G_PLS_FIELD_1\SSLeay.bs" "..\zerobyte.file" !endif *************** *** 469,473 **** EnableWindow ${L_DLG_ITEM} 0 ! inetc::get /RESUME "$(PFI_LANG_MB_CHECKINTERNET)" ${C_NSISDL_TRANSLATIONS} "$G_SSL_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" /END Pop $G_PLS_FIELD_2 --- 478,482 ---- EnableWindow ${L_DLG_ITEM} 0 ! inetc::get /CAPTION "Internet Download" /RESUME "$(PFI_LANG_MB_CHECKINTERNET)" ${C_NSISDL_TRANSLATIONS} "$G_SSL_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" /END Pop $G_PLS_FIELD_2 |
|
From: Manni H. <man...@us...> - 2006-11-16 19:12:54
|
Update of /cvsroot/popfile/engine/Proxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24834 Modified Files: Proxy.pm Log Message: Add more logging when connecting to server Index: Proxy.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** Proxy.pm 20 Feb 2006 02:14:29 -0000 1.64 --- Proxy.pm 16 Nov 2006 19:12:51 -0000 1.65 *************** *** 533,536 **** --- 533,539 ---- ConnectAddr => $hostname, ConnectPort => $port ); # PROFILE BLOCK STOP + $self->log_( 0, "Attempting to connect to socks server at " + . $self->config_( 'socks_server' ) . ":" + . ProxyPort => $self->config_( 'socks_port' ) ); } else { if ( $ssl ) { *************** *** 540,548 **** PeerAddr => $hostname, PeerPort => $port ); # PROFILE BLOCK STOP ! } else { $mail = IO::Socket::INET->new( # PROFILE BLOCK START Proto => "tcp", PeerAddr => $hostname, PeerPort => $port ); # PROFILE BLOCK STOP } } --- 543,556 ---- PeerAddr => $hostname, PeerPort => $port ); # PROFILE BLOCK STOP ! $self->log_( 0, "Attempting to connect to SSL server at " ! . "$hostname:$port" ); ! ! } else { $mail = IO::Socket::INET->new( # PROFILE BLOCK START Proto => "tcp", PeerAddr => $hostname, PeerPort => $port ); # PROFILE BLOCK STOP + $self->log_( 0, "Attempting to connect to POP server at " + . "$hostname:$port" ); } } |
|
From: Manni H. <man...@us...> - 2006-11-16 19:06:53
|
Update of /cvsroot/popfile/engine/Proxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22566 Modified Files: Tag: b0_22_2 Proxy.pm Log Message: Add more logging when connecting to server Index: Proxy.pm =================================================================== RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v retrieving revision 1.54.4.1 retrieving revision 1.54.4.2 diff -C2 -d -r1.54.4.1 -r1.54.4.2 *** Proxy.pm 6 Feb 2006 15:15:53 -0000 1.54.4.1 --- Proxy.pm 16 Nov 2006 19:06:47 -0000 1.54.4.2 *************** *** 221,225 **** $self->{api_session__} = $self->{classifier__}->get_session_key( 'admin', '' ); ! } # Check that this is a connection from the local machine, --- 221,225 ---- $self->{api_session__} = $self->{classifier__}->get_session_key( 'admin', '' ); ! } # Check that this is a connection from the local machine, *************** *** 252,256 **** exit(0) if ( defined( $pid ) ); } ! } else { pipe my $reader, my $writer; --- 252,256 ---- exit(0) if ( defined( $pid ) ); } ! } else { pipe my $reader, my $writer; *************** *** 333,339 **** } ! if ( $line =~ $regexp ) { last; ! } } } --- 333,339 ---- } ! if ( $line =~ $regexp ) { last; ! } } } *************** *** 451,455 **** if ( $response =~ /$self->{good_response_}/ ) { return 0; ! } else { return 1; } --- 451,455 ---- if ( $response =~ /$self->{good_response_}/ ) { return 0; ! } else { return 1; } *************** *** 492,495 **** --- 492,498 ---- ConnectAddr => $hostname, ConnectPort => $port ); # PROFILE BLOCK STOP + $self->log_( 0, "Attempting to connect to socks server at " + . $self->config_( 'socks_server' ) . ":" + . ProxyPort => $self->config_( 'socks_port' ) ); } else { if ( $ssl ) { *************** *** 499,507 **** PeerAddr => $hostname, PeerPort => $port ); # PROFILE BLOCK STOP ! } else { $mail = IO::Socket::INET->new( # PROFILE BLOCK START Proto => "tcp", PeerAddr => $hostname, PeerPort => $port ); # PROFILE BLOCK STOP } } --- 502,515 ---- PeerAddr => $hostname, PeerPort => $port ); # PROFILE BLOCK STOP ! $self->log_( 0, "Attempting to connect to SSL server at " ! . "$hostname:$port" ); ! ! } else { $mail = IO::Socket::INET->new( # PROFILE BLOCK START Proto => "tcp", PeerAddr => $hostname, PeerPort => $port ); # PROFILE BLOCK STOP + $self->log_( 0, "Attempting to connect to POP server at " + . "$hostname:$port" ); } } *************** *** 518,522 **** if ( !$ssl ) { binmode( $mail ); ! } # Wait 10 seconds for a response from the remote server and if --- 526,530 ---- if ( !$ssl ) { binmode( $mail ); ! } # Wait 10 seconds for a response from the remote server and if |
|
From: Brian S. <xue...@us...> - 2006-11-09 19:15:22
|
Update of /cvsroot/popfile/windows/add-ons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7020 Modified Files: updateimap.nsi Log Message: Previous versions have use cURL instead of the standard NSISdl plugin to download the CVS files because the SourceForge server does not supply the file size. Switching from cURL to the Inetc plugin reduces the utility's size by more than 50% and allows the utility to provide a "live" progress report. If a pre-0.23.0 installation is detected then instead of simply downloading a hard-coded 0.22.x-compatible CVS revision the utility now tries to find the most recent 0.22.x-compatible revision in CVS. Index: updateimap.nsi =================================================================== RCS file: /cvsroot/popfile/windows/add-ons/updateimap.nsi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** updateimap.nsi 7 Nov 2006 15:38:46 -0000 1.6 --- updateimap.nsi 9 Nov 2006 19:15:09 -0000 1.7 *************** *** 49,67 **** ;------------------------------------------------ ! ; This script uses 'cURL' to perform the downloads ;------------------------------------------------ ! ; The standard NSIS 'nsisdl' plugin cannot be used to download the IMAP.pm module because ! ; the server does not supply the content length so the 'curl' is used to download the data. ! ; ! ; For further information, including download links for a wide variety of platforms, visit ! ; curl's web site at http://curl.haxx.se ; ! ; There are over 15 official mirrors of the main web site and a similar number of official ! ; download mirrors. ; ! ; For this IMAP Updater wizard the "Win32 - Generic - non-SSL" version of 'curl' was used. ; ! ; The curl program contains built-in help (curl.exe --help) and a manual (curl.exe --manual) --- 49,68 ---- ;------------------------------------------------ ! ; This script requires the 'Inetc' NSIS plugin ;------------------------------------------------ ! ; This script uses a special NSIS plugin (Inetc) to download the IMAP.pm file. ! ; The standard NSISdl plugin shipped with NSIS cannot be used here because the ! ; SourceForge server does not supply the necessary header information. The Inetc ! ; plugin also has much better proxy support than the standard NSISdl plugin. ; ! ; The 'NSIS Wiki' page for the 'Inetc' plugin (description, example and download links): ! ; http://nsis.sourceforge.net/Inetc_plug-in ; ! ; To compile this script, copy the 'inetc.dll' file to the standard NSIS plugins folder ! ; (${NSISDIR}\Plugins\). The 'Inetc' source and example files can be unzipped to the ! ; appropriate ${NSISDIR} sub-folders if you wish, but this step is entirely optional. ; ! ; Tested with the inetc.dll plugin timestamped 24 September 2006 19:29:22 *************** *** 72,78 **** # /revision=CVS revision number # ! # By default this wizard downloads the most recent version found in CVS. If the wizard fails to ! # correctly identify the most recent version or if the user wishes to download and install a ! # particular revision then this command-line switch can be used. # # For example, to download and install IMAP.pm v1.4 use the command: --- 73,80 ---- # /revision=CVS revision number # ! # By default this wizard downloads the most recent compatible version found in CVS. ! # If the wizard fails to correctly identify the most recent compatible version or ! # if the user wishes to download and install a particular revision then this ! # command-line switch can be used. # # For example, to download and install IMAP.pm v1.4 use the command: *************** *** 123,127 **** Name "POPFile IMAP Updater" ! !define C_PFI_VERSION "0.0.10" ; Mention the wizard's version number in the window title --- 125,129 ---- Name "POPFile IMAP Updater" ! !define C_PFI_VERSION "0.0.11" ; Mention the wizard's version number in the window title *************** *** 143,159 **** !define C_CVS_HISTORY_URL "http://popfile.cvs.sourceforge.net/popfile/engine/Services/IMAP.pm?view=log" ! ; SourceForge URL used when downloading a particular CVS revision of the IMAP module ! !define C_CVS_IMAP_DL_URL "http://popfile.cvs.sourceforge.net/*checkout*/popfile/engine/Services/IMAP.pm?revision=$G_REVISION" ! ;-------------------------------------------------------------------------- ! ; POPFile's module format was changed for the POPFile 0.23.0 release so any ! ; modules intended for 0.23.0 (or later) are no longer compatible with the ! ; earlier releases. Therefore if this utility is used to add or update the ! ; IMAP module in a pre-0.23.0 installation it must ensure it downloads the ! ; most recent _compatible_ module instead of simply the most recent module. ! ;-------------------------------------------------------------------------- ! !define C_PRE_23_COMPATIBLE_VERSION "1.9.4.3" #-------------------------------------------------------------------------- --- 145,159 ---- !define C_CVS_HISTORY_URL "http://popfile.cvs.sourceforge.net/popfile/engine/Services/IMAP.pm?view=log" ! ; Restrict the Revision History to the current CVS version (for forthcoming 0.23.0 release) ! !define C_CVS_PATHREV "&pathrev=MAIN" ! ; Restrict the Revision History to the versions which are compatible with 0.22.x releases ! !define C_PRE_23_PATHREV "&pathrev=b0_22_2" ! ! ; SourceForge URL used when downloading a particular CVS revision of the IMAP module ! ! !define C_CVS_IMAP_DL_URL "http://popfile.cvs.sourceforge.net/*checkout*/popfile/engine/Services/IMAP.pm?revision=$G_REVISION" #-------------------------------------------------------------------------- *************** *** 214,221 **** VIProductVersion "${C_PFI_VERSION}.0" VIAddVersionKey "ProductName" "POPFile IMAP Updater wizard" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "Updates the IMAP module for POPFile 0.22.x" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" --- 214,223 ---- VIProductVersion "${C_PFI_VERSION}.0" + !define /date C_BUILD_YEAR "%Y" + VIAddVersionKey "ProductName" "POPFile IMAP Updater wizard" VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) ${C_BUILD_YEAR} John Graham-Cumming" VIAddVersionKey "FileDescription" "Updates the IMAP module for POPFile 0.22.x" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" *************** *** 438,450 **** !insertmacro PLS_TEXT PIU_LANG_PROG_INITIALISE "Initializing..." !insertmacro PLS_TEXT PIU_LANG_PROG_GETLIST "Downloading list of available CVS revisions..." !insertmacro PLS_TEXT PIU_LANG_PROG_CHECKDOWNLOAD "Analyzing the result of the download operation..." ! !insertmacro PLS_TEXT PIU_LANG_PROG_FINDREVISION "Searching the list to find the most recent IMAP revision..." !insertmacro PLS_TEXT PIU_LANG_PROG_USERCANCELLED "IMAP update cancelled by the user" !insertmacro PLS_TEXT PIU_LANG_PROG_GETIMAP "Downloading the IMAP.pm module..." !insertmacro PLS_TEXT PIU_LANG_PROG_BACKUPIMAP "Making backup copy of previous IMAP.pm file..." !insertmacro PLS_TEXT PIU_LANG_PROG_INSTALLIMAP "Updating the IMAP.pm file..." !insertmacro PLS_TEXT PIU_LANG_PROG_SUCCESS "POPFile 0.22.x IMAP support updated to v$G_REVISION" !insertmacro PLS_TEXT PIU_LANG_PROG_SAVELOG "Saving install log file..." !insertmacro PLS_TEXT PIU_LANG_TAKE_A_FEW_SECONDS "(this may take a few seconds)" --- 440,460 ---- !insertmacro PLS_TEXT PIU_LANG_PROG_INITIALISE "Initializing..." + !insertmacro PLS_TEXT PIU_LANG_PROG_CMDLINE_REQUEST "User has requested IMAP.pm v$G_REVISION" + !insertmacro PLS_TEXT PIU_LANG_PROG_PRE_23_FOUND "Pre-0.23.0 installation found" + !insertmacro PLS_TEXT PIU_LANG_PROG_MAIN_CVS_FOUND "0.23.0 (or later) installation found" !insertmacro PLS_TEXT PIU_LANG_PROG_GETLIST "Downloading list of available CVS revisions..." !insertmacro PLS_TEXT PIU_LANG_PROG_CHECKDOWNLOAD "Analyzing the result of the download operation..." ! !insertmacro PLS_TEXT PIU_LANG_PROG_FINDREVISION "Searching the list to find the most recent compatible IMAP revision..." ! !insertmacro PLS_TEXT PIU_LANG_PROG_RESULTFOUND "Search result: IMAP.pm v$G_REVISION ($G_REVDATE)" ! !insertmacro PLS_TEXT PIU_LANG_PROG_READYTODOWNLOAD "Ready to download IMAP.pm v$G_REVISION from CVS" !insertmacro PLS_TEXT PIU_LANG_PROG_USERCANCELLED "IMAP update cancelled by the user" !insertmacro PLS_TEXT PIU_LANG_PROG_GETIMAP "Downloading the IMAP.pm module..." + !insertmacro PLS_TEXT PIU_LANG_PROG_DOWNLOADFAILED "IMAP Updater failed ($G_PLS_FIELD_1)" !insertmacro PLS_TEXT PIU_LANG_PROG_BACKUPIMAP "Making backup copy of previous IMAP.pm file..." !insertmacro PLS_TEXT PIU_LANG_PROG_INSTALLIMAP "Updating the IMAP.pm file..." !insertmacro PLS_TEXT PIU_LANG_PROG_SUCCESS "POPFile 0.22.x IMAP support updated to v$G_REVISION" + !insertmacro PLS_TEXT PIU_LANG_PROG_UPDATECOMPLETED "IMAP Updater completed $G_PLS_FIELD_1" !insertmacro PLS_TEXT PIU_LANG_PROG_SAVELOG "Saving install log file..." + !insertmacro PLS_TEXT PIU_LANG_PROG_LOGLOCATION "Log report saved in '$G_ROOTDIR\updateimap.log'" !insertmacro PLS_TEXT PIU_LANG_TAKE_A_FEW_SECONDS "(this may take a few seconds)" *************** *** 520,523 **** --- 530,535 ---- !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS + ReserveFile "${NSISDIR}\Plugins\inetc.dll" + ReserveFile "${NSISDIR}\Plugins\System.dll" *************** *** 593,602 **** # Installer Section: POPFile IMAP component # ! # The NSISdl plugin cannot be used for these downloads because the server ! # does not specify the content length so this utility uses cURL instead. # - # To avoid opening console windows, the cURL output is sent to the log window - # (so no progress reports are displayed during the file download operation - # but we can display some statistics once the file has been downloaded). #-------------------------------------------------------------------------- --- 605,611 ---- # Installer Section: POPFile IMAP component # ! # The Inetc plugin is used here instead of the standard NSISdl plugin because the ! # server does not specify the content length. # #-------------------------------------------------------------------------- *************** *** 611,618 **** !define C_CVS_HISTORY_FILE "$PLUGINSDIR\cvslog.htm" - ; String used to define cURL report format - - !define C_CURL_REPORT "Downloaded %{size_download} bytes in %{time_total} seconds${IO_NL}Average speed: %{speed_download} bytes per second${IO_NL}" - Push ${L_HANDLE} Push ${L_RESULT} --- 620,623 ---- *************** *** 621,632 **** SetDetailsPrint textonly DetailPrint "$(PIU_LANG_PROG_INITIALISE)" - SetDetailsPrint none - - ; We cannot use the nsisdl plugin here because the server does not specify the content length - ; (see this script's header comment for information on where to obtain 'curl.exe') - - SetOutPath "$PLUGINSDIR" - File "curl.exe" - File "COPYING" SetDetailsPrint listonly --- 626,629 ---- *************** *** 642,654 **** check_param: ! StrCmp $G_REVISION "" look_for_suitable_version ! DetailPrint "User has requested IMAP.pm v$G_REVISION" Goto get_imap_module ! look_for_suitable_version: ! IfFileExists "$G_ROOTDIR\POPFile\Database.pm" look_for_most_recent_version ! StrCpy $G_REVISION "${C_PRE_23_COMPATIBLE_VERSION}" ! DetailPrint "Pre-0.23.0 installation found. Get most recent 0.22-compatible file (IMAP.pm v$G_REVISION)" ! Goto get_imap_module look_for_most_recent_version: --- 639,662 ---- check_param: ! StrCmp $G_REVISION "" look_for_compatible_version ! DetailPrint "$(PIU_LANG_PROG_CMDLINE_REQUEST)" Goto get_imap_module ! ;-------------------------------------------------------------------------- ! ; The user has not specified a particular revision so we try to get the most ! ; recent _compatible_ version. POPFile's module format was changed for the ! ; POPFile 0.23.0 release so any modules intended for 0.23.0 (or later) are ! ; no longer compatible with any of the earlier releases of POPFile. ! ;-------------------------------------------------------------------------- ! ! look_for_compatible_version: ! IfFileExists "$G_ROOTDIR\POPFile\Database.pm" use_main_trunk ! DetailPrint "$(PIU_LANG_PROG_PRE_23_FOUND)" ! StrCpy $G_REVISION ${C_PRE_23_PATHREV} ! Goto look_for_most_recent_version ! ! use_main_trunk: ! DetailPrint "$(PIU_LANG_PROG_MAIN_CVS_FOUND)" ! StrCpy $G_REVISION ${C_CVS_PATHREV} look_for_most_recent_version: *************** *** 656,661 **** DetailPrint "$(PIU_LANG_PROG_GETLIST) $(PIU_LANG_TAKE_A_FEW_SECONDS)" SetDetailsPrint listonly ! DetailPrint "" ! nsExec::ExecToLog '"curl.exe" -s -S -w "${C_CURL_REPORT}" -o "${C_CVS_HISTORY_FILE}" "${C_CVS_HISTORY_URL}"' Pop ${L_RESULT} DetailPrint "" --- 664,668 ---- DetailPrint "$(PIU_LANG_PROG_GETLIST) $(PIU_LANG_TAKE_A_FEW_SECONDS)" SetDetailsPrint listonly ! Inetc::get /CAPTION "CVS History log" /POPUP "${C_CVS_HISTORY_URL}$G_REVISION" "${C_CVS_HISTORY_FILE}" /END Pop ${L_RESULT} DetailPrint "" *************** *** 663,667 **** DetailPrint "$(PIU_LANG_PROG_CHECKDOWNLOAD)" SetDetailsPrint listonly ! StrCmp ${L_RESULT} "0" analyse_history StrCpy $G_PLS_FIELD_1 ${L_RESULT} SetDetailsPrint both --- 670,674 ---- DetailPrint "$(PIU_LANG_PROG_CHECKDOWNLOAD)" SetDetailsPrint listonly ! StrCmp ${L_RESULT} "OK" analyse_history StrCpy $G_PLS_FIELD_1 ${L_RESULT} SetDetailsPrint both *************** *** 680,684 **** Pop $G_REVISION StrCmp $G_REVISION "" analysis_failed ! DetailPrint "Search result: IMAP.pm v$G_REVISION ($G_REVDATE)" StrCpy $G_REVDATE "${MB_NL}${MB_NL}(CVS timestamp $G_REVDATE)" Goto get_imap_module --- 687,691 ---- Pop $G_REVISION StrCmp $G_REVISION "" analysis_failed ! DetailPrint "$(PIU_LANG_PROG_RESULTFOUND)" StrCpy $G_REVDATE "${MB_NL}${MB_NL}(CVS timestamp $G_REVDATE)" Goto get_imap_module *************** *** 697,701 **** DetailPrint "" SetDetailsPrint both ! DetailPrint "Ready to download IMAP.pm v$G_REVISION from CVS" SetDetailsPrint listonly MessageBox MB_YESNO|MB_ICONQUESTION "$(PIU_LANG_MB_GETPERMISSION)" IDYES download_imap --- 704,708 ---- DetailPrint "" SetDetailsPrint both ! DetailPrint "$(PIU_LANG_PROG_READYTODOWNLOAD)" SetDetailsPrint listonly MessageBox MB_YESNO|MB_ICONQUESTION "$(PIU_LANG_MB_GETPERMISSION)" IDYES download_imap *************** *** 711,716 **** DetailPrint "$(PIU_LANG_PROG_GETIMAP) $(PIU_LANG_TAKE_A_FEW_SECONDS)" SetDetailsPrint listonly ! DetailPrint "" ! nsExec::ExecToLog '"curl.exe" -s -S -w "${C_CURL_REPORT}" -o "$PLUGINSDIR\IMAP.pm" "${C_CVS_IMAP_DL_URL}"' Pop ${L_RESULT} DetailPrint "" --- 718,722 ---- DetailPrint "$(PIU_LANG_PROG_GETIMAP) $(PIU_LANG_TAKE_A_FEW_SECONDS)" SetDetailsPrint listonly ! Inetc::get /CAPTION "IMAP module" /POPUP "${C_CVS_IMAP_DL_URL}" "$PLUGINSDIR\IMAP.pm" /END Pop ${L_RESULT} DetailPrint "" *************** *** 718,722 **** DetailPrint "$(PIU_LANG_PROG_CHECKDOWNLOAD)" SetDetailsPrint listonly ! StrCmp ${L_RESULT} "0" file_received StrCpy $G_PLS_FIELD_1 ${L_RESULT} SetDetailsPrint both --- 724,728 ---- DetailPrint "$(PIU_LANG_PROG_CHECKDOWNLOAD)" SetDetailsPrint listonly ! StrCmp ${L_RESULT} "OK" file_received StrCpy $G_PLS_FIELD_1 ${L_RESULT} SetDetailsPrint both *************** *** 756,760 **** Pop $G_PLS_FIELD_1 DetailPrint "----------------------------------------------" ! DetailPrint "IMAP Updater failed ($G_PLS_FIELD_1)" DetailPrint "----------------------------------------------" Abort --- 762,766 ---- Pop $G_PLS_FIELD_1 DetailPrint "----------------------------------------------" ! DetailPrint "$(PIU_LANG_PROG_DOWNLOADFAILED)" DetailPrint "----------------------------------------------" Abort *************** *** 782,786 **** Pop $G_PLS_FIELD_1 DetailPrint "----------------------------------------------" ! DetailPrint "IMAP Updater completed $G_PLS_FIELD_1" DetailPrint "----------------------------------------------" DetailPrint "" --- 788,792 ---- Pop $G_PLS_FIELD_1 DetailPrint "----------------------------------------------" ! DetailPrint "$(PIU_LANG_PROG_UPDATECOMPLETED)" DetailPrint "----------------------------------------------" DetailPrint "" *************** *** 795,799 **** SetDetailsPrint both ! DetailPrint "Log report saved in '$G_ROOTDIR\updateimap.log'" SetDetailsPrint none --- 801,805 ---- SetDetailsPrint both ! DetailPrint "$(PIU_LANG_PROG_LOGLOCATION)" SetDetailsPrint none |
11 messages has been excluded from this view by a project administrator.
