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: <jgr...@us...> - 2003-07-13 02:40:38
|
Update of /cvsroot/popfile/engine/Test
In directory sc8-pr-cvs1:/tmp/cvs-serv21270/Test
Added Files:
SimpleProxy.pm
Log Message:
Make test suite run from within the tests/ subdirectory to avoid interference with an installed POPFile. You must now use the Makefile to execute tests. A outline of class that will be used for proxy testing and improve WordMangle tests
--- NEW FILE: SimpleProxy.pm ---
package Test::SimpleProxy;
use Proxy::Proxy;
@ISA = ("Proxy::Proxy");
# ---------------------------------------------------------------------------------------------
#
# A simple test proxy server for testing Proxy::Proxy
#
# Copyright (c) 2001-2003 John Graham-Cumming
#
# ---------------------------------------------------------------------------------------------
use strict;
use warnings;
use locale;
use IO::Handle;
use IO::Socket;
use IO::Select;
# A handy variable containing the value of an EOL for networks
my $eol = "\015\012";
#----------------------------------------------------------------------------
# new
#
# Class new() function
#----------------------------------------------------------------------------
sub new
{
my $type = shift;
my $self = Proxy::Proxy->new();
# Must call bless before attempting to call any methods
bless $self, $type;
$self->name( 'simple' );
return $self;
}
#----------------------------------------------------------------------------
# start_server
#
# Starts a phony remote server for the proxy to connect to
#----------------------------------------------------------------------------
sub start_server
{
my ( $self ) = @_;
# This socket will act as the server that the proxy is connecting to,
# SimpleProxy is used to connect to this server and proxy to and from
# it. The data sent to this socket is appended to {received__} and the
# data to be made available is appended to {send__}
$self->{remote_server__} = IO::Socket::INET->new( Proto => 'tcp',
LocalAddr => 'localhost',
LocalPort => 10000,
Listen => SOMAXCONN,
Reuse => 1 );
$self->{remote_selector__} = new IO::Select( $self->{remote_server__} );
}
#----------------------------------------------------------------------------
# service_server
#
# Called regularly to service connections to the phony server
#----------------------------------------------------------------------------
sub service_server
{
my ( $self ) = @_;
# If we have already accepted a connection then service it, otherwise
# check for connections
if ( defined( $self->{remote_client__} ) ) {
my $handle = $self->{remote_client__};
# If there's data in the send pipe then write it out line by line
while ( $self->{send__} =~ s/(.+)[\r\n]+// ) {
print $handle "$1$eol";
}
# If there's data available to read then read it into the received
if ( defined( $self->{remote_client_selector__}->can_read(0) ) ) {
$self->{received__} .= <$handle>;
$self->{received__} .= $eol;
}
} else {
if ( defined( $self->{remote_selector__}->can_read(0) ) ) {
$self->{remote_client__} = $self->{remote_server__}->accept();
$self->{remote_client_selector__} = new IO::Select( $self->{remote_client__} );
}
}
}
# Getter/setter
sub received
{
my ( $self ) = @_;
my $received = $self->{received__};
$self->{received__} = '';
return $received;
}
sub send
{
my ( $self, $line ) = @_;
$self->{send__} .= $line;
$self->{send__} .= $eol;
}
|
|
From: <jgr...@us...> - 2003-07-13 02:40:38
|
Update of /cvsroot/popfile/engine/Devel
In directory sc8-pr-cvs1:/tmp/cvs-serv21270/Devel
Modified Files:
TestCoverage.pm
Log Message:
Make test suite run from within the tests/ subdirectory to avoid interference with an installed POPFile. You must now use the Makefile to execute tests. A outline of class that will be used for proxy testing and improve WordMangle tests
Index: TestCoverage.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Devel/TestCoverage.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestCoverage.pm 12 Jul 2003 06:37:46 -0000 1.6
--- TestCoverage.pm 13 Jul 2003 02:40:35 -0000 1.7
***************
*** 46,55 ****
for my $file (keys %count)
{
! if ( ( $file =~ /^[^\/]/ ) && ( $file ne 'tests.pl' ) && !( $file =~ /^Test\// ) ) {
my $current_line = 0;
my $block_executed = 0;
open SOURCE_FILE, "<$file";
!
# Read in each line of the source file and keep track of whether
# it was executed or not using a new couple of keys in the
--- 46,55 ----
for my $file (keys %count)
{
! if ( ( $file =~ /^[^\/]/ ) && ( $file ne '../tests.pl' ) && !( $file =~ /^..\/\/Test\// ) ) {
my $current_line = 0;
my $block_executed = 0;
open SOURCE_FILE, "<$file";
!
# Read in each line of the source file and keep track of whether
# it was executed or not using a new couple of keys in the
***************
*** 90,94 ****
}
} else {
! # print "$file:$current_line $_" if ( $file =~/MailParse/);
}
}
--- 90,94 ----
}
} else {
! print "$file:$current_line $_" if ( $file =~/WordMangle/);
}
}
***************
*** 103,107 ****
foreach my $file (sort {$files{$b} <=> $files{$a}} keys %files) {
! print sprintf( "Coverage of %-32s %d%%\n", "$file...", $files{$file});
}
}
--- 103,110 ----
foreach my $file (sort {$files{$b} <=> $files{$a}} keys %files) {
! my $clean = $file;
! $clean =~ s/^\.\.\/\///;
!
! print sprintf( "Coverage of %-32s %d%%\n", "$clean...", $files{$file});
}
}
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv21270/tests
Modified Files:
TestBayes.tst TestConfiguration.tst TestLogger.tst
TestMailParse.tst TestMailParse019.clr TestProxy.tst
TestWordMangle.tst
Added Files:
Makefile
Log Message:
Make test suite run from within the tests/ subdirectory to avoid interference with an installed POPFile. You must now use the Makefile to execute tests. A outline of class that will be used for proxy testing and improve WordMangle tests
--- NEW FILE: Makefile ---
# POPFile Makefile
#
# This Makefile is used for the creation of POPFile packages
# and for testing
#
# Copyright (c) 2003 John Graham-Cummin
error:
$(error This needs to be called by the parent Makefile)
runtest:
@perl -I ../ $(DEBUGARGS) ../tests.pl $(TESTARGS)
Index: TestBayes.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestBayes.tst,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TestBayes.tst 11 Jul 2003 21:53:30 -0000 1.11
--- TestBayes.tst 13 Jul 2003 02:40:35 -0000 1.12
***************
*** 38,42 ****
$b->initialize();
- $b->config_( 'corpus', 'tests/corpus' );
$b->start();
--- 38,41 ----
***************
*** 59,63 ****
# to be parsed with the resulting classification in TestMailParse.cls
! my @class_tests = sort glob 'tests/TestMailParse*.msg';
for my $class_test (@class_tests) {
--- 58,62 ----
# to be parsed with the resulting classification in TestMailParse.cls
! my @class_tests = sort glob 'TestMailParse*.msg';
for my $class_test (@class_tests) {
***************
*** 78,82 ****
# to be sent through classify_and_modify
! $b->global_config_( 'msgdir', 'tests/' );
$b->module_config_( 'html', 'port', 8080 );
$b->module_config_( 'html', 'local', 1 );
--- 77,81 ----
# to be sent through classify_and_modify
! $b->global_config_( 'msgdir', '../tests/' );
$b->module_config_( 'html', 'port', 8080 );
$b->module_config_( 'html', 'local', 1 );
***************
*** 87,94 ****
$b->set_bucket_parameter( 'spam', 'subject', 1 );
! my @modify_tests = sort glob 'tests/TestMailParse*.msg';
for my $modify_file (@modify_tests) {
! if ( ( open MSG, "<$modify_file" ) && ( open OUTPUT, ">tests/temp.out" ) ) {
$b->classify_and_modify( \*MSG, \*OUTPUT, 0, 0, 0, '' );
close MSG;
--- 86,93 ----
$b->set_bucket_parameter( 'spam', 'subject', 1 );
! my @modify_tests = sort glob 'TestMailParse*.msg';
for my $modify_file (@modify_tests) {
! if ( ( open MSG, "<$modify_file" ) && ( open OUTPUT, ">temp.out" ) ) {
$b->classify_and_modify( \*MSG, \*OUTPUT, 0, 0, 0, '' );
close MSG;
***************
*** 99,103 ****
open CAM, "<$output_file";
! open OUTPUT, "<tests/temp.out";
while ( <OUTPUT> ) {
my $output_line = $_;
--- 98,102 ----
open CAM, "<$output_file";
! open OUTPUT, "<temp.out";
while ( <OUTPUT> ) {
my $output_line = $_;
***************
*** 110,116 ****
close CAM;
close OUTPUT;
! unlink( 'tests/popfile0=0.msg' );
! unlink( 'tests/popfile0=0.cls' );
! unlink( 'tests/temp.out' );
}
}
--- 109,115 ----
close CAM;
close OUTPUT;
! unlink( 'popfile0=0.msg' );
! unlink( 'popfile0=0.cls' );
! unlink( 'temp.out' );
}
}
Index: TestConfiguration.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestConfiguration.tst,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestConfiguration.tst 12 Jul 2003 05:59:02 -0000 1.2
--- TestConfiguration.tst 13 Jul 2003 02:40:35 -0000 1.3
***************
*** 54,61 ****
# Check that the PID file gets created and then deleted and
# contains the correct process ID
! $c->config_( 'piddir', 'tests/' );
test_assert_equal( $c->start(), 1 );
! test_assert( ( -e 'tests/popfile.pid' ) );
! open PIDFILE, '<tests/popfile.pid';
my $pid = <PIDFILE>;
close PIDFILE;
--- 54,61 ----
# Check that the PID file gets created and then deleted and
# contains the correct process ID
! $c->config_( 'piddir', '../tests/' );
test_assert_equal( $c->start(), 1 );
! test_assert( ( -e 'popfile.pid' ) );
! open PIDFILE, '<popfile.pid';
my $pid = <PIDFILE>;
close PIDFILE;
***************
*** 65,69 ****
close STDERR;
$c->stop();
! test_assert( !( -e 'tests/popfile.pid' ) );
# Check that parameter upgrading works
--- 65,69 ----
close STDERR;
$c->stop();
! test_assert( !( -e 'popfile.pid' ) );
# Check that parameter upgrading works
Index: TestLogger.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestLogger.tst,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestLogger.tst 9 Jul 2003 18:18:25 -0000 1.1
--- TestLogger.tst 13 Jul 2003 02:40:35 -0000 1.2
***************
*** 37,44 ****
# Change the log locatioin
! $l->config_( 'logdir', 'tests/' );
! test_assert_equal( $l->config_('logdir'), 'tests/' );
$l->calculate_today__();
! test_assert_regexp( $l->debug_filename(), 'tests/' );
# Test that the last ten functionality works
--- 37,45 ----
# Change the log locatioin
! $l->config_( 'logdir', '../tests/' );
! test_assert_equal( $l->config_('logdir'), '../tests/' );
$l->calculate_today__();
! test_assert_regexp( $l->debug_filename(), '../tests/' );
! unlink( $l->debug_filename() );
# Test that the last ten functionality works
Index: TestMailParse.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse.tst,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TestMailParse.tst 12 Jul 2003 06:17:03 -0000 1.10
--- TestMailParse.tst 13 Jul 2003 02:40:35 -0000 1.11
***************
*** 39,43 ****
$b->initialize();
- $b->config_( 'corpus', 'tests/corpus' );
$b->start();
--- 39,42 ----
***************
*** 141,145 ****
# to be parsed with the resulting values for the words hash in TestMailParse\d+.wrd
! my @parse_tests = sort glob 'tests/TestMailParse*.msg';
for my $parse_test (@parse_tests) {
--- 140,144 ----
# to be parsed with the resulting values for the words hash in TestMailParse\d+.wrd
! my @parse_tests = sort glob 'TestMailParse*.msg';
for my $parse_test (@parse_tests) {
***************
*** 162,178 ****
# Check that from, to and subject get set correctly when parsing a message
! $cl->parse_file( 'tests/TestMailParse013.msg' );
test_assert_equal( $cl->{from__}, 'RN <rr...@nn...>' );
test_assert_equal( $cl->{to__}, '"Armlet Forum" <arm...@ne...>' );
test_assert_equal( $cl->{subject__}, '(Archive Copy) RE: CW v9 and armlets...' );
! $cl->parse_file( 'tests/TestMailParse018.msg' );
$cl->{to__} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
test_assert_equal( $1, 'bug...@re...' );
! $cl->parse_file( 'tests/TestMailParse019.msg' );
$cl->{to__} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
test_assert_equal( $1, 'bug...@re...' );
# Check that multi-line To: and CC: headers get handled properly
! $cl->parse_file( 'tests/TestMailParse021.msg' );
$cl->{to__} =~ s/[\r\n]//g;
test_assert_equal( $cl->{to__}, 'ds...@ct..., ds...@do..., ds...@di..., ds...@di..., ds...@cr..., <ds...@cy...>, <ds...@do...>, <ds...@db...>, <ds...@cs...> , <ds...@cr...>, <ds...@dr...>, <ds...@cv...>, <ds...@dm...>, <ds...@da...>, <ds...@da...>' );
--- 161,177 ----
# Check that from, to and subject get set correctly when parsing a message
! $cl->parse_file( 'TestMailParse013.msg' );
test_assert_equal( $cl->{from__}, 'RN <rr...@nn...>' );
test_assert_equal( $cl->{to__}, '"Armlet Forum" <arm...@ne...>' );
test_assert_equal( $cl->{subject__}, '(Archive Copy) RE: CW v9 and armlets...' );
! $cl->parse_file( 'TestMailParse018.msg' );
$cl->{to__} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
test_assert_equal( $1, 'bug...@re...' );
! $cl->parse_file( 'TestMailParse019.msg' );
$cl->{to__} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
test_assert_equal( $1, 'bug...@re...' );
# Check that multi-line To: and CC: headers get handled properly
! $cl->parse_file( 'TestMailParse021.msg' );
$cl->{to__} =~ s/[\r\n]//g;
test_assert_equal( $cl->{to__}, 'ds...@ct..., ds...@do..., ds...@di..., ds...@di..., ds...@cr..., <ds...@cy...>, <ds...@do...>, <ds...@db...>, <ds...@cs...> , <ds...@cr...>, <ds...@dr...>, <ds...@cv...>, <ds...@dm...>, <ds...@da...>, <ds...@da...>' );
***************
*** 182,186 ****
# Test colorization
! my @color_tests = sort glob 'tests/TestMailParse019.msg';
for my $color_test (@color_tests) {
--- 181,185 ----
# Test colorization
! my @color_tests = ( 'TestMailParse019.msg' );
for my $color_test (@color_tests) {
Index: TestMailParse019.clr
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse019.clr,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse019.clr 12 Jul 2003 06:17:03 -0000 1.1
--- TestMailParse019.clr 13 Jul 2003 02:40:35 -0000 1.2
***************
*** 1 ****
! <tt><b><font color="black">Return-Path</font></b>: <<b><font color="black">bu...@dr...</font></b>><br /><b><font color="black">Delivered-To</font></b>: run@mail.<b><font color="black">tepkom</font></b>.ru<br /><b><font color="black">Received</font></b>: by mail.<b><font color="black">tepkom</font></b>.ru (<b><font color="black">Postfix</font></b>)<br /> id 70071971F2; Wed, 29 Jan 2003 20:30:49 +0300 (<b><font color="black">MSK</font></b>)<br /><b><font color="black">Delivered-To</font></b>: rescuebre@<b><font color="black">tepkom</font></b>.ru<br /><b><font color="black">Received</font></b>: from localhost (localhost [<b><font color="brown">127.0.0.1</font></b>])<br /> by mail.<b><font color="black">tepkom</font></b>.ru (<b><font color="black">Postfix</font></b>) with SMTP<br /> id 6474D971FA; Wed, 29 Jan 2003 20:30:49 +0300 (<b><font color="black">MSK</font></b>)<br /><b><font color="black">Received</font></b>: from <b><font color="black">keymaster.<b><font color="black">relativity.com</font></b></font></b> (<b><font color="black">keymaster.<b><font color="black">relativity.com</font></b></font></b> [<b><font color="black">12.146.171.10</font></b>])<br /> by mail.<b><font color="black">tepkom</font></b>.ru (<b><font color="black">Postfix</font></b>) with ESMTP<br /> id 93510971F2; Wed, 29 Jan 2003 20:30:47 +0300 (<b><font color="black">MSK</font></b>)<br /><b><font color="black">Received</font></b>: from <b><font color="black">rtfm</font></b> (<b><font color="black">rtfm.<b><font color="black">relativity.com</font></b></font></b> [<b><font color="black">63.100.138.144</font></b>]) by <b><font color="black">keymaster.<b><font color="black">relativity.com</font></b></font></b> with SMTP (<b><font color="green">Microsoft</font></b> <b><font color="green">Exchange</font></b> <b><font color="brown">Internet</font></b> Mail <b><font color="green">Service</font></b> <b><font color="brown">Version</font></b> 5.5.2653.13)<br /> id D4Z7<b><font color="black">ASMC</font></b>; Wed, 29 Jan 2003 12:28:21 -0500<br /><b><font color="black">To</font></b>: <b><font color="black">elia@<b><font color="black">tepkom.ru</font></b></font></b>, <b><font color="black">rescuebre@<b><font color="black">tepkom.ru</font></b></font></b>, <b><font color="black">kcruz@<b><font color="black">relativity.com</font></b></font></b>, <b><font color="black">bugtracker@<b><font color="black">relativity.com</font></b></font></b><br /><b><font color="black">Date</font></b>: Wed, 29 Jan 03 12:28:29<br /><b><font color="black">From</font></b>: <<b><font color="black">bugs@<b><font color="black">drunin.net</font></b></font></b>><br /><b><font color="black">Subject</font></b>: VI ID: 24149 Status: <b><font color="black">Dev</font></b> <b><font color="black">Confirmed</font></b> <b><font color="black">Fix</font></b> <b><font color="black">Sev</font></b>: 1<br /><b><font color="black">MIME-Version</font></b>: 1.0<br /><b><font color="black">Content-Type</font></b>: multipart/mixed; boundary="isboundary"<br /><b><font color="black">Message-Id</font></b>: <200...@ma...><br /><b><font color="black">X-Text-Classification</font></b>: lists<br /><b><font color="black">X-POPFile-Link</font></b>: <http://<b><font color="brown">127.0.0.1</font></b>:8080/<b><font color="black">jump</font></b>_to_message?view=popfile523=1.<b><font color="black">msg</font></b>><br /><br />--isboundary<br /><b><font color="black">Content-Type</font></b>: text/html; charset=<b><font color="green">us-ascii</font></b><br /><br /><HTML><HEAD><br /><BODY><br /><DIV><B><FONT size=4><b><font color="black">Visual</font></b> <b><font color="black">Intercept</font></b> <b><font color="black">Notification</font></b>:</FONT></B></DIV><BR><br /><TABLE border rules=groups><br /> <TBODY><br /> <TR><br /> <TD><B><b><font color="black">Incident</font></b>:</B></TD><br /> <TD><br /> <A href="http://<b><font color="black">rtfm.<b><font color="black">relativity.com</font></b></font></b>/VIWeb/default.asp?type=incident&name=24149">24149</A><br /> (<A href="http://<b><font color="black">vi.<b><font color="black">relativity.com</font></b></font></b>/VIWeb/default.asp?type=incident&name=24149"><b><font color="brown">Alternative</font></b> <br /><b><font color="brown">server</font></b></A>)<br /> </TD><br /> <TD WIDTH="20%"><TD><TD><TD></TR><br /> <TBODY><br /> <TR><br /> <TD><B>Subject:</B></TD><br /> <TD COLSPAN=5><b><font color="black">Internal</font></b> <b><font color="brown">error</font></b> in <b><font color="black">BRE</font></b>.<b><font color="brown">dll</font></b></TD></TR><br /> <TBODY><br /> <TR><br /> <TD><B><b><font color="brown">Project</font></b>:</B></TD><br /> <TD COLSPAN=5>/<b><font color="green">Program</font></b>/RW/<b><font color="black">Cobol</font></b>/<b><font color="black">BRE</font></b>/<b><font color="brown">Structure</font></b> <b><font color="green">Based</font></b></TD></TR><br /> <TR><br /> <TD><B><b><font color="brown">Version</font></b>:</B></TD><br /> <TD COLSPAN=5>7.1.00</TD></TR><br /> <TR><br /> <TD><B><b><font color="black">Release</font></b>:</B></TD><br /> <TD COLSPAN=5></TD></TR><br /> <TR><br /> <TD><B><b><font color="brown">Build</font></b>:</B></TD><br /> <TD COLSPAN=5></TD></TR><br /> <TBODY><br /> <TR><br /> <TD><B><b><font color="green">Customer</font></b>:</B></TD><br /> <TD COLSPAN=5><b><font color="black">INTERNAL</font></b></TD></TR><br /> <TBODY><br /> <TR><br /> <TD><B>Status:</B></TD><br /> <TD><b><font color="brown">Dev</font></b> <b><font color="brown">Confirmed</font></b> <b><font color="black">Fix</font></b></TD><TD><br /> <TD><B><b><font color="black">AssignID</font></b>:</B></TD><br /> <TD><b><font color="black">snd</font></b></TD><br /> <TD>1/29/2003 10:16:01 AM</TD></TR><br /> <TR><br /> <TD><B><b><font color="black">Priority</font></b>:</B></TD><br /> <TD><b><font color="brown">High</font></b></TD><TD><br /> <TD><B><b><font color="black">RequestID</font></b>:</B></TD><br /> <TD><b><font color="black">elia</font></b></TD><br /> <TD>1/29/2003 10:16:01 AM</TD></TR><br /> <TR><br /> <TD><B><b><font color="black">Severity</font></b>:</B></TD><br /> <TD>1</TD><TD><br /> <TD><B><b><font color="black">QAID</font></b>:</B></TD><br /> <TD><b><font color="black">elia</font></b></TD><br /> <TD>1/29/2003 10:16:01 AM</TD></TR><br /> <TR><br /> <TD><B><b><font color="black">Category</font></b>:</B></TD><br /> <TD><b><font color="black">BRE</font></b></TD><TD><br /> <TD><B><b><font color="black">ChangeID</font></b>:</B></TD><br /> <TD><b><font color="black">snd</font></b></TD><br /> <TD>1/29/2003 12:26:59 PM</TD></TR><br /> <TBODY><br /> <TR><br /> <TD vAlign=top><B><b><font color="brown">Description</font></b>:</B></TD><br /> <TD COLSPAN=5><TEXTAREA READONLY ROWS=10 COLS=60>FROM:<b><font color="black">elia</font></b> DATE:01/29/2003 10:16:01 <br /><br /> The "<b><font color="black">Internal</font></b> <b><font color="brown">error</font></b> in <b><font color="black">BRE</font></b>.<b><font color="brown">dll</font></b>" message is <b><font color="black">generated</font></b> <b><font color="green">when</font></b> <b><font color="brown">structure</font></b> <b><font color="green">based</font></b> <b><font color="black">slice</font></b><br /> is <b><font color="black">extracted</font></b> from <b><font color="green">program</font></b> <b><font color="brown">which</font></b> has been <b><font color="black">verified</font></b> with "<b><font color="green">Perform</font></b> <b><font color="green">Program</font></b> <b><font color="green">analysis</font></b> = no"<br /> and at the <b><font color="green">same</font></b> <b><font color="green">time</font></b> <b><font color="black">BRE</font></b> <b><font color="brown">option</font></b> "<b><font color="green">Ensure</font></b> <b><font color="black">consistent</font></b> <b><font color="green">access</font></b> to <b><font color="black">external</font></b> <b><font color="brown">resources</font></b> = yes".<br /><br /> The <b><font color="black">correct</font></b> <b><font color="brown">error</font></b> message <b><font color="green">should</font></b> be <b><font color="black">generated</font></b>.<br /><br /> "<b><font color="brown">Severe</font></b> Re-<b><font color="black">verify</font></b> the <b><font color="green">program</font></b> with '<b><font color="green">Perform</font></b> <b><font color="green">program</font></b> <b><font color="black">analysis'</font></b> <b><font color="brown">option</font></b> <b><font color="green">set</font></b>".<br /><br /><br /> <b><font color="black">Test</font></b>:MEDIUM\\RescueWin\archives\VS-cobol\Computation\<b><font color="black">Logical</font></b>-path\<b><font color="green">CALL</font></b>-accept4.<b><font color="black">CBL</font></b> <br /><br /> *|<b><font color="green">Start</font></b> <b><font color="brown">paragraph</font></b>: p1<br /> *|<b><font color="brown">Last</font></b> <b><font color="brown">paragraph</font></b>: p1<br /><br /> 1015 <b><font color="green">blue</font></b>.<br /><br />FROM:<b><font color="black">snd</font></b> DATE:<b><font color="green">Wednesday</font></b>, <b><font color="green">January</font></b> 29, 2003 11:52:45 AM <br /><br /><b><font color="green">Fixed</font></b> in <b><font color="green">Blue</font></b>. No <b><font color="black">warning</font></b> in this <b><font color="green">case</font></b>, <b><font color="black">BRE</font></b> <b><font color="black">runs</font></b> <b><font color="black">DFA</font></b> <b><font color="black">instead</font></b>.<br /></TEXTAREA></TD></TR><br /> <TR><br /> <TD vAlign=top><B><b><font color="black">Resolution</font></b>:</B></TD><br /> <TD COLSPAN=5><TEXTAREA READONLY ROWS=10 COLS=60></TEXTAREA></TD></TR><br /> <TR><br /> <TD vAlign=top><B><b><font color="black">WorkAround</font></b>:</B></TD><br /> <TD COLSPAN=5><TEXTAREA READONLY ROWS=10 COLS=60></TEXTAREA></TD></TR></TBODY></TABLE><br /><HR><br />If you have received this <b><font color="green">email</font></b> in <b><font color="brown">error</font></b>, <b><font color="green">please</font></b> <b><font color="black">respond</font></b> to: <A <br />href="mailto:BugTracker@<b><font color="black">relativity.com</font></b>">Bug...@re...</A> <br /><HR><br /></BODY></HTML><br /><br />--isboundary--<br /><br /><br /></tt>
--- 1 ----
! <tt><b><font color="black">Return-Path</font></b>: <<b><font color="black">bu...@dr...</font></b>><br /><b><font color="black">Delivered-To</font></b>: run@<b><font color="black">mail</font></b>.<b><font color="black">tepkom</font></b>.ru<br /><b><font color="black">Received</font></b>: by <b><font color="black">mail</font></b>.<b><font color="black">tepkom</font></b>.ru (<b><font color="black">Postfix</font></b>)<br /> id 70071971F2; <b><font color="black">Wed</font></b>, 29 <b><font color="black">Jan</font></b> 2003 20:30:49 +0300 (<b><font color="black">MSK</font></b>)<br /><b><font color="black">Delivered-To</font></b>: rescuebre@<b><font color="black">tepkom</font></b>.ru<br /><b><font color="black">Received</font></b>: <b><font color="black">from</font></b> <b><font color="black">localhost</font></b> (<b><font color="black">localhost</font></b> [<b><font color="brown">127.0.0.1</font></b>])<br /> by <b><font color="black">mail</font></b>.<b><font color="black">tepkom</font></b>.ru (<b><font color="black">Postfix</font></b>) <b><font color="black">with</font></b> <b><font color="black">SMTP</font></b><br /> id 6474D971FA; <b><font color="black">Wed</font></b>, 29 <b><font color="black">Jan</font></b> 2003 20:30:49 +0300 (<b><font color="black">MSK</font></b>)<br /><b><font color="black">Received</font></b>: <b><font color="black">from</font></b> <b><font color="black">keymaster.<b><font color="black">relativity.com</font></b></font></b> (<b><font color="black">keymaster.<b><font color="black">relativity.com</font></b></font></b> [<b><font color="black">12.146.171.10</font></b>])<br /> by <b><font color="black">mail</font></b>.<b><font color="black">tepkom</font></b>.ru (<b><font color="black">Postfix</font></b>) <b><font color="black">with</font></b> <b><font color="black">ESMTP</font></b><br /> id 93510971F2; <b><font color="black">Wed</font></b>, 29 <b><font color="black">Jan</font></b> 2003 20:30:47 +0300 (<b><font color="black">MSK</font></b>)<br /><b><font color="black">Received</font></b>: <b><font color="black">from</font></b> <b><font color="black">rtfm</font></b> (<b><font color="black">rtfm.<b><font color="black">relativity.com</font></b></font></b> [<b><font color="black">63.100.138.144</font></b>]) by <b><font color="black">keymaster.<b><font color="black">relativity.com</font></b></font></b> <b><font color="black">with</font></b> <b><font color="black">SMTP</font></b> (<b><font color="green">Microsoft</font></b> <b><font color="green">Exchange</font></b> <b><font color="brown">Internet</font></b> <b><font color="black">Mail</font></b> <b><font color="green">Service</font></b> <b><font color="brown">Version</font></b> 5.5.2653.13)<br /> id D4Z7<b><font color="black">ASMC</font></b>; <b><font color="black">Wed</font></b>, 29 <b><font color="black">Jan</font></b> 2003 12:28:21 -0500<br /><b><font color="black">To</font></b>: <b><font color="black">elia@<b><font color="black">tepkom.ru</font></b></font></b>, <b><font color="black">rescuebre@<b><font color="black">tepkom.ru</font></b></font></b>, <b><font color="black">kcruz@<b><font color="black">relativity.com</font></b></font></b>, <b><font color="black">bugtracker@<b><font color="black">relativity.com</font></b></font></b><br /><b><font color="black">Date</font></b>: <b><font color="black">Wed</font></b>, 29 <b><font color="black">Jan</font></b> 03 12:28:29<br /><b><font color="black">From</font></b>: <<b><font color="black">bugs@<b><font color="black">drunin.net</font></b></font></b>><br /><b><font color="black">Subject</font></b>: VI ID: 24149 <b><font color="black">Status</font></b>: <b><font color="black">Dev</font></b> <b><font color="black">Confirmed</font></b> <b><font color="black">Fix</font></b> <b><font color="black">Sev</font></b>: 1<br /><b><font color="black">MIME-Version</font></b>: 1.0<br /><b><font color="black">Content-Type</font></b>: multipart/mixed; boundary="isboundary"<br /><b><font color="black">Message-Id</font></b>: <200...@ma...><br /><b><font color="black">X-Text-Classification</font></b>: lists<br /><b><font color="black">X-POPFile-Link</font></b>: <<b><font color="black">http</font></b>://<b><font color="brown">127.0.0.1</font></b>:8080/<b><font color="black">jump</font></b>_to_<b><font color="black">message</font></b>?view=popfile523=1.<b><font color="black">msg</font></b>><br /><br />--isboundary<br /><b><font color="black">Content-Type</font></b>: text/html; charset=<b><font color="green">us-ascii</font></b><br /><br /><HTML><HEAD><br /><BODY><br /><DIV><B><FONT size=4><b><font color="black">Visual</font></b> <b><font color="black">Intercept</font></b> <b><font color="black">Notification</font></b>:</FONT></B></DIV><BR><br /><TABLE border rules=groups><br /> <TBODY><br /> <TR><br /> <TD><B><b><font color="black">Incident</font></b>:</B></TD><br /> <TD><br /> <A href="http://<b><font color="black">rtfm.<b><font color="black">relativity.com</font></b></font></b>/VIWeb/default.asp?type=incident&name=24149">24149</A><br /> (<A href="http://<b><font color="black">vi.<b><font color="black">relativity.com</font></b></font></b>/VIWeb/default.asp?type=incident&name=24149"><b><font color="brown">Alternative</font></b> <br /><b><font color="brown">server</font></b></A>)<br /> </TD><br /> <TD WIDTH="20%"><TD><TD><TD></TR><br /> <TBODY><br /> <TR><br /> <TD><B><b><font color="black">Subject</font></b>:</B></TD><br /> <TD COLSPAN=5><b><font color="black">Internal</font></b> <b><font color="brown">error</font></b> in <b><font color="black">BRE</font></b>.<b><font color="brown">dll</font></b></TD></TR><br /> <TBODY><br /> <TR><br /> <TD><B><b><font color="brown">Project</font></b>:</B></TD><br /> <TD COLSPAN=5>/<b><font color="green">Program</font></b>/RW/<b><font color="black">Cobol</font></b>/<b><font color="black">BRE</font></b>/<b><font color="brown">Structure</font></b> <b><font color="green">Based</font></b></TD></TR><br /> <TR><br /> <TD><B><b><font color="brown">Version</font></b>:</B></TD><br /> <TD COLSPAN=5>7.1.00</TD></TR><br /> <TR><br /> <TD><B><b><font color="black">Release</font></b>:</B></TD><br /> <TD COLSPAN=5></TD></TR><br /> <TR><br /> <TD><B><b><font color="brown">Build</font></b>:</B></TD><br /> <TD COLSPAN=5></TD></TR><br /> <TBODY><br /> <TR><br /> <TD><B><b><font color="green">Customer</font></b>:</B></TD><br /> <TD COLSPAN=5><b><font color="black">INTERNAL</font></b></TD></TR><br /> <TBODY><br /> <TR><br /> <TD><B><b><font color="black">Status</font></b>:</B></TD><br /> <TD><b><font color="brown">Dev</font></b> <b><font color="brown">Confirmed</font></b> <b><font color="black">Fix</font></b></TD><TD><br /> <TD><B><b><font color="black">AssignID</font></b>:</B></TD><br /> <TD><b><font color="black">snd</font></b></TD><br /> <TD>1/29/2003 10:16:01 AM</TD></TR><br /> <TR><br /> <TD><B><b><font color="black">Priority</font></b>:</B></TD><br /> <TD><b><font color="brown">High</font></b></TD><TD><br /> <TD><B><b><font color="black">RequestID</font></b>:</B></TD><br /> <TD><b><font color="black">elia</font></b></TD><br /> <TD>1/29/2003 10:16:01 AM</TD></TR><br /> <TR><br /> <TD><B><b><font color="black">Severity</font></b>:</B></TD><br /> <TD>1</TD><TD><br /> <TD><B><b><font color="black">QAID</font></b>:</B></TD><br /> <TD><b><font color="black">elia</font></b></TD><br /> <TD>1/29/2003 10:16:01 AM</TD></TR><br /> <TR><br /> <TD><B><b><font color="black">Category</font></b>:</B></TD><br /> <TD><b><font color="black">BRE</font></b></TD><TD><br /> <TD><B><b><font color="black">ChangeID</font></b>:</B></TD><br /> <TD><b><font color="black">snd</font></b></TD><br /> <TD>1/29/2003 12:26:59 PM</TD></TR><br /> <TBODY><br /> <TR><br /> <TD vAlign=top><B><b><font color="brown">Description</font></b>:</B></TD><br /> <TD COLSPAN=5><TEXTAREA READONLY ROWS=10 COLS=60><b><font color="black">FROM</font></b>:<b><font color="black">elia</font></b> <b><font color="black">DATE</font></b>:01/29/2003 10:16:01 <br /><br /> <b><font color="black">The</font></b> "<b><font color="black">Internal</font></b> <b><font color="brown">error</font></b> in <b><font color="black">BRE</font></b>.<b><font color="brown">dll</font></b>" <b><font color="black">message</font></b> is <b><font color="black">generated</font></b> <b><font color="green">when</font></b> <b><font color="brown">structure</font></b> <b><font color="green">based</font></b> <b><font color="black">slice</font></b><br /> is <b><font color="black">extracted</font></b> <b><font color="black">from</font></b> <b><font color="green">program</font></b> <b><font color="brown">which</font></b> <b><font color="black">has</font></b> <b><font color="black">been</font></b> <b><font color="black">verified</font></b> <b><font color="black">with</font></b> "<b><font color="green">Perform</font></b> <b><font color="green">Program</font></b> <b><font color="green">analysis</font></b> = no"<br /> <b><font color="black">and</font></b> at <b><font color="black">the</font></b> <b><font color="green">same</font></b> <b><font color="green">time</font></b> <b><font color="black">BRE</font></b> <b><font color="brown">option</font></b> "<b><font color="green">Ensure</font></b> <b><font color="black">consistent</font></b> <b><font color="green">access</font></b> to <b><font color="black">external</font></b> <b><font color="brown">resources</font></b> = <b><font color="black">yes</font></b>".<br /><br /> <b><font color="black">The</font></b> <b><font color="black">correct</font></b> <b><font color="brown">error</font></b> <b><font color="black">message</font></b> <b><font color="green">should</font></b> be <b><font color="black">generated</font></b>.<br /><br /> "<b><font color="brown">Severe</font></b> Re-<b><font color="black">verify</font></b> <b><font color="black">the</font></b> <b><font color="green">program</font></b> <b><font color="black">with</font></b> '<b><font color="green">Perform</font></b> <b><font color="green">program</font></b> <b><font color="black">analysis'</font></b> <b><font color="brown">option</font></b> <b><font color="green">set</font></b>".<br /><br /><br /> <b><font color="black">Test</font></b>:MEDIUM\\RescueWin\archives\VS-cobol\Computation\<b><font color="black">Logical</font></b>-path\<b><font color="green">CALL</font></b>-accept4.<b><font color="black">CBL</font></b> <br /><br /> *|<b><font color="green">Start</font></b> <b><font color="brown">paragraph</font></b>: p1<br /> *|<b><font color="brown">Last</font></b> <b><font color="brown">paragraph</font></b>: p1<br /><br /> 1015 <b><font color="green">blue</font></b>.<br /><br /><b><font color="black">FROM</font></b>:<b><font color="black">snd</font></b> <b><font color="black">DATE</font></b>:<b><font color="green">Wednesday</font></b>, <b><font color="green">January</font></b> 29, 2003 11:52:45 AM <br /><br /><b><font color="green">Fixed</font></b> in <b><font color="green">Blue</font></b>. No <b><font color="black">warning</font></b> in <b><font color="black">this</font></b> <b><font color="green">case</font></b>, <b><font color="black">BRE</font></b> <b><font color="black">runs</font></b> <b><font color="black">DFA</font></b> <b><font color="black">instead</font></b>.<br /></TEXTAREA></TD></TR><br /> <TR><br /> <TD vAlign=top><B><b><font color="black">Resolution</font></b>:</B></TD><br /> <TD COLSPAN=5><TEXTAREA READONLY ROWS=10 COLS=60></TEXTAREA></TD></TR><br /> <TR><br /> <TD vAlign=top><B><b><font color="black">WorkAround</font></b>:</B></TD><br /> <TD COLSPAN=5><TEXTAREA READONLY ROWS=10 COLS=60></TEXTAREA></TD></TR></TBODY></TABLE><br /><HR><br />If <b><font color="black">you</font></b> <b><font color="black">have</font></b> <b><font color="black">received</font></b> <b><font color="black">this</font></b> <b><font color="green">email</font></b> in <b><font color="brown">error</font></b>, <b><font color="green">please</font></b> <b><font color="black">respond</font></b> to: <A <br />href="mailto:BugTracker@<b><font color="black">relativity.com</font></b>">Bug...@re...</A> <br /><HR><br /></BODY></HTML><br /><br />--isboundary--<br /><br /><br /></tt>
\ No newline at end of file
Index: TestProxy.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestProxy.tst,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestProxy.tst 12 Jul 2003 18:47:34 -0000 1.1
--- TestProxy.tst 13 Jul 2003 02:40:35 -0000 1.2
***************
*** 44,46 ****
--- 44,57 ----
test_assert_equal( $p->{classifier__}, 'foo' );
+ # Test the helper methods of Proxy
+ use Test::SimpleProxy;
+ my $sp = new Test::SimpleProxy;
+ $sp->configuration( $c );
+ $sp->mq( $mq );
+ $sp->logger( $l );
+
+ $sp->initialize();
+ $sp->config_( 'port', 9999 );
+ test_assert_equal( $sp->start(), 1 );
+ $sp->start_server();
Index: TestWordMangle.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestWordMangle.tst,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestWordMangle.tst 12 Jul 2003 06:37:46 -0000 1.1
--- TestWordMangle.tst 13 Jul 2003 02:40:35 -0000 1.2
***************
*** 53,54 ****
--- 53,61 ----
test_assert( $found );
test_assert_equal( $w->remove_stopword( 'bigword' ), 1 );
+
+ # Make sure that stopping and starting reloads the stopwords
+ test_assert_equal( $w->add_stopword( 'anotherbigword' ), 1 );
+ my $w2 = new Classifier::WordMangle;
+ my @stopwords = $w2->stopwords();
+ test_assert_equal( $#stopwords, 0 );
+ test_assert_equal( $stopwords[0], 'anotherbigword' );
|
|
From: <jgr...@us...> - 2003-07-13 02:40:38
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1:/tmp/cvs-serv21270 Modified Files: Makefile tests.pl Log Message: Make test suite run from within the tests/ subdirectory to avoid interference with an installed POPFile. You must now use the Makefile to execute tests. A outline of class that will be used for proxy testing and improve WordMangle tests Index: Makefile =================================================================== RCS file: /cvsroot/popfile/engine/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 9 Jul 2003 18:18:09 -0000 1.12 --- Makefile 13 Jul 2003 02:40:35 -0000 1.13 *************** *** 29,33 **** @echo with arguments '$(TESTARGS)' endif ! @perl -d:TestCoverage tests.pl $(TESTARGS) test: --- 29,33 ---- @echo with arguments '$(TESTARGS)' endif ! @$(MAKE) --no-print-directory -C tests runtest TESTARGS=$(TESTARGS) DEBUGARGS=-d:TestCoverage test: *************** *** 36,40 **** @echo with arguments '$(TESTARGS)' endif ! @perl tests.pl $(TESTARGS) # windows builds the Windows installer --- 36,40 ---- @echo with arguments '$(TESTARGS)' endif ! @$(MAKE) --no-print-directory -C tests runtest TESTARGS=$(TESTARGS) DEBUGARGS= # windows builds the Windows installer Index: tests.pl =================================================================== RCS file: /cvsroot/popfile/engine/tests.pl,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** tests.pl 12 Jul 2003 06:17:03 -0000 1.19 --- tests.pl 13 Jul 2003 02:40:35 -0000 1.20 *************** *** 133,137 **** # MAIN ! my @tests = glob 'tests/*.tst'; # Either match all the possible tests, or take the first argument --- 133,137 ---- # MAIN ! my @tests = glob '*.tst'; # Either match all the possible tests, or take the first argument |
|
From: <xue...@us...> - 2003-07-12 23:23:22
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv30690
Modified Files:
installer.nsi
Log Message:
Gave the "Installer Language" window a less confusing title.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** installer.nsi 12 Jul 2003 15:46:14 -0000 1.86
--- installer.nsi 12 Jul 2003 23:23:20 -0000 1.87
***************
*** 294,302 ****
;-----------------------------------------
; Always show the language selection dialog, even if a language has been stored in the
; registry (the language stored in the registry will be selected as the default language)
!define MUI_LANGDLL_ALWAYSSHOW
!
; Remember user's language selection and offer this as the default when re-installing
; (uninstaller also uses this setting to determine which language is to be used)
--- 294,307 ----
;-----------------------------------------
+ ; Same "Language selection" dialog is used for the installer and the uninstaller
+ ; so we override the standard "Installer Language" title to avoid confusion.
+
+ !define MUI_TEXT_LANGDLL_WINDOWTITLE "Language Selection"
+
; Always show the language selection dialog, even if a language has been stored in the
; registry (the language stored in the registry will be selected as the default language)
!define MUI_LANGDLL_ALWAYSSHOW
!
; Remember user's language selection and offer this as the default when re-installing
; (uninstaller also uses this setting to determine which language is to be used)
|
|
From: <xue...@us...> - 2003-07-12 23:22:21
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv30585
Modified Files:
CBP.nsh
Log Message:
Moved the "Remove" boxes further to the left and increased the height available for the "Delete" instructions.
Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CBP.nsh 12 Jul 2003 11:55:51 -0000 1.13
--- CBP.nsh 12 Jul 2003 23:22:19 -0000 1.14
***************
*** 717,725 ****
!define CBP_BN_NAME_LEFT 157
! !define CBP_BN_NAME_RIGHT 253
; Constants used to position the "Remove" boxes
! !define CBP_BN_REMOVE_LEFT 253
!define CBP_BN_REMOVE_RIGHT 298
--- 717,725 ----
!define CBP_BN_NAME_LEFT 157
! !define CBP_BN_NAME_RIGHT 250
; Constants used to position the "Remove" boxes
! !define CBP_BN_REMOVE_LEFT 250
!define CBP_BN_REMOVE_RIGHT 298
***************
*** 834,838 ****
"Label" \
"$(PFI_LANG_CBP_IO_DELETE)" \
! "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "110" "140"
; Label used to display progress reports
--- 834,838 ----
"Label" \
"$(PFI_LANG_CBP_IO_DELETE)" \
! "${CBP_INFO_LEFT_MARGIN}" "${CBP_INFO_RIGHT_MARGIN}" "107" "140"
; Label used to display progress reports
|
|
From: <xue...@us...> - 2003-07-12 23:20:34
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1:/tmp/cvs-serv30453 Modified Files: ioC.ini Log Message: Increased the width available for the text messages (still using single-line messages). Index: ioC.ini =================================================================== RCS file: /cvsroot/popfile/windows/ioC.ini,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ioC.ini 5 Jul 2003 12:44:24 -0000 1.6 --- ioC.ini 12 Jul 2003 23:20:31 -0000 1.7 *************** *** 18,23 **** Type=GroupBox Text= ! Left=10 ! Right=290 Top=0 Bottom=60 --- 18,23 ---- Type=GroupBox Text= ! Left=0 ! Right=300 Top=0 Bottom=60 *************** *** 26,31 **** Type=RadioButton Text= ! Left=30 ! Right=288 Top=12 Bottom=22 --- 26,31 ---- Type=RadioButton Text= ! Left=5 ! Right=298 Top=12 Bottom=22 *************** *** 35,40 **** Type=RadioButton Text= ! Left=30 ! Right=288 Top=27 Bottom=37 --- 35,40 ---- Type=RadioButton Text= ! Left=5 ! Right=298 Top=27 Bottom=37 *************** *** 43,48 **** Type=RadioButton Text= ! Left=30 ! Right=288 Top=42 Bottom=52 --- 43,48 ---- Type=RadioButton Text= ! Left=5 ! Right=298 Top=42 Bottom=52 *************** *** 52,57 **** Type=GroupBox Text= ! Left=10 ! Right=290 Top=75 Bottom=135 --- 52,57 ---- Type=GroupBox Text= ! Left=0 ! Right=300 Top=75 Bottom=135 *************** *** 61,66 **** Type=Label Text= ! Left=15 ! Right=288 Top=85 Bottom=130 --- 61,66 ---- Type=Label Text= ! Left=5 ! Right=298 Top=85 Bottom=130 |
|
From: <xue...@us...> - 2003-07-12 22:00:48
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv13613
Modified Files:
pfi-library.nsh
Log Message:
Use simpler code in GetSeparator function (only one character involved so TrimNewlines is inappropriate)
Index: pfi-library.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/pfi-library.nsh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pfi-library.nsh 12 Jul 2003 11:54:15 -0000 1.1
--- pfi-library.nsh 12 Jul 2003 22:00:46 -0000 1.2
***************
*** 165,175 ****
separator_done:
FileClose ${L_CFG}
! Push ${L_SEPARATOR}
! Call TrimNewlines
! Pop ${L_SEPARATOR}
!
! ; Use separator character from popfile.cfg (if present) otherwise use a semicolon
! StrCmp ${L_SEPARATOR} "" 0 exit
StrCpy ${L_SEPARATOR} ":"
--- 165,173 ----
separator_done:
FileClose ${L_CFG}
! StrCmp ${L_SEPARATOR} "" default
! StrCmp ${L_SEPARATOR} "$\r" default
! StrCmp ${L_SEPARATOR} "$\n" 0 exit
! default:
StrCpy ${L_SEPARATOR} ":"
***************
*** 360,364 ****
# Pop $R0
#
! # ($R0 at this point is ""C:\Program Files\Directory"\Whatever)
#
#--------------------------------------------------------------------------
--- 358,362 ----
# Pop $R0
#
! # ($R0 at this point is ""C:\Program Files\Directory\Whatever")
#
#--------------------------------------------------------------------------
|
|
From: <ssc...@us...> - 2003-07-12 20:22:03
|
Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv31242
Modified Files:
Loader.pm
Log Message:
call CORE_version in scalar context to get the version string
Index: Loader.pm
===================================================================
RCS file: /cvsroot/popfile/engine/POPFile/Loader.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Loader.pm 12 Jul 2003 12:42:47 -0000 1.1
--- Loader.pm 12 Jul 2003 20:22:00 -0000 1.2
***************
*** 69,75 ****
# CORE_loader_init
#
! # Initiali
#
- # ***CORE***
#---------------------------------------------------------------------------------------------
--- 69,74 ----
# CORE_loader_init
#
! # Initialize things only needed in CORE
#
#---------------------------------------------------------------------------------------------
***************
*** 436,440 ****
foreach my $type (keys %{$self->{components__}}) {
foreach my $name (keys %{$self->{components__}{$type}}) {
! $self->{components__}{$type}{$name}->version( $self->CORE_version() );
$self->{components__}{$type}{$name}->configuration( $self->{components__}{core}{config} );
$self->{components__}{$type}{$name}->logger( $self->{components__}{core}{logger} ) if ( $name ne 'logger' );
--- 435,439 ----
foreach my $type (keys %{$self->{components__}}) {
foreach my $name (keys %{$self->{components__}{$type}}) {
! $self->{components__}{$type}{$name}->version( scalar($self->CORE_version()) );
$self->{components__}{$type}{$name}->configuration( $self->{components__}{core}{config} );
$self->{components__}{$type}{$name}->logger( $self->{components__}{core}{logger} ) if ( $name ne 'logger' );
|
|
From: <jgr...@us...> - 2003-07-12 18:47:40
|
Update of /cvsroot/popfile/engine/Proxy
In directory sc8-pr-cvs1:/tmp/cvs-serv17919/Proxy
Modified Files:
Proxy.pm
Log Message:
Start of proxy test suite
Index: Proxy.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Proxy/Proxy.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Proxy.pm 9 Jul 2003 21:15:39 -0000 1.19
--- Proxy.pm 12 Jul 2003 18:47:34 -0000 1.20
***************
*** 94,98 ****
my $port = $self->config_( 'port' );
my $name = $self->name();
! print <<EOM;
\nCouldn't start the $name proxy because POPFile could not bind to the
--- 94,98 ----
my $port = $self->config_( 'port' );
my $name = $self->name();
! print STDERR <<EOM;
\nCouldn't start the $name proxy because POPFile could not bind to the
***************
*** 104,108 ****
EOM
! return 0;
}
--- 104,108 ----
EOM
! return 0;
}
|
|
From: <jgr...@us...> - 2003-07-12 18:47:39
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv17919/tests
Added Files:
TestProxy.tst
Log Message:
Start of proxy test suite
--- NEW FILE: TestProxy.tst ---
# ---------------------------------------------------------------------------------------------
#
# Tests for Proxy.pm
#
# Copyright (c) 2003 John Graham-Cumming
#
# ---------------------------------------------------------------------------------------------
use POPFile::Configuration;
use POPFile::MQ;
use POPFile::Logger;
use Proxy::Proxy;
my $c = new POPFile::Configuration;
my $mq = new POPFile::MQ;
my $l = new POPFile::Logger;
my $p = new Proxy::Proxy
$c->configuration( $c );
$c->mq( $mq );
$c->logger( $l );
$l->configuration( $c );
$l->mq( $mq );
$l->logger( $l );
$l->initialize();
$mq->configuration( $c );
$mq->mq( $mq );
$mq->logger( $l );
$p->configuration( $c );
$p->mq( $mq );
$p->logger( $l );
# Start a generic proxy on port 9999
$p->config_( 'port', 9999 );
test_assert_equal( $p->start(), 1 );
$p->stop();
# Exercise the classifier setter
$p->classifier( 'foo' );
test_assert_equal( $p->{classifier__}, 'foo' );
|
|
From: <xue...@us...> - 2003-07-12 15:46:19
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv23420
Modified Files:
installer.nsi
Log Message:
Start using the new library, offer to uninstall previous version when upgrading, improve uninstaller and simplify the Perl uninstall.
Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** installer.nsi 9 Jul 2003 18:48:09 -0000 1.85
--- installer.nsi 12 Jul 2003 15:46:14 -0000 1.86
***************
*** 39,51 ****
--- 39,57 ----
#
# To remove any of the additional languages, only TWO lines need to be commented-out:
+ #
# (a) comment-out the relevant '!insertmacro PFI_LANG_LOAD' line in the list of languages
# in the 'Language Support for the installer and uninstaller' block of code
+ #
# (b) comment-out the relevant '!insertmacro UI_LANG_CONFIG' line in the list of languages
# in the code which handles the 'UI Languages' component
#
# For example, to remove support for the 'Dutch' language, comment-out the line
+ #
# !insertmacro PFI_LANG_LOAD "Dutch"
+ #
# in the list of languages supported by the installer, and comment-out the line
+ #
# !insertmacro UI_LANG_CONFIG "DUTCH" "Nederlands"
+ #
# in the code which handles the 'UI Languages' component (Section "Languages").
#
***************
*** 56,60 ****
#
# (1) an up-to-date main NSIS language file ({NSIS}\Contrib\Language files\*.nlf)
! # _and_
# (2) an up-to-date NSIS MUI Language file ({NSIS}\Contrib\Modern UI\Language files\*.nsh)
#
--- 62,66 ----
#
# (1) an up-to-date main NSIS language file ({NSIS}\Contrib\Language files\*.nlf)
! # and
# (2) an up-to-date NSIS MUI Language file ({NSIS}\Contrib\Modern UI\Language files\*.nsh)
#
***************
*** 87,90 ****
--- 93,108 ----
!define C_RELEASE_NOTES "..\engine\${C_README}"
+ ; Root directory for the Perl files used to build the installer
+
+ !define C_PERL_DIR "C:\Perl"
+
+ ; Define PFI_VERBOSE to get more compiler output
+
+ # !define PFI_VERBOSE
+
+ #--------------------------------------------------------------------------
+ # Use the "Modern User Interface" and standard NSIS Section flag utilities
+ #--------------------------------------------------------------------------
+
!include "MUI.nsh"
!include "Sections.nsh"
***************
*** 142,145 ****
--- 160,169 ----
#--------------------------------------------------------------------------
+ # Include private library functions and macro definitions
+ #--------------------------------------------------------------------------
+
+ !include pfi-library.nsh
+
+ #--------------------------------------------------------------------------
# Define the Page order for the installer (and the uninstaller)
#--------------------------------------------------------------------------
***************
*** 235,244 ****
; Use a "leave" function to look for 'popfile.cfg' in the directory selected for this install
! !define MUI_CUSTOMFUNCTION_DIRECTORY_LEAVE CheckExistingConfig
; Use a "pre" function for the 'Finish' page to ensure installer only offers to display
; POPFile User Interface if user has chosen to start POPFile from the installer.
! !define MUI_CUSTOMFUNCTION_FINISH_PRE CheckRunStatus
#--------------------------------------------------------------------------
--- 259,268 ----
; Use a "leave" function to look for 'popfile.cfg' in the directory selected for this install
! !define MUI_CUSTOMFUNCTION_DIRECTORY_LEAVE "CheckExistingConfig"
; Use a "pre" function for the 'Finish' page to ensure installer only offers to display
; POPFile User Interface if user has chosen to start POPFile from the installer.
! !define MUI_CUSTOMFUNCTION_FINISH_PRE "CheckRunStatus"
#--------------------------------------------------------------------------
***************
*** 283,326 ****
;-----------------------------------------
- ; Macros used to simplify inclusion of necessary language files
- ;-----------------------------------------
-
- ; Used in the '*-pfi.nsh' files to define the text strings for the installer
-
- !macro PFI_LANG_STRING NAME VALUE
- LangString ${NAME} ${LANG_${PFI_LANG}} "${VALUE}"
- !macroend
-
- ; Used in the '*-pfi.nsh' files to define the text strings for the uninstaller
-
- !macro PFI_LANG_UNSTRING NAME VALUE
- !insertmacro PFI_LANG_STRING "un.${NAME}" "${VALUE}"
- !macroend
-
- ; Used in '*-pfi.nsh' files to define the text strings for fields in a custom page INI file
-
- !macro PFI_IO_TEXT PATH FIELD TEXT
- WriteINIStr "$PLUGINSDIR\${PATH}" "Field ${FIELD}" "Text" "${TEXT}"
- !macroend
-
- ; Used in '*-pfi.nsh' files to define entries in [Settings] section of a custom page INI file
-
- !macro PFI_IO_SETTING PATH FIELD TEXT
- WriteINIStr "$PLUGINSDIR\${PATH}" "Settings" "${FIELD}" "${TEXT}"
- !macroend
-
- ; Macro used to load the three files required for each language:
- ; (1) '*-mui.nsh' contains the customisations to be applied to the standard MUI text strings
- ; (2) '*-pfi.nsh' contains the text strings used for custom pages, progress reports and logs
- ; (3) the GPL license text (at present every language uses the 'English' version of the GPL)
-
- !macro PFI_LANG_LOAD LANG
- !include "languages\${LANG}-mui.nsh"
- !insertmacro MUI_LANGUAGE "${LANG}"
- !include "languages\${LANG}-pfi.nsh"
- LicenseData /LANG=${LANG} "..\engine\license"
- !macroend
-
- ;-----------------------------------------
; Select the languages to be supported by installer/uninstaller.
; Currently a subset of the languages supported by NSIS MUI 1.65 (using the NSIS names)
--- 307,310 ----
***************
*** 546,549 ****
--- 530,534 ----
SetOutPath $INSTDIR\POPFile
File "..\engine\POPFile\MQ.pm"
+ File "..\engine\POPFile\Loader.pm"
File "..\engine\POPFile\Logger.pm"
File "..\engine\POPFile\Module.pm"
***************
*** 574,656 ****
SetOutPath $INSTDIR
! File "C:\Perl\bin\perl.exe"
! File "C:\Perl\bin\wperl.exe"
! File "C:\Perl\bin\perl58.dll"
! File "C:\Perl\lib\AutoLoader.pm"
! File "C:\Perl\lib\Carp.pm"
! File "C:\Perl\lib\Config.pm"
! File "C:\Perl\lib\DynaLoader.pm"
! File "C:\Perl\lib\Errno.pm"
! File "C:\Perl\lib\Exporter.pm"
! File "C:\Perl\lib\IO.pm"
! File "C:\Perl\lib\integer.pm"
! File "C:\Perl\lib\locale.pm"
! File "C:\Perl\lib\POSIX.pm"
! File "C:\Perl\lib\SelectSaver.pm"
! File "C:\Perl\lib\Socket.pm"
! File "C:\Perl\lib\strict.pm"
! File "C:\Perl\lib\Symbol.pm"
! File "C:\Perl\lib\vars.pm"
! File "C:\Perl\lib\warnings.pm"
! File "C:\Perl\lib\XSLoader.pm"
SetOutPath $INSTDIR\Carp
! File "C:\Perl\lib\Carp\*"
SetOutPath $INSTDIR\Exporter
! File "C:\Perl\lib\Exporter\*"
SetOutPath $INSTDIR\MIME
! File "C:\Perl\lib\MIME\*"
SetOutPath $INSTDIR\Win32
! File "C:\Perl\site\lib\Win32\API.pm"
SetOutPath $INSTDIR\Win32\API
! File "C:\Perl\site\lib\Win32\API\*.pm"
SetOutPath $INSTDIR\auto\Win32\API
! File "C:\Perl\site\lib\auto\Win32\API\*"
SetOutPath $INSTDIR\IO
! File "C:\Perl\lib\IO\*"
SetOutPath $INSTDIR\Sys
! File "C:\Perl\lib\Sys\*"
SetOutPath $INSTDIR\Text
! File "C:\Perl\lib\Text\ParseWords.pm"
SetOutPath $INSTDIR\IO\Socket
! File "C:\Perl\lib\IO\Socket\*"
SetOutPath $INSTDIR\auto\DynaLoader
! File "C:\Perl\lib\auto\DynaLoader\*"
SetOutPath $INSTDIR\auto\File\Glob
! File "C:\Perl\lib\auto\File\Glob\*"
SetOutPath $INSTDIR\auto\MIME\Base64
! File "C:\Perl\lib\auto\MIME\Base64\*"
SetOutPath $INSTDIR\auto\IO
! File "C:\Perl\lib\auto\IO\*"
SetOutPath $INSTDIR\auto\Socket
! File "C:\Perl\lib\auto\Socket\*"
SetOutPath $INSTDIR\auto\Sys\Hostname
! File "C:\Perl\lib\auto\Sys\Hostname\*"
SetOutPath $INSTDIR\auto\POSIX
! File "C:\Perl\lib\auto\POSIX\POSIX.dll"
! File "C:\Perl\lib\auto\POSIX\autosplit.ix"
! File "C:\Perl\lib\auto\POSIX\load_imports.al"
SetOutPath $INSTDIR\File
! File "C:\Perl\lib\File\Glob.pm"
SetOutPath $INSTDIR\warnings
! File "C:\Perl\lib\warnings\register.pm"
; Create the uninstall program BEFORE creating the shortcut to it
--- 559,641 ----
SetOutPath $INSTDIR
! File "${C_PERL_DIR}\bin\perl.exe"
! File "${C_PERL_DIR}\bin\wperl.exe"
! File "${C_PERL_DIR}\bin\perl58.dll"
! File "${C_PERL_DIR}\lib\AutoLoader.pm"
! File "${C_PERL_DIR}\lib\Carp.pm"
! File "${C_PERL_DIR}\lib\Config.pm"
! File "${C_PERL_DIR}\lib\DynaLoader.pm"
! File "${C_PERL_DIR}\lib\Errno.pm"
! File "${C_PERL_DIR}\lib\Exporter.pm"
! File "${C_PERL_DIR}\lib\IO.pm"
! File "${C_PERL_DIR}\lib\integer.pm"
! File "${C_PERL_DIR}\lib\locale.pm"
! File "${C_PERL_DIR}\lib\POSIX.pm"
! File "${C_PERL_DIR}\lib\SelectSaver.pm"
! File "${C_PERL_DIR}\lib\Socket.pm"
! File "${C_PERL_DIR}\lib\strict.pm"
! File "${C_PERL_DIR}\lib\Symbol.pm"
! File "${C_PERL_DIR}\lib\vars.pm"
! File "${C_PERL_DIR}\lib\warnings.pm"
! File "${C_PERL_DIR}\lib\XSLoader.pm"
SetOutPath $INSTDIR\Carp
! File "${C_PERL_DIR}\lib\Carp\*"
SetOutPath $INSTDIR\Exporter
! File "${C_PERL_DIR}\lib\Exporter\*"
SetOutPath $INSTDIR\MIME
! File "${C_PERL_DIR}\lib\MIME\*"
SetOutPath $INSTDIR\Win32
! File "${C_PERL_DIR}\site\lib\Win32\API.pm"
SetOutPath $INSTDIR\Win32\API
! File "${C_PERL_DIR}\site\lib\Win32\API\*.pm"
SetOutPath $INSTDIR\auto\Win32\API
! File "${C_PERL_DIR}\site\lib\auto\Win32\API\*"
SetOutPath $INSTDIR\IO
! File "${C_PERL_DIR}\lib\IO\*"
SetOutPath $INSTDIR\Sys
! File "${C_PERL_DIR}\lib\Sys\*"
SetOutPath $INSTDIR\Text
! File "${C_PERL_DIR}\lib\Text\ParseWords.pm"
SetOutPath $INSTDIR\IO\Socket
! File "${C_PERL_DIR}\lib\IO\Socket\*"
SetOutPath $INSTDIR\auto\DynaLoader
! File "${C_PERL_DIR}\lib\auto\DynaLoader\*"
SetOutPath $INSTDIR\auto\File\Glob
! File "${C_PERL_DIR}\lib\auto\File\Glob\*"
SetOutPath $INSTDIR\auto\MIME\Base64
! File "${C_PERL_DIR}\lib\auto\MIME\Base64\*"
SetOutPath $INSTDIR\auto\IO
! File "${C_PERL_DIR}\lib\auto\IO\*"
SetOutPath $INSTDIR\auto\Socket
! File "${C_PERL_DIR}\lib\auto\Socket\*"
SetOutPath $INSTDIR\auto\Sys\Hostname
! File "${C_PERL_DIR}\lib\auto\Sys\Hostname\*"
SetOutPath $INSTDIR\auto\POSIX
! File "${C_PERL_DIR}\lib\auto\POSIX\POSIX.dll"
! File "${C_PERL_DIR}\lib\auto\POSIX\autosplit.ix"
! File "${C_PERL_DIR}\lib\auto\POSIX\load_imports.al"
SetOutPath $INSTDIR\File
! File "${C_PERL_DIR}\lib\File\Glob.pm"
SetOutPath $INSTDIR\warnings
! File "${C_PERL_DIR}\lib\warnings\register.pm"
; Create the uninstall program BEFORE creating the shortcut to it
***************
*** 749,772 ****
# If this component is selected, the installer will attempt to preset the POPFile UI
# language to match the language used for the installation. The 'UI_LANG_CONFIG' macro
! # defines the mapping between NSIS language name and POPFile UI language name. This
! # macro will only preset the UI language if the required UI language file is present.
! # If no match is found or if the UI language file is not present, the default UI language
# is used (it is left to POPFile to determine which language to use).
#--------------------------------------------------------------------------
Section "Languages" SecLangs
- ; Macro to simplify the code which selects a UI language based upon the installer language
- ; (the installer uses NSIS language names which differ from the names used by POPFile's UI)
-
- !macro UI_LANG_CONFIG PFI_SETTING UI_SETTING
- StrCmp $LANGUAGE ${LANG_${PFI_SETTING}} 0 +4
- IfFileExists "$INSTDIR\languages\${UI_SETTING}.msg" 0 lang_done
- StrCpy ${L_LANG} "${UI_SETTING}"
- Goto lang_save
- !macroend
-
!define L_CFG $R9 ; file handle
! !define L_LANG $R8
Push ${L_CFG}
--- 734,752 ----
# If this component is selected, the installer will attempt to preset the POPFile UI
# language to match the language used for the installation. The 'UI_LANG_CONFIG' macro
! # defines the mapping between NSIS language name and POPFile UI language name.
! # The POPFile UI language is only preset if the required UI language file exists.
! # If no match is found or if the UI language file does not exist, the default UI language
# is used (it is left to POPFile to determine which language to use).
+ #
+ # By the time this section is executed, the function 'CheckExistingConfig' in conjunction with
+ # the processing performed in the "POPFile" section will have removed all UI language settings
+ # from 'popfile.cfg' so all we have to do is append the UI setting to the file. If we do not
+ # append anything, POPFile will choose the default language.
#--------------------------------------------------------------------------
Section "Languages" SecLangs
!define L_CFG $R9 ; file handle
! !define L_LANG $R8 ; language to be used for POPFile UI
Push ${L_CFG}
***************
*** 1095,1099 ****
ports_ok:
-
Pop ${L_STRIPLANG}
Pop ${L_OLDUI}
--- 1075,1078 ----
***************
*** 1132,1137 ****
# Installer Function: SetOptionsPage (generates a custom page)
#
# This function is used to configure the POP3 and UI ports, and
! # whether or not POPFile should be started automatically.
#
# A "leave" function (CheckPortOptions) is used to validate the port
--- 1111,1124 ----
# Installer Function: SetOptionsPage (generates a custom page)
#
+ # If this is an "upgrade" installation, the user is offered the chance to uninstall the old
+ # version before continuing with the upgrade. If an uninstall is selected, the 'uninstall.exe'
+ # from THIS installer is used instead of the one from the POPFile which is being upgraded. This
+ # is done to ensure that a special "upgrade" uninstall is performed instead of a "normal" one.
+ # The "upgrade" uninstall ensures that the corpus and some other files are not removed. After
+ # an "upgrade" uninstall, the "SHUTDOWN" warning message is removed from the custom page
+ # (POPFile is automatically shutdown during the "upgrade" uninstall).
+ #
# This function is used to configure the POP3 and UI ports, and
! # whether or not POPFile should be started automatically when Windows starts.
#
# A "leave" function (CheckPortOptions) is used to validate the port
***************
*** 1147,1150 ****
--- 1134,1158 ----
Push ${L_RESULT}
+ IfFileExists "$INSTDIR\popfile.pl" 0 continue
+
+ MessageBox MB_YESNO|MB_ICONEXCLAMATION \
+ "$(PFI_LANG_OPTIONS_MBUNINST_1)$\r$\n$\r$\n\
+ $(PFI_LANG_OPTIONS_MBUNINST_2)$\r$\n$\r$\n\
+ $(PFI_LANG_OPTIONS_MBUNINST_3)" IDNO continue
+
+ Banner::show /NOUNLOAD /set 76 "$(PFI_LANG_OPTIONS_BANNER_1)" "$(PFI_LANG_OPTIONS_BANNER_2)"
+ WriteUninstaller $INSTDIR\uninstall.exe
+ ExecWait '"$INSTDIR\uninstall.exe" _?=$INSTDIR'
+ IfFileExists "$INSTDIR\popfile.pl" skip_msg_delete
+
+ ; No need to display the warning about shutting down POPFile as it has just been uninstalled
+
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "NumFields" "5"
+
+ skip_msg_delete:
+ Banner::destroy
+
+ continue:
+
; The function "CheckExistingConfig" loads ${G_POP3} and ${G_GUI} with the settings found in
; a previously installed "popfile.cfg" file or if no such file is found, it loads the
***************
*** 1735,2005 ****
#--------------------------------------------------------------------------
- # Installer Function: GetSeparator
- #
- # Returns the character to be used as the separator when configuring an e-mail account.
- # If the character is not defined in popfile.cfg, the default separator (':') is returned
- #
- # Inputs:
- # none
- # Outputs:
- # (top of stack) - character to be used as the separator
- #
- # Usage:
- # Call GetSeparator
- # Pop $R0
- #
- # ($R0 at this point is ":" unless popfile.cfg has altered the default setting)
- #
- #--------------------------------------------------------------------------
-
- Function GetSeparator
-
- !define L_CFG $R9 ; file handle
- !define L_LNE $R8 ; a line from the popfile.cfg file
- !define L_PARAM $R7
- !define L_SEPARATOR $R6 ; character used to separate the pop3 server from the username
-
- Push ${L_SEPARATOR}
- Push ${L_CFG}
- Push ${L_LNE}
- Push ${L_PARAM}
-
- StrCpy ${L_SEPARATOR} ""
-
- ClearErrors
-
- FileOpen ${L_CFG} $INSTDIR\popfile.cfg r
-
- loop:
- FileRead ${L_CFG} ${L_LNE}
- IfErrors separator_done
-
- StrCpy ${L_PARAM} ${L_LNE} 10
- StrCmp ${L_PARAM} "separator " old_separator
- StrCpy ${L_PARAM} ${L_LNE} 15
- StrCmp ${L_PARAM} "pop3_separator " new_separator
- Goto loop
-
- old_separator:
- StrCpy ${L_SEPARATOR} ${L_LNE} 1 10
- Goto loop
-
- new_separator:
- StrCpy ${L_SEPARATOR} ${L_LNE} 1 15
- Goto loop
-
- separator_done:
- FileClose ${L_CFG}
- Push ${L_SEPARATOR}
- Call TrimNewlines
- Pop ${L_SEPARATOR}
-
- ; Use separator character from popfile.cfg (if present) otherwise use a semicolon
-
- StrCmp ${L_SEPARATOR} "" 0 exit
- StrCpy ${L_SEPARATOR} ":"
-
- exit:
- Pop ${L_PARAM}
- Pop ${L_LNE}
- Pop ${L_CFG}
- Exch ${L_SEPARATOR}
-
- !undef L_CFG
- !undef L_LNE
- !undef L_PARAM
- !undef L_SEPARATOR
-
- FunctionEnd
-
- #--------------------------------------------------------------------------
- # Installer Function: StrStr
- #
- # Search for matching string
- #
- # Inputs:
- # (top of stack) - the string to be found (needle)
- # (top of stack - 1) - the string to be searched (haystack)
- # Outputs:
- # (top of stack) - string starting with the match, if any
- #
- # Usage:
- # Push "this is a long string"
- # Push "long"
- # Call StrStr
- # Pop $R0
- # ($R0 at this point is "long string")
- #
- #--------------------------------------------------------------------------
-
- Function StrStr
- Exch $R1 ; Make $R1 the "needle", Top of stack = old$R1, haystack
- Exch ; Top of stack = haystack, old$R1
- Exch $R2 ; Make $R2 the "haystack", Top of stack = old$R2, old$R1
-
- Push $R3 ; Length of the needle
- Push $R4 ; Counter
- Push $R5 ; Temp
-
- StrLen $R3 $R1
- StrCpy $R4 0
-
- loop:
- StrCpy $R5 $R2 $R3 $R4
- StrCmp $R5 $R1 done
- StrCmp $R5 "" done
- IntOp $R4 $R4 + 1
- Goto loop
-
- done:
- StrCpy $R1 $R2 "" $R4
-
- Pop $R5
- Pop $R4
- Pop $R3
-
- Pop $R2
- Exch $R1
- FunctionEnd
-
- #--------------------------------------------------------------------------
- # Macro: StrCheckDecimal
- #
- # The installation process and the uninstall process both use a function which checks if
- # a given string contains a decimal number. This macro makes maintenance easier by ensuring
- # that both processes use identical functions, with the only difference being their names.
- #
- # The 'StrCheckDecimal' and 'un.StrCheckDecimal' functions check that a given string contains
- # only the digits 0 to 9. (if the string contains any invalid characters, "" is returned)
- #
- # Inputs:
- # (top of stack) - string which may contain a decimal number
- #
- # Outputs:
- # (top of stack) - the input string (if valid) or "" (if invalid)
- #
- # Usage:
- # Push "12345"
- # Call StrCheckDecimal
- # Pop $R0
- # ($R0 at this point is "12345")
- #
- #--------------------------------------------------------------------------
- !macro StrCheckDecimal UN
- Function ${UN}StrCheckDecimal
-
- !define DECIMAL_DIGIT "0123456789"
-
- Exch $0 ; The input string
- Push $1 ; Holds the result: either "" (if input is invalid) or the input string (if valid)
- Push $2 ; A character from the input string
- Push $3 ; The offset to a character in the "validity check" string
- Push $4 ; A character from the "validity check" string
- Push $5 ; Holds the current "validity check" string
-
- StrCpy $1 ""
-
- next_input_char:
- StrCpy $2 $0 1 ; Get the next character from the input string
- StrCmp $2 "" done
- StrCpy $5 ${DECIMAL_DIGIT}$2 ; Add it to end of "validity check" to guarantee a match
- StrCpy $0 $0 "" 1
- StrCpy $3 -1
-
- next_valid_char:
- IntOp $3 $3 + 1
- 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
-
- invalid:
- StrCpy $1 ""
-
- done:
- StrCpy $0 $1 ; Result is either a string of decimal digits or ""
- Pop $5
- Pop $4
- Pop $3
- Pop $2
- Pop $1
- Exch $0 ; place result on top of the stack
-
- !undef DECIMAL_DIGIT
-
- FunctionEnd
- !macroend
-
- #--------------------------------------------------------------------------
- # Installer Function: StrCheckDecimal
- #
- # This function is used during the installation process
- #--------------------------------------------------------------------------
-
- !insertmacro StrCheckDecimal ""
-
- #--------------------------------------------------------------------------
- # Uninstaller Function: un.StrCheckDecimal
- #
- # This function is used during the uninstall process
- #--------------------------------------------------------------------------
-
- !insertmacro StrCheckDecimal "un."
-
- #--------------------------------------------------------------------------
- # Macro: TrimNewlines
- #
- # The installation process and the uninstall process both
- # use a function which trims newlines from lines of text.
- # This macro makes maintenance easier by ensuring that
- # both processes use identical functions, with the only
- # difference being their names.
- #--------------------------------------------------------------------------
-
- ; input, top of stack (e.g. whatever$\r$\n)
- ; output, top of stack (replaces, with e.g. whatever)
- ; modifies no other variables.
-
- !macro TrimNewlines UN
- Function ${UN}TrimNewlines
- Exch $R0
- Push $R1
- Push $R2
- StrCpy $R1 0
-
- loop:
- IntOp $R1 $R1 - 1
- StrCpy $R2 $R0 1 $R1
- StrCmp $R2 "$\r" loop
- StrCmp $R2 "$\n" loop
- IntOp $R1 $R1 + 1
- IntCmp $R1 0 no_trim_needed
- StrCpy $R0 $R0 $R1
-
- no_trim_needed:
- Pop $R2
- Pop $R1
- Exch $R0
- FunctionEnd
- !macroend
-
- #--------------------------------------------------------------------------
- # Installer Function: TrimNewlines
- #
- # This function is used during the installation process
- #--------------------------------------------------------------------------
-
- !insertmacro TrimNewlines ""
-
- #--------------------------------------------------------------------------
- # Uninstaller Function: un.TrimNewlines
- #
- # This function is used during the uninstall process
- #--------------------------------------------------------------------------
-
- !insertmacro TrimNewlines "un."
-
- #--------------------------------------------------------------------------
# Initialise the uninstaller
#--------------------------------------------------------------------------
--- 1743,1746 ----
***************
*** 2015,2029 ****
#--------------------------------------------------------------------------
# Uninstaller Section
#--------------------------------------------------------------------------
Section "Uninstall"
! !define L_CFG $R9
! !define L_LNE $R8
! !define L_REG_KEY $R7
!define L_REG_SUBKEY $R6
!define L_REG_VALUE $R5
!define L_TEMP $R4
IfFileExists $INSTDIR\popfile.pl skip_confirmation
MessageBox MB_YESNO|MB_ICONSTOP|MB_DEFBUTTON2 \
--- 1756,1795 ----
#--------------------------------------------------------------------------
# Uninstaller Section
+ #
+ # There are two types of uninstall:
+ #
+ # (1) normal uninstall, performed when user wishes to completely remove POPFile from the system
+ #
+ # (2) an uninstall performed as part of an upgrade installation. In this case some files are
+ # preserved (eg the existing corpus).
#--------------------------------------------------------------------------
Section "Uninstall"
! !define L_CFG $R9 ; used as file handle
! !define L_LNE $R8 ; a line from popfile.cfg
! !define L_REG_KEY $R7 ; L_REG_* registers are used to restore Outlook Express settings
!define L_REG_SUBKEY $R6
!define L_REG_VALUE $R5
!define L_TEMP $R4
+ !define L_UPGRADE $R3 ; "yes" if this is an upgrade, "no" if we are just uninstalling
+ !define L_CORPUS $R2 ; holds full path to the POPFile corpus data
+ !define L_SUBFOLDER $R1 ; "yes" if corpus is in a subfolder of $INSTDIR, otherwise "no"
+
+ ; When a normal uninstall is performed, the uninstaller is copied to a uniquely named
+ ; temporary file and it is that temporary file which is executed (this is how the uninstaller
+ ; removes itself). If we are performing an uninstall as part of an upgrade installation then
+ ; no temporary file is created, we execute the 'real' file ($INSTDIR\uninstall.exe) instead.
+
+ StrCpy ${L_UPGRADE} "no"
+
+ Push $CMDLINE
+ Push "$INSTDIR\uninstall.exe"
+ Call un.StrStr
+ Pop ${L_TEMP}
+ StrCmp ${L_TEMP} "" confirmation
+ StrCpy ${L_UPGRADE} "yes"
+ confirmation:
IfFileExists $INSTDIR\popfile.pl skip_confirmation
MessageBox MB_YESNO|MB_ICONSTOP|MB_DEFBUTTON2 \
***************
*** 2034,2037 ****
--- 1800,1817 ----
skip_confirmation:
+ StrCpy ${L_SUBFOLDER} "yes"
+
+ Push $INSTDIR
+ Call un.GetCorpusPath
+ Pop ${L_CORPUS}
+ Push ${L_CORPUS}
+ Push $INSTDIR
+ Call un.StrStr
+ Pop ${L_TEMP}
+ StrCmp ${L_TEMP} "" 0 check_if_running
+ StrCpy ${L_SUBFOLDER} "no"
+
+ check_if_running:
+
; If the POPFile we are about to uninstall is still running,
; then one of the EXE files will be 'locked'
***************
*** 2107,2116 ****
SetDetailsPrint listonly
Delete $INSTDIR\*.log
Delete $INSTDIR\*.pl
Delete $INSTDIR\*.gif
- Delete $INSTDIR\*.pm
Delete $INSTDIR\*.exe
- Delete $INSTDIR\*.dll
Delete $INSTDIR\*.change
Delete $INSTDIR\*.change.txt
--- 1887,1906 ----
SetDetailsPrint listonly
+ ; popfile.pl deleted to indicate an uninstall has occurred (file is checked during 'upgrade')
+
+ Delete $INSTDIR\popfile.pl
+ Delete $INSTDIR\popfile.cfg.bak
+ Delete $INSTDIR\*.pm
+ Delete $INSTDIR\*.dll
+
+ ; For "upgrade" uninstalls, we leave most files in $INSTDIR
+ ; and do not restore Outlook Express settings
+
+ StrCmp ${L_UPGRADE} "yes" no_reg_file
+
Delete $INSTDIR\*.log
Delete $INSTDIR\*.pl
Delete $INSTDIR\*.gif
Delete $INSTDIR\*.exe
Delete $INSTDIR\*.change
Delete $INSTDIR\*.change.txt
***************
*** 2189,2197 ****
Delete $INSTDIR\languages\*.msg
RMDir $INSTDIR\languages
! RMDir /r $INSTDIR\corpus
Delete $INSTDIR\stopwords
Delete $INSTDIR\stopwords.bak
Delete $INSTDIR\stopwords.default
! RMDir /r $INSTDIR\messages
SetDetailsPrint textonly
--- 1979,1991 ----
Delete $INSTDIR\languages\*.msg
RMDir $INSTDIR\languages
!
! StrCmp ${L_UPGRADE} "yes" skip_corpus
! RMDir /r "${L_CORPUS}"
!
! skip_corpus:
Delete $INSTDIR\stopwords
Delete $INSTDIR\stopwords.bak
Delete $INSTDIR\stopwords.default
! !insertmacro SafeRecursiveRMDir "$INSTDIR\messages"
SetDetailsPrint textonly
***************
*** 2199,2232 ****
SetDetailsPrint listonly
! Delete $INSTDIR\Win32\API\*
! RmDir /r $INSTDIR\Win32\API
! Delete $INSTDIR\Win32\*
! RmDir /r $INSTDIR\Win32
! Delete $INSTDIR\auto\Win32\API\*
! RmDir /r $INSTDIR\auto\Win32\API
! Delete $INSTDIR\MIME\*.*
! RMDir $INSTDIR\MIME
! Delete $INSTDIR\IO\*.*
! Delete $INSTDIR\IO\Socket\*.*
! RMDir /r $INSTDIR\IO
! Delete $INSTDIR\Carp\*.*
! RMDir /r $INSTDIR\Carp
! Delete $INSTDIR\Sys\Hostname\*.*
! RMDir /r $INSTDIR\Sys\Hostname
! RMDir /r $INSTDIR\Sys
! Delete $INSTDIR\Text\*.pm
! RMDir /r $INSTDIR\Text
! Delete $INSTDIR\auto\POSIX\*.*
! Delete $INSTDIR\auto\DynaLoader\*.*
! Delete $INSTDIR\auto\File\Glob\*.*
! Delete $INSTDIR\auto\MIME\Base64\*.*
! Delete $INSTDIR\auto\IO\*.*
! Delete $INSTDIR\auto\Socket\*.*
! Delete $INSTDIR\auto\Sys\*.*
! RMDir /r $INSTDIR\auto
! Delete $INSTDIR\File\*.*
! RMDir $INSTDIR\File
! Delete $INSTDIR\warnings\*.*
! RMDir $INSTDIR\warnings
Delete "$INSTDIR\Uninstall.exe"
--- 1993,2007 ----
SetDetailsPrint listonly
! !insertmacro SafeRecursiveRMDir "$INSTDIR\auto"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\Carp"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\File"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\IO"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\MIME"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\Sys"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\Text"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\warnings"
! !insertmacro SafeRecursiveRMDir "$INSTDIR\Win32"
!
! StrCmp ${L_UPGRADE} "yes" Removed
Delete "$INSTDIR\Uninstall.exe"
***************
*** 2258,2261 ****
--- 2033,2039 ----
!undef L_REG_VALUE
!undef L_TEMP
+ !undef L_UPGRADE
+ !undef L_CORPUS
+ !undef L_SUBFOLDER
SectionEnd
|
|
From: <ssc...@us...> - 2003-07-12 12:44:31
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv32223
Modified Files:
popfile.pl
Log Message:
most of the work popfile.pl used to do is now in POPFile::Loader.
popfile.pl now just starts the loader and steps through several functions until termination
Index: popfile.pl
===================================================================
RCS file: /cvsroot/popfile/engine/popfile.pl,v
retrieving revision 1.211
retrieving revision 1.212
diff -C2 -d -r1.211 -r1.212
*** popfile.pl 14 Jun 2003 21:10:12 -0000 1.211
--- popfile.pl 12 Jul 2003 12:44:28 -0000 1.212
***************
*** 14,230 ****
use strict;
use locale;
!
! # The POPFile classes are stored by reference in the %components hash, the top level key is
! # the type of the component (see load_modules) and then the name of the component derived from
! # calls to each loadable modules name() method and which points to the actual module
!
! my %components;
!
! my $on_windows = 0;
!
! if ( $^O eq 'MSWin32' ) {
! require v5.8.0;
! $on_windows = 1;
! }
!
! # A handy boolean that tells us whether we are alive or not. When this is set to 1 then the
! # proxy works normally, when set to 0 (typically by the aborting() function called from a signal)
! # then we will terminate gracefully
!
! my $alive = 1;
!
! # ---------------------------------------------------------------------------------------------
! #
! # aborting
! #
! # Called if we are going to be aborted or are being asked to abort our operation. Sets the
! # alive flag to 0 that will cause us to abort at the next convenient moment
! #
! # ---------------------------------------------------------------------------------------------
! sub aborting
! {
! $alive = 0;
! foreach my $type (keys %components) {
! foreach my $name (keys %{$components{$type}}) {
! $components{$type}{$name}->alive(0);
! $components{$type}{$name}->stop();
! }
! }
! }
!
! # ---------------------------------------------------------------------------------------------
! #
! # pipeready
! #
! # Returns 1 if there is data available to be read on the passed in pipe handle
! #
! # $pipe Pipe handle
! #
! # ---------------------------------------------------------------------------------------------
! sub pipeready
! {
! my ( $pipe ) = @_;
!
! # Check that the $pipe is still a valid handle
!
! if ( !defined( $pipe ) ) {
! return 0;
! }
!
! if ( $on_windows ) {
!
! # I am NOT doing a select() here because that does not work
! # on Perl running on Windows. -s returns the "size" of the file
! # (in this case a pipe) and will be non-zero if there is data to read
!
! return ( ( -s $pipe ) > 0 );
! } else {
!
! # Here I do a select because we are not running on Windows where
! # you can't select() on a pipe
!
! my $rin = '';
! vec( $rin, fileno( $pipe ), 1 ) = 1;
! my $ready = select( $rin, undef, undef, 0.01 );
! return ( $ready > 0 );
! }
! }
!
! # ---------------------------------------------------------------------------------------------
! #
! # reaper
! #
! # Called if we get SIGCHLD and asks each module to do whatever reaping is needed
! #
! # ---------------------------------------------------------------------------------------------
! sub reaper
! {
! foreach my $type (keys %components) {
! foreach my $name (keys %{$components{$type}}) {
! $components{$type}{$name}->reaper();
! }
! }
!
! $SIG{CHLD} = \&reaper;
! }
!
! # ---------------------------------------------------------------------------------------------
! #
! # forker
! #
! # Called to fork POPFile. Calls every module's forked function in the child process to give
! # then a chance to clean up
! #
! # Returns the return value from fork() and a file handle that form a pipe in the
! # direction child to parent. There is no need to close the file handles that are unused as
! # would normally be the case with a pipe and fork as forker takes care that in each process
! # only one file handle is open (be it the reader or the writer)
! #
! # ---------------------------------------------------------------------------------------------
! sub forker
! {
! # Tell all the modules that a fork is about to happen
!
! foreach my $type (keys %components) {
! foreach my $name (keys %{$components{$type}}) {
! $components{$type}{$name}->prefork();
! }
! }
!
! # Create the pipe that will be used to send data from the child to the parent process,
! # $writer will be returned to the child process and $reader to the parent process
!
! pipe my $reader, my $writer;
! my $pid = fork();
!
! # If fork() returns an undefined value then we failed to fork and are
! # in serious trouble (probably out of resources) so we return undef
!
! if ( !defined( $pid ) ) {
! close $reader;
! close $writer;
! return (undef, undef);
! }
!
! # If fork returns a PID of 0 then we are in the child process so close the
! # reading pipe file handle, inform all modules that are fork has occurred and
! # then return 0 as the PID so that the caller knows that we are in the child
!
! if ( $pid == 0 ) {
! foreach my $type (keys %components) {
! foreach my $name (keys %{$components{$type}}) {
! $components{$type}{$name}->forked();
! }
! }
!
! close $reader;
!
! # Set autoflush on the write handle so that output goes straight through
! # to the parent without buffering it until the socket closes
!
! use IO::Handle;
! $writer->autoflush(1);
!
! return (0, $writer);
! }
!
! # Reach here because we are in the parent process, close out the writer pipe
! # file handle and return our PID (non-zero) indicating that this is the parent
! # process
!
! close $writer;
! return ($pid, $reader);
! }
!
! # ---------------------------------------------------------------------------------------------
! #
! # load_modules
! #
! # Called to load all the POPFile loadable modules (implemented as .pm files with special
! # comment on first line) in a specific subdirectory
! #
! # $directory The directory to search for loadable modules
! # $type The 'type' of module being loaded (e.g. proxy, core, ui) which is used
! # below when fixing up references between modules (e.g. proxy modules all
! # need access to the classifier module)
! #
! #
! # ---------------------------------------------------------------------------------------------
! sub load_modules
! {
! my ( $directory, $type ) = @_;
!
! print "\n {$type:";
!
! # Look for all the .pm files in named directory and then see which of them
! # are POPFile modules indicated by the first line of the file being and
! # comment (# POPFILE LOADABLE MODULE) and load that module into the %components
! # hash getting the name from the module by calling name()
!
! my @modules = glob "$directory/*.pm";
!
! foreach my $module (@modules) {
! if ( open MODULE, "<$module" ) {
! my $first = <MODULE>;
! close MODULE;
!
! if ( $first =~ /^# POPFILE LOADABLE MODULE/ ) {
! require $module;
!
! $module =~ s/\//::/;
! $module =~ s/\.pm//;
!
! my $mod = new $module;
! my $name = $mod->name();
!
! $components{$type}{$name} = $mod;
!
! print " $name";
! }
! }
! }
!
! print '} ';
! }
#
--- 14,18 ----
use strict;
use locale;
! use POPFile::Loader;
#
***************
*** 234,403 ****
#
! my ( $major_version, $minor_version, $build_version ) = ( 0, 20, 0 );
! my $version_string = "v$major_version.$minor_version.$build_version";
! print "\nPOPFile Engine $version_string loading\n";
! $SIG{QUIT} = \&aborting;
! $SIG{ABRT} = \&aborting;
! $SIG{KILL} = \&aborting;
! $SIG{STOP} = \&aborting;
! $SIG{TERM} = \&aborting;
! $SIG{INT} = \&aborting;
! # Yuck. On Windows SIGCHLD isn't calling the reaper under ActiveState 5.8.0
! # so we detect Windows and ignore SIGCHLD and call the reaper code below
! $SIG{CHLD} = $on_windows?'IGNORE':\&reaper;
! # I've seen spurious ALRM signals happen on Windows so here we for safety
! # say that we want to ignore them
! $SIG{ALRM} = 'IGNORE';
# Create the main objects that form the core of POPFile. Consists of the configuration
! # modules, the classifier, the UI (currently HTML based), and the POP3 proxy.
!
! print "\n Loading... ";
!
! # Look for a module called Platform::<platform> where <platform> is the value of $^O
! # and if it exists then load it as a component of POPFile. IN this way we can have
! # platform specific code (or not) encapsulated. Note that such a module needs to be
! # a POPFile Loadable Module and a subclass of POPFile::Module to operate correctly
!
! my $platform = $^O;
!
! if ( -e "Platform/$platform.pm" ) {
! require "Platform/$platform.pm";
! $platform = "Platform::$platform";
! my $mod = new $platform;
! my $name = $mod->name();
! $components{core}{$name} = $mod;
! print "\n {core: $name}";
! }
!
! load_modules( 'POPFile', 'core' );
! load_modules( 'Classifier', 'classifier' );
! load_modules( 'UI', 'interface' );
! load_modules( 'Proxy', 'proxy' );
!
! print "\n\nPOPFile Engine $version_string starting";
!
! # Link each of the main objects with the configuration object so that they can set their
! # default parameters all or them also get access to the logger
!
! foreach my $type (keys %components) {
! foreach my $name (keys %{$components{$type}}) {
! $components{$type}{$name}->version( $version_string );
! $components{$type}{$name}->configuration( $components{core}{config} );
! $components{$type}{$name}->logger( $components{core}{logger} ) if ( $name ne 'logger' );
! $components{$type}{$name}->mq( $components{core}{mq} );
! }
! }
!
! # All interface components need access to the classifier
!
! foreach my $name (keys %{$components{interface}}) {
! $components{interface}{$name}->classifier( $components{classifier}{bayes} );
! }
!
! foreach my $name (keys %{$components{proxy}}) {
! $components{proxy}{$name}->classifier( $components{classifier}{bayes} );
! }
!
! print "\n\n Initializing... ";
!
! # Tell each module to initialize itself
!
! foreach my $type (keys %components) {
! print "\n {$type:";
! foreach my $name (keys %{$components{$type}}) {
! print " $name";
! flush STDOUT;
! if ( $components{$type}{$name}->initialize() == 0 ) {
! die "Failed to start while initializing the $name module";
! }
!
! $components{$type}{$name}->alive( 1 );
! $components{$type}{$name}->forker( \&forker );
! $components{$type}{$name}->pipeready( \&pipeready );
! }
! print '} ';
! }
!
! # Load the configuration from disk and then apply any command line
! # changes that override the saved configuration
!
! $components{core}{config}->load_configuration();
! $components{core}{config}->parse_command_line();
!
! print "\n\n Starting... ";
!
! # Now that the configuration is set tell each module to begin operation
!
! foreach my $type (keys %components) {
! print "\n {$type:";
! foreach my $name (keys %{$components{$type}}) {
! print " $name";
! flush STDOUT;
! if ( $components{$type}{$name}->start() == 0 ) {
! die "Failed to start while starting the $name module";
! }
! }
! print '} ';
! }
!
! print "\n\nPOPFile Engine $version_string running\n";
! flush STDOUT;
! # MAIN LOOP - Call each module's service() method to all it to
! # handle its own requests
! while ( $alive == 1 ) {
! foreach my $type (keys %components) {
! foreach my $name (keys %{$components{$type}}) {
! if ( $components{$type}{$name}->service() == 0 ) {
! $alive = 0;
! last;
! }
! }
! }
! # Sleep for 0.05 of a second to ensure that POPFile does not hog the machine's
! # CPU
! select(undef, undef, undef, 0.05);
! # If we are on Windows then reap children here
! if ( $on_windows ) {
! foreach my $type (keys %components) {
! foreach my $name (keys %{$components{$type}}) {
! $components{$type}{$name}->reaper();
! }
! }
! }
! }
! print "\n\nPOPFile Engine $version_string stopping\n";
! flush STDOUT;
! print "\n Stopping... ";
! # Shutdown all the modules
! foreach my $type (keys %components) {
! print "\n {$type:";
! foreach my $name (keys %{$components{$type}}) {
! print " $name";
! flush STDOUT;
! $components{$type}{$name}->alive(0);
! $components{$type}{$name}->stop();
! }
! print '} ';
! }
! print "\n\nPOPFile Engine $version_string terminated\n";
# ---------------------------------------------------------------------------------------------
--- 22,67 ----
#
! my $POPFile = POPFile::Loader->new();
! $POPFile->debug(1);
! $POPFile->CORE_loader_init();
! my ( $major_version, $minor_version, $build_version ) = ( 0, 20, 0 );
! $POPFile->CORE_version($major_version, $minor_version, $build_version);
! # Redefine POPFile's signals
! $POPFile->CORE_signals();
# Create the main objects that form the core of POPFile. Consists of the configuration
! # modules, the classifier, the UI (currently HTML based), platform specific code,
! # and the POP3 proxy.
! $POPFile->CORE_load();
! # Make sure each component knows about all the components it needs to know about
! $POPFile->CORE_link_components();
! # Initialize everything
! $POPFile->CORE_initialize();
! # Handle configuration options
! $POPFile->CORE_config();
! # Start each module
! $POPFile->CORE_start();
! # MAIN
! $POPFile->CORE_service();
! # cleanup
+ $POPFile->CORE_stop();
# ---------------------------------------------------------------------------------------------
|
|
From: <ssc...@us...> - 2003-07-12 12:42:50
|
Update of /cvsroot/popfile/engine/POPFile
In directory sc8-pr-cvs1:/tmp/cvs-serv32052
Added Files:
Loader.pm
Log Message:
New file: Loader.pm --- API for loading POPFile loadable modules and encapsulating POPFile application tasks
--- NEW FILE: Loader.pm ---
package POPFile::Loader;
# ---------------------------------------------------------------------------------------------
#
# Loader.pm --- API for loading POPFile loadable modules and encapsulating POPFile application
# tasks
#
# subroutine names beginning with CORE indicate a subroutine designed for exclusive use of
# POPFile's core application. subroutines not so marked are suitable for use by POPFile-based
# utilities to assist in loading and executing modules
#
# Copyright (c) 2001-2003 John Graham-Cumming
#
# ---------------------------------------------------------------------------------------------
#----------------------------------------------------------------------------
# new
#
# Class new() function
#----------------------------------------------------------------------------
sub new
{
my $type = shift;
my $self;
# The POPFile classes are stored by reference in the components hash, the top level key is
# the type of the component (see CORE_load_directory_modules) and then the name of the
# component derived from calls to each loadable modules name() method and which points to
# the actual module
$self->{components__} = {};
# A handy boolean that tells us whether we are alive or not. When this is set to 1 then the
# proxy works normally, when set to 0 (typically by the aborting() function called from a signal)
# then we will terminate gracefully
$self->{alive__} = 1;
# This must be 1 for POPFile::Loader to create any output on STDOUT
$self->{debug__} = 0;
# This stuff lets us do some things in a way that tolerates some window-isms
$self->{on_windows__} = 0;
if ( $^O eq 'MSWin32' ) {
require v5.8.0;
$self->{on_windows__} = 1;
}
$self->{aborting__} = '';
$self->{pipeready__} = '';
$self->{forker__} = '';
$self->{reaper__} = '';
$self->{major_version__} = '';
$self->{minor_version__} = '';
$self->{build_version__} = '';
$self->{version_string__} = '';
bless $self, $type;
return $self;
}
#---------------------------------------------------------------------------------------------
# CORE_loader_init
#
# Initiali
#
# ***CORE***
#---------------------------------------------------------------------------------------------
sub CORE_loader_init
{
my ($self) = @_;
# These anonymous subroutine references allow us to call these important
# functions from anywhere using the reference, granting internal access
# to $self, without exposing $self to the unwashed. No reference to
# POPFile::Loader is needed by the caller
$self->{aborting__} = sub { $self->CORE_aborting(@_) };
$self->{pipeready__} = sub { $self->pipeready(@_) };
$self->{forker__} = sub { $self->CORE_forker(@_) };
$self->{reaper__} = sub { $self->CORE_reaper(@_) };
print "\nPOPFile Engine $self->{version_string__} loading\n" if $self->{debug__};
}
#---------------------------------------------------------------------------------------------
#
# CORE_aborting
#
# Called if we are going to be aborted or are being asked to abort our operation. Sets the
# alive flag to 0 that will cause us to abort at the next convenient moment
#
#---------------------------------------------------------------------------------------------
sub CORE_aborting
{
my ($self) = @_;
$self->{alive__} = 0;
foreach my $type (keys %{$self->{components__}}) {
foreach my $name (keys %{$self->{components__}{$type}}) {
$self->{components__}{$type}{$name}->alive(0);
$self->{components__}{$type}{$name}->stop();
}
}
}
#---------------------------------------------------------------------------------------------
#
# pipeready
#
# Returns 1 if there is data available to be read on the passed in pipe handle
#
# $pipe Pipe handle
#
#---------------------------------------------------------------------------------------------
sub pipeready
{
my ( $self, $pipe ) = @_;
# Check that the $pipe is still a valid handle
if ( !defined( $pipe ) ) {
return 0;
}
if ( $self->{on_windows__} ) {
# I am NOT doing a select() here because that does not work
# on Perl running on Windows. -s returns the "size" of the file
# (in this case a pipe) and will be non-zero if there is data to read
return ( ( -s $pipe ) > 0 );
} else {
# Here I do a select because we are not running on Windows where
# you can't select() on a pipe
my $rin = '';
vec( $rin, fileno( $pipe ), 1 ) = 1;
my $ready = select( $rin, undef, undef, 0.01 );
return ( $ready > 0 );
}
}
#---------------------------------------------------------------------------------------------
#
# CORE_reaper
#
# Called if we get SIGCHLD and asks each module to do whatever reaping is needed
#
#---------------------------------------------------------------------------------------------
sub CORE_reaper
{
my ($self) = @_;
foreach my $type (keys %{$self->{components__}}) {
foreach my $name (keys %{$self->{components__}{$type}}) {
$self->{components__}{$type}{$name}->reaper();
}
}
$SIG{CHLD} = $self->{reaper__};
}
#---------------------------------------------------------------------------------------------
#
# CORE_forker
#
# Called to fork POPFile. Calls every module's forked function in the child process to give
# then a chance to clean up
#
# Returns the return value from fork() and a file handle that form a pipe in the
# direction child to parent. There is no need to close the file handles that are unused as
# would normally be the case with a pipe and fork as forker takes care that in each process
# only one file handle is open (be it the reader or the writer)
#
#---------------------------------------------------------------------------------------------
sub CORE_forker
{
my ($self) = @_;
# Tell all the modules that a fork is about to happen
foreach my $type (keys %{$self->{components__}}) {
foreach my $name (keys %{$self->{components__}{$type}}) {
$self->{components__}{$type}{$name}->prefork();
}
}
# Create the pipe that will be used to send data from the child to the parent process,
# $writer will be returned to the child process and $reader to the parent process
pipe my $reader, my $writer;
my $pid = fork();
# If fork() returns an undefined value then we failed to fork and are
# in serious trouble (probably out of resources) so we return undef
if ( !defined( $pid ) ) {
close $reader;
close $writer;
return (undef, undef);
}
# If fork returns a PID of 0 then we are in the child process so close the
# reading pipe file handle, inform all modules that are fork has occurred and
# then return 0 as the PID so that the caller knows that we are in the child
if ( $pid == 0 ) {
foreach my $type (keys %{$self->{components__}}) {
foreach my $name (keys %{$self->{components__}{$type}}) {
$self->{components__}{$type}{$name}->forked();
}
}
close $reader;
# Set autoflush on the write handle so that output goes straight through
# to the parent without buffering it until the socket closes
use IO::Handle;
$writer->autoflush(1);
return (0, $writer);
}
# Reach here because we are in the parent process, close out the writer pipe
# file handle and return our PID (non-zero) indicating that this is the parent
# process
close $writer;
return ($pid, $reader);
}
#---------------------------------------------------------------------------------------------
#
# CORE_load_directory_modules
#
# Called to load all the POPFile Loadable Modules (implemented as .pm files with special
# comment on first line) in a specific subdirectory and loads them into a structured
# components hash
#
# $directory The directory to search for loadable modules
# $type The 'type' of module being loaded (e.g. proxy, core, ui) which is used
# when fixing up references between modules (e.g. proxy modules all need
# access to the classifier module) and for structuring components hash
#
#---------------------------------------------------------------------------------------------
sub CORE_load_directory_modules
{
my ( $self, $directory, $type ) = @_;
print "\n {$type:" if $self->{debug__};
# Look for all the .pm files in named directory and then see which of them
# are POPFile modules indicated by the first line of the file being and
# comment (# POPFILE LOADABLE MODULE) and load that module into the %{$self->{components__}}
# hash getting the name from the module by calling name()
my @modules = glob "$directory/*.pm";
foreach my $module (@modules) {
$self->CORE_load_module($module, $type);
}
print '} ' if $self->{debug__};
}
#---------------------------------------------------------------------------------------------
#
# CORE_load_module
#
# Called to load a single POPFile Loadable Module (implemented as .pm files with special
# comment on first line and add it to the components hash.
# Returns a handle to the module
#
# $module The path of the module to load
# $type The 'type' of module being loaded (e.g. proxy, core, ui)
#
#---------------------------------------------------------------------------------------------
sub CORE_load_module
{
my ( $self, $module, $type ) = @_;
my $mod = $self->load_module_($module);
if ( defined( $mod ) ) {
my $name = $mod->name();
print " $name" if $self->{debug__};
$self->{components__}{$type}{$name} = $mod;
}
return $mod;
}
#---------------------------------------------------------------------------------------------
#
# load_module_
#
# Called to load a single POPFile Loadable Module (implemented as .pm files with special
# comment on first line. Returns a handle to the module, undef if the module failed to load.
# No internal side-effects.
#
# $module The path of the module to load
#
#---------------------------------------------------------------------------------------------
sub load_module_
{
my ( $self, $module ) = @_;
my $mod;
if ( open MODULE, "<$module" ) {
my $first = <MODULE>;
close MODULE;
if ( $first =~ /^# POPFILE LOADABLE MODULE/ ) {
require $module;
$module =~ s/\//::/;
$module =~ s/\.pm//;
$mod = $module->new();
}
}
return $mod;
}
#---------------------------------------------------------------------------------------------
# CORE_signals
#
# Sets signals to ensure that POPFile handles OS and IPC events
#
# TODO: Figure out why windows POPFile doesn't seem to get SIGTERM when windows shuts down
#
#---------------------------------------------------------------------------------------------
sub CORE_signals
{
my ($self) = @_;
# Redefine POPFile's signals
$SIG{QUIT} = $self->{aborting__};
$SIG{ABRT} = $self->{aborting__};
$SIG{KILL} = $self->{aborting__};
$SIG{STOP} = $self->{aborting__};
$SIG{TERM} = $self->{aborting__};
$SIG{INT} = $self->{aborting__};
# Yuck. On Windows SIGCHLD isn't calling the reaper under ActiveState 5.8.0
# so we detect Windows and ignore SIGCHLD and call the reaper code below
$SIG{CHLD} = $self->{on_windows__}?'IGNORE':$self->{reaper__};
# I've seen spurious ALRM signals happen on Windows so here we for safety
# say that we want to ignore them
$SIG{ALRM} = 'IGNORE';
return $SIG;
}
#---------------------------------------------------------------------------------------------
# CORE_platform_
#
# Loads POPFile's platform-specific code
#
#---------------------------------------------------------------------------------------------
sub CORE_platform_
{
my ($self) = @_;
# Look for a module called Platform::<platform> where <platform> is the value of $^O
# and if it exists then load it as a component of POPFile. IN this way we can have
# platform specific code (or not) encapsulated. Note that such a module needs to be
# a POPFile Loadable Module and a subclass of POPFile::Module to operate correctly
my $platform = $^O;
if ( -e "Platform/$platform.pm" ) {
print "\n {core:" if $self->{debug__};
$self->CORE_load_module( "Platform/$platform.pm",'core');
print "}" if $self->{debug__};
}
}
#---------------------------------------------------------------------------------------------
# load
#
# Loads POPFile's modules
#
#---------------------------------------------------------------------------------------------
sub CORE_load
{
my ($self) = @_;
# Create the main objects that form the core of POPFile. Consists of the configuration
# modules, the classifier, the UI (currently HTML based), and the POP3 proxy.
print "\n Loading... " if $self->{debug__};
# Do our platform-specific stuff
$self->CORE_platform_();
# populate our components hash
$self->CORE_load_directory_modules( 'POPFile', 'core' );
$self->CORE_load_directory_modules( 'Classifier', 'classifier' );
$self->CORE_load_directory_modules( 'UI', 'interface' );
$self->CORE_load_directory_modules( 'Proxy', 'proxy' );
}
#---------------------------------------------------------------------------------------------
# clink
#
# Links POPFile's modules together to allow them to make use of each-other as objects
#
#---------------------------------------------------------------------------------------------
sub CORE_link_components
{
my ($self) = @_;
print "\n\nPOPFile Engine $self->{version_string__} starting" if $self->{debug__};
# Link each of the main objects with the configuration object so that they can set their
# default parameters all or them also get access to the logger, version, and message-queue
foreach my $type (keys %{$self->{components__}}) {
foreach my $name (keys %{$self->{components__}{$type}}) {
$self->{components__}{$type}{$name}->version( $self->CORE_version() );
$self->{components__}{$type}{$name}->configuration( $self->{components__}{core}{config} );
$self->{components__}{$type}{$name}->logger( $self->{components__}{core}{logger} ) if ( $name ne 'logger' );
$self->{components__}{$type}{$name}->mq( $self->{components__}{core}{mq} );
}
}
# All interface components need access to the classifier
foreach my $name (keys %{$self->{components__}{interface}}) {
$self->{components__}{interface}{$name}->classifier( $self->{components__}{classifier}{bayes} );
}
foreach my $name (keys %{$self->{components__}{proxy}}) {
$self->{components__}{proxy}{$name}->classifier( $self->{components__}{classifier}{bayes} );
}
}
#---------------------------------------------------------------------------------------------
# initialize
#
# Loops across POPFile's modules and initializes them
#
#---------------------------------------------------------------------------------------------
sub CORE_initialize
{
my ($self) = @_;
print "\n\n Initializing... " if $self->{debug__};
# Tell each module to initialize itself
foreach my $type (keys %{$self->{components__}}) {
print "\n {$type:" if $self->{debug__};
foreach my $name (keys %{$self->{components__}{$type}}) {
print " $name" if $self->{debug__};
flush STDOUT;
if ( $self->{components__}{$type}{$name}->initialize() == 0 ) {
die "Failed to start while initializing the $name module";
}
$self->{components__}{$type}{$name}->alive( 1 );
$self->{components__}{$type}{$name}->forker( $self->{forker__} );
$self->{components__}{$type}{$name}->pipeready( $self->{pipeready__} );
}
print '} ' if $self->{debug__};
}
}
#---------------------------------------------------------------------------------------------
# CORE_config
#
# Loads POPFile's configuration and command-line settings
#
#---------------------------------------------------------------------------------------------
sub CORE_config
{
my ($self) = @_;
# Load the configuration from disk and then apply any command line
# changes that override the saved configuration
$self->{components__}{core}{config}->load_configuration();
$self->{components__}{core}{config}->parse_command_line();
}
#---------------------------------------------------------------------------------------------
# CORE_start
#
# Loops across POPFile's modules and starts them
#
#---------------------------------------------------------------------------------------------
sub CORE_start
{
my ($self) = @_;
print "\n\n Starting... " if $self->{debug__};
# Now that the configuration is set tell each module to begin operation
foreach my $type (keys %{$self->{components__}}) {
print "\n {$type:" if $self->{debug__};
foreach my $name (keys %{$self->{components__}{$type}}) {
print " $name" if $self->{debug__};
flush STDOUT;
if ( $self->{components__}{$type}{$name}->start() == 0 ) {
die "Failed to start while starting the $name module";
}
}
print '} ' if $self->{debug__};
}
}
#---------------------------------------------------------------------------------------------
# CORE_service
#
# This is POPFile. Loops across POPFile's modules and executes their service subroutines then
# sleeps briefly
#
#
#---------------------------------------------------------------------------------------------
sub CORE_service
{
my ($self) = @_;
print "\n\nPOPFile Engine $self->{version_string__} running\n" if $self->{debug__};
flush STDOUT;
# MAIN LOOP - Call each module's service() method to all it to
# handle its own requests
while ( $self->{alive__} == 1 ) {
foreach my $type (keys %{$self->{components__}}) {
foreach my $name (keys %{$self->{components__}{$type}}) {
if ( $self->{components__}{$type}{$name}->service() == 0 ) {
$self->{alive__} = 0;
last;
}
}
}
# Sleep for 0.05 of a second to ensure that POPFile does not hog the machine's
# CPU
select(undef, undef, undef, 0.05);
# If we are on Windows then reap children here
if ( $self->{on_windows__} ) {
foreach my $type (keys %{$self->{components__}}) {
foreach my $name (keys %{$self->{components__}{$type}}) {
$self->{components__}{$type}{$name}->reaper();
}
}
}
}
}
#---------------------------------------------------------------------------------------------
# CORE_stop
#
# Loops across POPFile's modules and stops them
#
#---------------------------------------------------------------------------------------------
sub CORE_stop
{
my ($self) = @_;
print "\n\nPOPFile Engine $self->{version_string__} stopping\n" if $self->{debug__};
flush STDOUT;
print "\n Stopping... " if $self->{debug__};
# Shutdown all the modules
foreach my $type (keys %{$self->{components__}}) {
print "\n {$type:" if $self->{debug__};
foreach my $name (keys %{$self->{components__}{$type}}) {
print " $name" if $self->{debug__};
flush STDOUT;
$self->{components__}{$type}{$name}->alive(0);
$self->{components__}{$type}{$name}->stop();
}
print '} ' if $self->{debug__};
}
print "\n\nPOPFile Engine $self->{version_string__} terminated\n" if $self->{debug__};
}
# GETTERS/SETTERS
#---------------------------------------------------------------------------------------------
# CORE_version
#
# Gets and Sets POPFile's version data. Returns string in scalar context, or (major, minor, build)
# triplet in list context
#
# $major_version The major version number
# $minor_version The minor version number
# $build_version The build version number
#
#---------------------------------------------------------------------------------------------
sub CORE_version
{
my ($self,$major_version, $minor_version, $build_version) = @_;
if (!defined($major_version)) {
if (wantarray) {
return ($self->{major_version__},$self->{minor_version__},$self->{build_version__});
} else {
return $self->{version_string__};
}
} else {
($self->{major_version__}, $self->{minor_version__}, $self->{build_version__}) = ($major_version, $minor_version, $build_version);
$self->{version_string__} = "v$major_version.$minor_version.$build_version"
}
}
#---------------------------------------------------------------------------------------------
# get_module
#
# Gets a module from components hash. Returns a handle to a module.
#
# May be called either as:
#
# $name Module name in scoped format (eg, Classifier::Bayes)
#
# Or:
#
# $name Name of the module
# $type The type of module
#
#---------------------------------------------------------------------------------------------
sub get_module
{
my ($self, $name, $type) = @_;
if (!defined($type) && $name =~ /^(.*)::(.*)$/ ) {
$type = lc($1);
$name = lc($2);
$type =~ s/^POPFile$/core/
}
return $self->{components__}{$type}{$name};
}
#---------------------------------------------------------------------------------------------
# set_module
#
# Inserts a module into components hash.
#
# $name Name of the module
# $type The type of module
# $module A handle to a module
#
#---------------------------------------------------------------------------------------------
sub set_module
{
my ($self, $type, $name, $module) = @_;
$self->{components__}{$type}{$name} = $module;
}
#---------------------------------------------------------------------------------------------
# remove_module
#
# removes a module from components hash.
#
# $name Name of the module
# $type The type of module
# $module A handle to a module
#
#---------------------------------------------------------------------------------------------
sub remove_module
{
my ($self, $type, $name) = @_;
$self->{components__}{$type}{$name}->stop();
delete($self->{components__}{$type}{$name});
}
#---------------------------------------------------------------------------------------------
# debug
#
# POPFile::Loader debugging getter/setter
#
#---------------------------------------------------------------------------------------------
sub debug
{
my ($self, $debug) = @_;
$self->{debug__} = $debug;
}
1;
##
|
|
From: <xue...@us...> - 2003-07-12 11:55:54
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv26574
Modified Files:
CBP.nsh
Log Message:
Simple verbosity control.
Index: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CBP.nsh 9 Jul 2003 12:59:22 -0000 1.12
--- CBP.nsh 12 Jul 2003 11:55:51 -0000 1.13
***************
*** 18,26 ****
#----------------------------------------------------------------------------------------------
!ifdef CBP.nsh_included
!error "$\r$\n$\r$\nFatal error: CBP.nsh has been included more than once!$\r$\n"
!else
!define CBP.nsh_included
!
#//////////////////////////////////////////////////////////////////////////////////////////////
#
--- 18,30 ----
#----------------------------------------------------------------------------------------------
+ !ifndef PFI_VERBOSE
+ !verbose 3
+ !endif
+
!ifdef CBP.nsh_included
!error "$\r$\n$\r$\nFatal error: CBP.nsh has been included more than once!$\r$\n"
!else
!define CBP.nsh_included
!
#//////////////////////////////////////////////////////////////////////////////////////////////
#
|
|
From: <xue...@us...> - 2003-07-12 11:54:20
|
Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv26439
Added Files:
pfi-library.nsh
Log Message:
Collection of macros and "standard" functions (extracted from 'installer.nsi' to reduce the clutter).
--- NEW FILE: pfi-library.nsh ---
#--------------------------------------------------------------------------
#
# pfi-library.nsi --- This is a collection of library functions and macro
# definitions used by the NSIS script used to create the
# Windows installer for POPFile.
#
# Copyright (c) 2001-2003 John Graham-Cumming
#
#--------------------------------------------------------------------------
!ifndef PFI_VERBOSE
!verbose 3
!endif
#--------------------------------------------------------------------------
#
# Macros used to simplify inclusion/selection of the necessary language files
#
#--------------------------------------------------------------------------
;--------------------------------------------------------------------------
; Used in the '*-pfi.nsh' files to define the text strings for the installer
;--------------------------------------------------------------------------
!macro PFI_LANG_STRING NAME VALUE
LangString ${NAME} ${LANG_${PFI_LANG}} "${VALUE}"
!macroend
;--------------------------------------------------------------------------
; Used in the '*-pfi.nsh' files to define the text strings for the uninstaller
;--------------------------------------------------------------------------
!macro PFI_LANG_UNSTRING NAME VALUE
!insertmacro PFI_LANG_STRING "un.${NAME}" "${VALUE}"
!macroend
;--------------------------------------------------------------------------
; Used in '*-pfi.nsh' files to define the text strings for fields in a custom page INI file
;--------------------------------------------------------------------------
!macro PFI_IO_TEXT PATH FIELD TEXT
WriteINIStr "$PLUGINSDIR\${PATH}" "Field ${FIELD}" "Text" "${TEXT}"
!macroend
;--------------------------------------------------------------------------
; Used in '*-pfi.nsh' files to define entries in [Settings] section of a custom page INI file
;--------------------------------------------------------------------------
!macro PFI_IO_SETTING PATH FIELD TEXT
WriteINIStr "$PLUGINSDIR\${PATH}" "Settings" "${FIELD}" "${TEXT}"
!macroend
;--------------------------------------------------------------------------
; Used in 'installer.nsi' to define the languages to be supported
;--------------------------------------------------------------------------
; Macro used to load the three files required for each language:
; (1) '*-mui.nsh' contains the customisations to be applied to the standard MUI text strings
; (2) '*-pfi.nsh' contains the text strings used for custom pages, progress reports and logs
; (3) the GPL license text (at present every language uses the 'English' version of the GPL)
!macro PFI_LANG_LOAD LANG
!include "languages\${LANG}-mui.nsh"
!insertmacro MUI_LANGUAGE "${LANG}"
!include "languages\${LANG}-pfi.nsh"
LicenseData /LANG=${LANG} "..\engine\license"
!macroend
;--------------------------------------------------------------------------
; Used in 'installer.nsi' to select the POPFile UI language according to the language used
; for the installation process (NSIS language names differ from those used by POPFile's UI)
;--------------------------------------------------------------------------
!macro UI_LANG_CONFIG PFI_SETTING UI_SETTING
StrCmp $LANGUAGE ${LANG_${PFI_SETTING}} 0 +4
IfFileExists "$INSTDIR\languages\${UI_SETTING}.msg" 0 lang_done
StrCpy ${L_LANG} "${UI_SETTING}"
Goto lang_save
!macroend
#--------------------------------------------------------------------------
#
# Macro used by the uninstaller (guards against unexpectedly removing the corpus)
#
#--------------------------------------------------------------------------
!macro SafeRecursiveRMDir PATH
; if corpus is not in a subfolder, no precautions are needed
StrCmp ${L_SUBFOLDER} "no" +6
Push ${L_CORPUS}
Push ${PATH}
Call un.StrStr
POP ${L_TEMP}
; if we are about to remove the path containing the corpus, skip the command
StrCmp ${L_TEMP} "" 0 +2
RMDir /r ${PATH}
!macroend
#==============================================================================================
#
# Functions used only by the installer
#
#==============================================================================================
#--------------------------------------------------------------------------
# Installer Function: GetSeparator
#
# Returns the character to be used as the separator when configuring an e-mail account.
# If the character is not defined in popfile.cfg, the default separator (':') is returned
#
# Inputs:
# none
# Outputs:
# (top of stack) - character to be used as the separator
#
# Usage:
# Call GetSeparator
# Pop $R0
#
# ($R0 at this point is ":" unless popfile.cfg has altered the default setting)
#
#--------------------------------------------------------------------------
Function GetSeparator
!define L_CFG $R9 ; file handle
!define L_LNE $R8 ; a line from the popfile.cfg file
!define L_PARAM $R7
!define L_SEPARATOR $R6 ; character used to separate the pop3 server from the username
Push ${L_SEPARATOR}
Push ${L_CFG}
Push ${L_LNE}
Push ${L_PARAM}
StrCpy ${L_SEPARATOR} ""
ClearErrors
FileOpen ${L_CFG} $INSTDIR\popfile.cfg r
loop:
FileRead ${L_CFG} ${L_LNE}
IfErrors separator_done
StrCpy ${L_PARAM} ${L_LNE} 10
StrCmp ${L_PARAM} "separator " old_separator
StrCpy ${L_PARAM} ${L_LNE} 15
StrCmp ${L_PARAM} "pop3_separator " new_separator
Goto loop
old_separator:
StrCpy ${L_SEPARATOR} ${L_LNE} 1 10
Goto loop
new_separator:
StrCpy ${L_SEPARATOR} ${L_LNE} 1 15
Goto loop
separator_done:
FileClose ${L_CFG}
Push ${L_SEPARATOR}
Call TrimNewlines
Pop ${L_SEPARATOR}
; Use separator character from popfile.cfg (if present) otherwise use a semicolon
StrCmp ${L_SEPARATOR} "" 0 exit
StrCpy ${L_SEPARATOR} ":"
exit:
Pop ${L_PARAM}
Pop ${L_LNE}
Pop ${L_CFG}
Exch ${L_SEPARATOR}
!undef L_CFG
!undef L_LNE
!undef L_PARAM
!undef L_SEPARATOR
FunctionEnd
#==============================================================================================
#
# Functions used only by the uninstaller
#
#==============================================================================================
#--------------------------------------------------------------------------
# Function: un.GetCorpusPath
#
# This function is used by the uninstaller when uninstalling a previous version of POPFile.
# It uses the 'corpus' parameter in 'popfile.cfg' file to determine the full path of the
# directory where the corpus files are stored. By default POPFile stores the corpus in the
# '$INSTDIR\corpus' directory but the 'popfile.cfg' file can define a different location, using
# a variety of paths (eg relative, absolute, local or even remote).
#
# If 'popfile.cfg' is found in the specified folder, we use the corpus parameter (if present)
# otherwise we assume the default location is to be used (the sub-folder called 'corpus').
#
# Inputs:
# (top of stack) - the path where 'popfile.cfg' it to be found
#
# Outputs:
# (top of stack) - string containing the full (unambiguous) path to the corpus
#
# Usage Example:
# Push $INSTDIR
# Call un.GetCorpusPath
# Pop $R0
#
# ($R0 will be "C:\Program Files\POPFile\corpus" if default corpus location is used)
#--------------------------------------------------------------------------
Function un.GetCorpusPath
!define L_CORPUS $R9
!define L_FILE_HANDLE $R8
!define L_RESULT $R7
!define L_SOURCE $R6
!define L_TEMP $R5
Exch ${L_SOURCE} ; where we are supposed to look for the corpus data
Push ${L_RESULT}
Exch
Push ${L_CORPUS}
Push ${L_FILE_HANDLE}
Push ${L_TEMP}
StrCpy ${L_CORPUS} ""
IfFileExists ${L_SOURCE}\popfile.cfg 0 use_default_locn
ClearErrors
FileOpen ${L_FILE_HANDLE} ${L_SOURCE}\popfile.cfg r
loop:
FileRead ${L_FILE_HANDLE} ${L_TEMP}
IfErrors cfg_file_done
StrCpy ${L_RESULT} ${L_TEMP} 7
StrCmp ${L_RESULT} "corpus " got_old_corpus
StrCpy ${L_RESULT} ${L_TEMP} 13
StrCmp ${L_RESULT} "bayes_corpus " got_new_corpus
Goto loop
got_old_corpus:
StrCpy ${L_CORPUS} ${L_TEMP} "" 7
Goto loop
got_new_corpus:
StrCpy ${L_CORPUS} ${L_TEMP} "" 13
Goto loop
cfg_file_done:
FileClose ${L_FILE_HANDLE}
Push ${L_CORPUS}
Call un.TrimNewlines
Pop ${L_CORPUS}
StrCmp ${L_CORPUS} "" use_default_locn
; A non-null corpus parameter has been found in 'popfile.cfg'
; Strip leading/trailing quotes, if any
StrCpy ${L_TEMP} ${L_CORPUS} 1
StrCmp ${L_TEMP} '"' 0 slashconversion
StrCpy ${L_CORPUS} ${L_CORPUS} "" 1
StrCpy ${L_TEMP} ${L_CORPUS} 1 -1
StrCmp ${L_TEMP} '"' 0 slashconversion
StrCpy ${L_CORPUS} ${L_CORPUS} -1
slashconversion:
Push ${L_CORPUS}
Call un.StrBackSlash ; ensure corpus path uses backslashes
Pop ${L_CORPUS}
StrCpy ${L_TEMP} ${L_CORPUS} 2
StrCmp ${L_TEMP} ".\" sub_folder
StrCmp ${L_TEMP} "\\" got_path
StrCpy ${L_TEMP} ${L_CORPUS} 3
StrCmp ${L_TEMP} "..\" relative_folder
StrCpy ${L_TEMP} ${L_CORPUS} 1
StrCmp ${L_TEMP} "\" instdir_drive
StrCpy ${L_TEMP} ${L_CORPUS} 1 1
StrCmp ${L_TEMP} ":" got_path
; Assume path can be safely added to $INSTDIR
StrCpy ${L_CORPUS} $INSTDIR\${L_CORPUS}
Goto got_path
sub_folder:
StrCpy ${L_CORPUS} ${L_CORPUS} "" 2
StrCpy ${L_CORPUS} $INSTDIR\${L_CORPUS}
Goto got_path
relative_folder:
StrCpy ${L_RESULT} $INSTDIR
relative_again:
StrCpy ${L_CORPUS} ${L_CORPUS} "" 3
Push ${L_RESULT}
Call un.GetParent
Pop ${L_RESULT}
StrCpy ${L_TEMP} ${L_CORPUS} 3
StrCmp ${L_TEMP} "..\" relative_again
StrCpy ${L_CORPUS} ${L_RESULT}\${L_CORPUS}
Goto got_path
instdir_drive:
StrCpy ${L_TEMP} $INSTDIR 2
StrCpy ${L_CORPUS} ${L_TEMP}${L_CORPUS}
Goto got_path
use_default_locn:
StrCpy ${L_CORPUS} ${L_SOURCE}\corpus
got_path:
StrCpy ${L_RESULT} ${L_CORPUS}
Pop ${L_TEMP}
Pop ${L_FILE_HANDLE}
Pop ${L_CORPUS}
Pop ${L_SOURCE}
Exch ${L_RESULT} ; place full path of 'corpus' directory on top of the stack
!undef L_CORPUS
!undef L_FILE_HANDLE
!undef L_RESULT
!undef L_SOURCE
!undef L_TEMP
FunctionEnd
#--------------------------------------------------------------------------
# Function: un.StrBackSlash
#
# This function is used by the uninstaller when it looks for the corpus files for the version
# of POPFile which is being upgraded. It converts all the slashes in a string to backslashes
#
# Inputs:
# (top of stack) - string containing slashes (e.g. "C:/This/and/That")
#
# Outputs:
# (top of stack) - string containing backslashes (e.g. "C:\This\and\That")
#
# Usage Example:
# Push "C:/Program Files/Directory/Whatever"
# Call un.StrBackSlash
# Pop $R0
#
# ($R0 at this point is ""C:\Program Files\Directory"\Whatever)
#
#--------------------------------------------------------------------------
Function un.StrBackSlash
Exch $R0 ; Input string with slashes
Push $R1 ; Output string using backslashes
Push $R2 ; Current character
StrCpy $R1 ""
StrCmp $R0 $R1 nothing_to_do
loop:
StrCpy $R2 $R0 1
StrCpy $R0 $R0 "" 1
StrCmp $R2 "/" found
StrCpy $R1 "$R1$R2"
StrCmp $R0 "" done loop
found:
StrCpy $R1 "$R1\"
StrCmp $R0 "" done loop
done:
StrCpy $R0 $R1
nothing_to_do:
Pop $R2
Pop $R1
Exch $R0
FunctionEnd
#--------------------------------------------------------------------------
# Function: un.GetParent
#
# This function is used by the uninstaller when it looks for the corpus files for the version
# of POPFile which is being upgraded. It extracts the parent directory from a given path.
#
# NB: Path is assumed to use backslashes (\)
#
# Inputs:
# (top of stack) - string containing a path (e.g. C:\A\B\C)
#
# Outputs:
# (top of stack) - the parent part of the input string (e.g. C:\A\B)
#
# Usage Example:
# Push "C:\Program Files\Directory\Whatever"
# Call un.GetParent
# Pop $R0
#
# ($R0 at this point is ""C:\Program Files\Directory")
#
#--------------------------------------------------------------------------
Function un.GetParent
Exch $R0
Push $R1
Push $R2
StrCpy $R1 -1
loop:
StrCpy $R2 $R0 1 $R1
StrCmp $R2 "" exit
StrCmp $R2 "\" exit
IntOp $R1 $R1 - 1
Goto loop
exit:
StrCpy $R0 $R0 $R1
Pop $R2
Pop $R1
Exch $R0
FunctionEnd
#==============================================================================================
#
# Macro-based Functions used by the installer and by the uninstaller
#
#==============================================================================================
#--------------------------------------------------------------------------
# Macro: StrStr
#
# The installation process and the uninstall process both use a function which checks if
# a given string appears inside another string. This macro makes maintenance easier by ensuring
# that both processes use identical functions, with the only difference being their names.
#
# NOTE:
# The !insertmacro StrStr "" and !insertmacro StrStr "un." commands are included in this file
# so 'installer.nsi' can use 'Call StrStr' and 'Call un.StrStr' without additional preparation.
#
# Search for matching string
#
# Inputs:
# (top of stack) - the string to be found (needle)
# (top of stack - 1) - the string to be searched (haystack)
# Outputs:
# (top of stack) - string starting with the match, if any
#
# Usage:
# Push "this is a long string"
# Push "long"
# Call StrStr
# Pop $R0
# ($R0 at this point is "long string")
#
#--------------------------------------------------------------------------
!macro StrStr UN
Function ${UN}StrStr
Exch $R1 ; Make $R1 the "needle", Top of stack = old$R1, haystack
Exch ; Top of stack = haystack, old$R1
Exch $R2 ; Make $R2 the "haystack", Top of stack = old$R2, old$R1
Push $R3 ; Length of the needle
Push $R4 ; Counter
Push $R5 ; Temp
StrLen $R3 $R1
StrCpy $R4 0
loop:
StrCpy $R5 $R2 $R3 $R4
StrCmp $R5 $R1 done
StrCmp $R5 "" done
IntOp $R4 $R4 + 1
Goto loop
done:
StrCpy $R1 $R2 "" $R4
Pop $R5
Pop $R4
Pop $R3
Pop $R2
Exch $R1
FunctionEnd
!macroend
#--------------------------------------------------------------------------
# Installer Function: StrStr
#
# This function is used during the installation process
#--------------------------------------------------------------------------
!insertmacro StrStr ""
#--------------------------------------------------------------------------
# Uninstaller Function: un.StrStr
#
# This function is used during the uninstall process
#--------------------------------------------------------------------------
!insertmacro StrStr "un."
#--------------------------------------------------------------------------
# Macro: StrCheckDecimal
#
# The installation process and the uninstall process both use a function which checks if
# a given string contains a decimal number. This macro makes maintenance easier by ensuring
# that both processes use identical functions, with the only difference being their names.
#
# The 'StrCheckDecimal' and 'un.StrCheckDecimal' functions check that a given string contains
# only the digits 0 to 9. (if the string contains any invalid characters, "" is returned)
#
# NOTE:
# The !insertmacro StrCheckDecimal "" and !insertmacro StrCheckDecimal "un." commands are
# included in this file so 'installer.nsi' can use 'Call StrCheckDecimal' and
# 'Call un.StrCheckDecimal' without additional preparation.
#
# Inputs:
# (top of stack) - string which may contain a decimal number
#
# Outputs:
# (top of stack) - the input string (if valid) or "" (if invalid)
#
# Usage:
# Push "12345"
# Call un.StrCheckDecimal
# Pop $R0
# ($R0 at this point is "12345")
#
#--------------------------------------------------------------------------
!macro StrCheckDecimal UN
Function ${UN}StrCheckDecimal
!define DECIMAL_DIGIT "0123456789"
Exch $0 ; The input string
Push $1 ; Holds the result: either "" (if input is invalid) or the input string (if valid)
Push $2 ; A character from the input string
Push $3 ; The offset to a character in the "validity check" string
Push $4 ; A character from the "validity check" string
Push $5 ; Holds the current "validity check" string
StrCpy $1 ""
next_input_char:
StrCpy $2 $0 1 ; Get the next character from the input string
StrCmp $2 "" done
StrCpy $5 ${DECIMAL_DIGIT}$2 ; Add it to end of "validity check" to guarantee a match
StrCpy $0 $0 "" 1
StrCpy $3 -1
next_valid_char:
IntOp $3 $3 + 1
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
invalid:
StrCpy $1 ""
done:
StrCpy $0 $1 ; Result is either a string of decimal digits or ""
Pop $5
Pop $4
Pop $3
Pop $2
Pop $1
Exch $0 ; place result on top of the stack
!undef DECIMAL_DIGIT
FunctionEnd
!macroend
#--------------------------------------------------------------------------
# Installer Function: StrCheckDecimal
#
# This function is used during the installation process
#--------------------------------------------------------------------------
!insertmacro StrCheckDecimal ""
#--------------------------------------------------------------------------
# Uninstaller Function: un.StrCheckDecimal
#
# This function is used during the uninstall process
#--------------------------------------------------------------------------
!insertmacro StrCheckDecimal "un."
#--------------------------------------------------------------------------
# Macro: TrimNewlines
#
# The installation process and the uninstall process both use a function which trims newlines
# from lines of text. This macro makes maintenance easier by ensuring that both processes use
# identical functions, with the only difference being their names.
#
# NOTE:
# The !insertmacro TrimNewlines "" and !insertmacro TrimNewlines "un." commands are
# included in this file so 'installer.nsi' can use 'Call TrimNewlines' and
# 'Call un.TrimNewlines' without additional preparation.
#
# Inputs:
# (top of stack) - string which may end with one or more newlines
#
# Outputs:
# (top of stack) - the input string with the trailing newlines (if any) removed
#
# Usage:
# Push "whatever$\r$\n"
# Call un.TrimNewlines
# Pop $R0
# ($R0 at this point is "whatever")
#
#--------------------------------------------------------------------------
!macro TrimNewlines UN
Function ${UN}TrimNewlines
Exch $R0
Push $R1
Push $R2
StrCpy $R1 0
loop:
IntOp $R1 $R1 - 1
StrCpy $R2 $R0 1 $R1
StrCmp $R2 "$\r" loop
StrCmp $R2 "$\n" loop
IntOp $R1 $R1 + 1
IntCmp $R1 0 no_trim_needed
StrCpy $R0 $R0 $R1
no_trim_needed:
Pop $R2
Pop $R1
Exch $R0
FunctionEnd
!macroend
#--------------------------------------------------------------------------
# Installer Function: TrimNewlines
#
# This function is used during the installation process
#--------------------------------------------------------------------------
!insertmacro TrimNewlines ""
#--------------------------------------------------------------------------
# Uninstaller Function: un.TrimNewlines
#
# This function is used during the uninstall process
#--------------------------------------------------------------------------
!insertmacro TrimNewlines "un."
#--------------------------------------------------------------------------
# End of 'pfi-library.nsh'
#--------------------------------------------------------------------------
|
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1:/tmp/cvs-serv25926 Modified Files: Bulgarian-pfi.nsh Danish-pfi.nsh Dutch-pfi.nsh English-pfi.nsh Finnish-pfi.nsh French-pfi.nsh German-pfi.nsh Hungarian-pfi.nsh Japanese-pfi.nsh Korean-pfi.nsh Portuguese-pfi.nsh PortugueseBR-pfi.nsh Russian-pfi.nsh SimpChinese-pfi.nsh Slovak-pfi.nsh Spanish-pfi.nsh Swedish-pfi.nsh TradChinese-pfi.nsh Ukrainian-pfi.nsh Log Message: Added strings used for "upgrade" uninstalls and a simple verbosity control. Index: Bulgarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Bulgarian-pfi.nsh 9 Jul 2003 13:19:15 -0000 1.4 --- Bulgarian-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: Danish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Danish-pfi.nsh 9 Jul 2003 13:19:37 -0000 1.4 --- Danish-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: Dutch-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Dutch-pfi.nsh 9 Jul 2003 13:19:57 -0000 1.4 --- Dutch-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: English-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** English-pfi.nsh 9 Jul 2003 13:20:16 -0000 1.4 --- English-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: Finnish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Finnish-pfi.nsh 9 Jul 2003 13:20:40 -0000 1.4 --- Finnish-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: French-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** French-pfi.nsh 9 Jul 2003 13:21:06 -0000 1.4 --- French-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: German-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** German-pfi.nsh 9 Jul 2003 13:21:26 -0000 1.4 --- German-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: Hungarian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Hungarian-pfi.nsh 9 Jul 2003 13:21:51 -0000 1.4 --- Hungarian-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: Japanese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Japanese-pfi.nsh 9 Jul 2003 13:22:17 -0000 1.5 --- Japanese-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.6 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: Korean-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Korean-pfi.nsh 9 Jul 2003 13:22:51 -0000 1.5 --- Korean-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.6 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: Portuguese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Portuguese-pfi.nsh 9 Jul 2003 13:23:33 -0000 1.4 --- Portuguese-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: PortugueseBR-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PortugueseBR-pfi.nsh 9 Jul 2003 13:23:54 -0000 1.4 --- PortugueseBR-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: Russian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Russian-pfi.nsh 9 Jul 2003 13:24:21 -0000 1.4 --- Russian-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: SimpChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SimpChinese-pfi.nsh 9 Jul 2003 13:24:51 -0000 1.4 --- SimpChinese-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: Slovak-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Slovak-pfi.nsh 9 Jul 2003 13:25:13 -0000 1.4 --- Slovak-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: Spanish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Spanish-pfi.nsh 9 Jul 2003 13:25:34 -0000 1.4 --- Spanish-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: Swedish-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Swedish-pfi.nsh 9 Jul 2003 13:25:55 -0000 1.4 --- Swedish-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: TradChinese-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-pfi.nsh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TradChinese-pfi.nsh 9 Jul 2003 13:26:18 -0000 1.5 --- TradChinese-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.6 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- Index: Ukrainian-pfi.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-pfi.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Ukrainian-pfi.nsh 9 Jul 2003 13:26:51 -0000 1.4 --- Ukrainian-pfi.nsh 12 Jul 2003 11:52:24 -0000 1.5 *************** *** 25,32 **** # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string in which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- #-------------------------------------------------------------------------- # Mark the start of the language data --- 25,36 ---- # (2) The sequence \r\n\r\n inserts a blank line # ! # (the 'PFI_LANG_CBP_IO_INTRO' custom page string which is listed under the heading # 'Custom Page - POPFile Classification Bucket Creation' includes some examples) #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Mark the start of the language data *************** *** 69,72 **** --- 73,80 ---- ; Message Boxes used when validating user's selections + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_1 "A previous installation of POPFile has been detected" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_2 "Do you want to uninstall it ?" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBUNINST_3 "( 'Yes' recommended )" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_1 "The POP3 port cannot be set to" !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBPOP3_2 "The port must be a number in the range 1 to 65535." *************** *** 79,82 **** --- 87,95 ---- !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_1 "The POP3 port must be different from the 'User Interface' port." !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_MBDIFF_2 "Please change your port selections." + + ; Banner message displayed whilst uninstalling old version + + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_1 "Removing previous version" + !insertmacro PFI_LANG_STRING PFI_LANG_OPTIONS_BANNER_2 "This may take a few seconds..." #-------------------------------------------------------------------------- |
Update of /cvsroot/popfile/windows/languages In directory sc8-pr-cvs1:/tmp/cvs-serv25703 Modified Files: Bulgarian-mui.nsh Danish-mui.nsh Dutch-mui.nsh English-mui.nsh Finnish-mui.nsh French-mui.nsh German-mui.nsh Hungarian-mui.nsh Japanese-mui.nsh Korean-mui.nsh Portuguese-mui.nsh PortugueseBR-mui.nsh Russian-mui.nsh SimpChinese-mui.nsh Slovak-mui.nsh Spanish-mui.nsh Swedish-mui.nsh TradChinese-mui.nsh Ukrainian-mui.nsh Log Message: Added strings used for "upgrade" uninstalls and a simple verbosity control. Index: Bulgarian-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Bulgarian-mui.nsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Bulgarian-mui.nsh 3 Jul 2003 09:16:27 -0000 1.2 --- Bulgarian-mui.nsh 12 Jul 2003 11:49:08 -0000 1.3 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: Danish-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Danish-mui.nsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Danish-mui.nsh 3 Jul 2003 09:16:27 -0000 1.2 --- Danish-mui.nsh 12 Jul 2003 11:49:08 -0000 1.3 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: Dutch-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Dutch-mui.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Dutch-mui.nsh 2 Jul 2003 12:28:50 -0000 1.1 --- Dutch-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: English-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/English-mui.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** English-mui.nsh 1 Jul 2003 19:38:24 -0000 1.1 --- English-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: Finnish-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Finnish-mui.nsh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Finnish-mui.nsh 7 Jul 2003 18:35:49 -0000 1.4 --- Finnish-mui.nsh 12 Jul 2003 11:49:08 -0000 1.5 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: French-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/French-mui.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** French-mui.nsh 2 Jul 2003 12:30:46 -0000 1.1 --- French-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: German-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/German-mui.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** German-mui.nsh 2 Jul 2003 12:31:33 -0000 1.1 --- German-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: Hungarian-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Hungarian-mui.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Hungarian-mui.nsh 2 Jul 2003 12:32:19 -0000 1.1 --- Hungarian-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: Japanese-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Japanese-mui.nsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Japanese-mui.nsh 3 Jul 2003 09:16:27 -0000 1.2 --- Japanese-mui.nsh 12 Jul 2003 11:49:08 -0000 1.3 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: Korean-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Korean-mui.nsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Korean-mui.nsh 3 Jul 2003 09:16:27 -0000 1.2 --- Korean-mui.nsh 12 Jul 2003 11:49:08 -0000 1.3 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: Portuguese-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Portuguese-mui.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Portuguese-mui.nsh 2 Jul 2003 12:34:59 -0000 1.1 --- Portuguese-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: PortugueseBR-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/PortugueseBR-mui.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PortugueseBR-mui.nsh 2 Jul 2003 12:35:34 -0000 1.1 --- PortugueseBR-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: Russian-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Russian-mui.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Russian-mui.nsh 2 Jul 2003 12:45:53 -0000 1.1 --- Russian-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: SimpChinese-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/SimpChinese-mui.nsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SimpChinese-mui.nsh 3 Jul 2003 09:16:27 -0000 1.2 --- SimpChinese-mui.nsh 12 Jul 2003 11:49:08 -0000 1.3 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: Slovak-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Slovak-mui.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Slovak-mui.nsh 2 Jul 2003 12:36:42 -0000 1.1 --- Slovak-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: Spanish-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Spanish-mui.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Spanish-mui.nsh 2 Jul 2003 12:37:20 -0000 1.1 --- Spanish-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: Swedish-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Swedish-mui.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Swedish-mui.nsh 2 Jul 2003 12:37:57 -0000 1.1 --- Swedish-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: TradChinese-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/TradChinese-mui.nsh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TradChinese-mui.nsh 3 Jul 2003 09:16:27 -0000 1.2 --- TradChinese-mui.nsh 12 Jul 2003 11:49:08 -0000 1.3 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome Index: Ukrainian-mui.nsh =================================================================== RCS file: /cvsroot/popfile/windows/languages/Ukrainian-mui.nsh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Ukrainian-mui.nsh 2 Jul 2003 12:46:35 -0000 1.1 --- Ukrainian-mui.nsh 12 Jul 2003 11:49:08 -0000 1.2 *************** *** 13,16 **** --- 13,20 ---- #-------------------------------------------------------------------------- + !ifndef PFI_VERBOSE + !verbose 3 + !endif + #-------------------------------------------------------------------------- # Standard MUI Page - Welcome |
|
From: <jgr...@us...> - 2003-07-12 06:37:49
|
Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv24049/tests
Added Files:
TestWordMangle.tst
Log Message:
Added test suite for WordMangle.pm with 100% coverage
--- NEW FILE: TestWordMangle.tst ---
# ---------------------------------------------------------------------------------------------
#
# Tests for WordMangle.pm
#
# Copyright (c) 2003 John Graham-Cumming
#
# ---------------------------------------------------------------------------------------------
use Classifier::WordMangle;
my $w = new Classifier::WordMangle;
# Test basic mangling functions
test_assert_equal( $w->mangle( 'BIGWORD' ), 'bigword' );
test_assert_equal( $w->mangle( 'BIG+/?*|()[]{}^$.WORD' ), 'big..............word' );
test_assert_equal( $w->mangle( 'awordthatisfartolongtobeacceptableforuseinclassification' ), '' );
test_assert_equal( $w->mangle( 'A1234BEF66' ), '' );
test_assert_equal( $w->mangle( 'BIG:WORD' ), 'bigword' );
test_assert_equal( $w->mangle( 'BIG:WORD', 1 ), 'big:word' );
# Test stop words
test_assert_equal( $w->mangle( 'BIGWORD' ), 'bigword' );
test_assert_equal( $w->add_stopword( 'bigword' ), 1 );
test_assert_equal( $w->mangle( 'BIGWORD' ), '' );
test_assert_equal( $w->remove_stopword( 'bigword' ), 1 );
test_assert_equal( $w->mangle( 'BIGWORD' ), 'bigword' );
test_assert_equal( $w->add_stopword( '' ), 0 );
test_assert_equal( $w->remove_stopword( '' ), 0 );
test_assert_equal( $w->add_stopword( 'A1234bef66' ), 0 );
test_assert_equal( $w->remove_stopword( 'A1234bef66' ), 0 );
# Getter/setter
my %stops = ( 'oneword', 1 );
$w->stopwords( \%stops );
test_assert_equal( $w->mangle( 'oneWORD' ), '' );
my @stopwords = $w->stopwords();
test_assert_equal( $#stopwords, 0 );
test_assert_equal( $stopwords[0], 'oneword' );
$w->load_stopwords();
# Make sure that stopwords got to disk
test_assert_equal( $w->add_stopword( 'bigword' ), 1 );
open WORDS, "<stopwords";
my $found = 0;
while (<WORDS>) {
if ( $_ =~ /bigword/ ) {
$found = 1;
last;
}
}
close WORDS;
test_assert( $found );
test_assert_equal( $w->remove_stopword( 'bigword' ), 1 );
|
|
From: <jgr...@us...> - 2003-07-12 06:37:49
|
Update of /cvsroot/popfile/engine/Devel
In directory sc8-pr-cvs1:/tmp/cvs-serv24049/Devel
Modified Files:
TestCoverage.pm
Log Message:
Added test suite for WordMangle.pm with 100% coverage
Index: TestCoverage.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Devel/TestCoverage.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestCoverage.pm 12 Jul 2003 06:17:03 -0000 1.5
--- TestCoverage.pm 12 Jul 2003 06:37:46 -0000 1.6
***************
*** 90,94 ****
}
} else {
! print "$file:$current_line $_" if ( $file =~/MailParse/);
}
}
--- 90,94 ----
}
} else {
! # print "$file:$current_line $_" if ( $file =~/MailParse/);
}
}
|
|
From: <jgr...@us...> - 2003-07-12 06:37:49
|
Update of /cvsroot/popfile/engine/Classifier
In directory sc8-pr-cvs1:/tmp/cvs-serv24049/Classifier
Modified Files:
WordMangle.pm
Log Message:
Added test suite for WordMangle.pm with 100% coverage
Index: WordMangle.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Classifier/WordMangle.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** WordMangle.pm 2 Jun 2003 19:51:00 -0000 1.24
--- WordMangle.pm 12 Jul 2003 06:37:46 -0000 1.25
***************
*** 167,171 ****
if ( defined( $value ) ) {
! $self->{stop__} = $value;
}
--- 167,171 ----
if ( defined( $value ) ) {
! %{$self->{stop__}} = %{$value};
}
|
|
From: <jgr...@us...> - 2003-07-12 06:37:49
|
Update of /cvsroot/popfile/engine In directory sc8-pr-cvs1:/tmp/cvs-serv24049 Modified Files: stopwords Log Message: Added test suite for WordMangle.pm with 100% coverage Index: stopwords =================================================================== RCS file: /cvsroot/popfile/engine/stopwords,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** stopwords 14 Jun 2003 21:10:12 -0000 1.2 --- stopwords 12 Jul 2003 06:37:46 -0000 1.3 *************** *** 1,193 **** ! strike ! you ! date ! textflow ! form ! him ! pdt ! also ! code ! acronym ! pst ! valign ! subject ! cgi ! charset ! nbsp ! est ! sun ! your ! but ! title ! and ! multicol ! small ! xmp ! https ! area ! author ! all ! being ! dir ! she ! jan ! color ! will ! have ! received ! going ! serif ! htm ! edt ! can ! mbox ! height ! dfn ! iframe ! were ! com ! would ! off ! img ! etc ! noframes ! http ! bgsound ! jun ! sup ! gmt ! address ! basefont ! abbrev ! head ! tbody ! fri ! may ! ask ! aug ! overlay ! div ! www ! status ! doing ! tue ! person ! his ! cellspacing ! mon ! select ! helo ! esmtp ! alt ! note ! border ! message ! wbr ! big ! thu ! yes ! feb ! input ! table ! has ! not ! that ! meta ! isindex ! gone ! map ! our ! tfoot ! caption ! its ! encoding ! out ! base ! lang ! align ! strong ! marquee ! edu ! applet ! span ! nov ! with ! spacer ! width ! smtp ! goes ! did ! inc ! range ! wed ! frame ! dec ! localhost ! body ! nobr ! bgcolor ! html ! from ! var ! her ! oct ! banner ! del ! math ! blockquote ! path ! any ! spot ! textarea ! cdt ! the ! embed ! done ! yet ! it's ! font ! net ! blink ! thead ! plaintext ! could ! went ! does ! param ! jul ! this ! org ! for ! mailto ! src ! mar ! cst ! kbd ! listing ! ltd ! pre ! are ! having ! center ! helvetica ! samp ! been ! tab ! col ! fig ! mail ! cite ! link ! had ! script ! menu ! colgroup ! sans ! return ! ins ! sep ! was ! sub ! frameset ! sat ! apr --- 1,193 ---- ! var ! localhost ! jun ! head ! width ! you ! fri ! src ! did ! tbody ! cst ! cdt ! acronym ! helvetica ! basefont ! pst ! are ! colgroup ! pdt ! htm ! https ! smtp ! dir ! the ! would ! her ! div ! path ! font ! overlay ! mailto ! strike ! tab ! thu ! bgcolor ! center ! area ! frame ! height ! address ! table ! ask ! cite ! have ! base ! lang ! feb ! went ! big ! thead ! script ! listing ! all ! title ! esmtp ! www ! jan ! meta ! alt ! return ! xmp ! sep ! mon ! link ! mail ! http ! was ! from ! does ! cgi ! that ! being ! going ! sub ! html ! embed ! net ! code ! blockquote ! subject ! cellspacing ! multicol ! this ! sun ! col ! com ! sup ! aug ! its ! org ! map ! dec ! helo ! mar ! img ! wbr ! samp ! had ! will ! done ! del ! and ! received ! may ! tfoot ! encoding ! oct ! iframe ! message ! with ! has ! noframes ! caption ! ltd ! your ! spot ! align ! mbox ! having ! doing ! him ! menu ! abbrev ! any ! can ! form ! inc ! valign ! marquee ! his ! nobr ! sans ! range ! for ! color ! dfn ! yes ! yet ! goes ! ins ! could ! she ! span ! were ! textflow ! body ! not ! status ! nov ! bgsound ! small ! also ! blink ! applet ! gmt ! serif ! kbd ! est ! fig ! math ! edt ! tue ! edu ! textarea ! gone ! sat ! frameset ! person ! border ! wed ! apr ! charset ! nbsp ! banner ! strong ! pre ! etc ! input ! off ! param ! it's ! date ! but ! our ! plaintext ! out ! select ! been ! author ! isindex ! jul ! spacer ! note |
|
From: <jgr...@us...> - 2003-07-12 06:18:15
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv21826
Modified Files:
bayes.pl
Log Message:
Remove debugging code
Index: bayes.pl
===================================================================
RCS file: /cvsroot/popfile/engine/bayes.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** bayes.pl 12 Jul 2003 06:17:03 -0000 1.21
--- bayes.pl 12 Jul 2003 06:18:02 -0000 1.22
***************
*** 44,58 ****
$c->load_configuration();
- $b->config_( 'corpus', 'tests/corpus' );
$b->start();
- $b->{parser__}->{color__} = 1;
- $b->{parser__}->{bayes__} = $b;
my @files = glob $ARGV[0];
foreach my $file (@files) {
print "$file is '" . $b->classify($file) . "'\n";
- print $b->{parser__}->parse_file($file);
-
}
--- 44,53 ----
|
|
From: <jgr...@us...> - 2003-07-12 06:17:08
|
Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv21679
Modified Files:
bayes.pl tests.pl
Log Message:
Add colorization test and improve TestMailParse to bring up to 91% coverage... will get to 100% tomorrow
Index: bayes.pl
===================================================================
RCS file: /cvsroot/popfile/engine/bayes.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** bayes.pl 9 Jul 2003 21:53:19 -0000 1.20
--- bayes.pl 12 Jul 2003 06:17:03 -0000 1.21
***************
*** 44,52 ****
--- 44,58 ----
$c->load_configuration();
+ $b->config_( 'corpus', 'tests/corpus' );
$b->start();
+ $b->{parser__}->{color__} = 1;
+ $b->{parser__}->{bayes__} = $b;
+
my @files = glob $ARGV[0];
foreach my $file (@files) {
print "$file is '" . $b->classify($file) . "'\n";
+ print $b->{parser__}->parse_file($file);
+
}
Index: tests.pl
===================================================================
RCS file: /cvsroot/popfile/engine/tests.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tests.pl 11 Jul 2003 21:53:16 -0000 1.18
--- tests.pl 12 Jul 2003 06:17:03 -0000 1.19
***************
*** 173,176 ****
--- 173,177 ----
if ( !defined( eval $suite ) ) {
print "Error in $test: $@";
+ $code = 1;
}
|
|
From: <jgr...@us...> - 2003-07-12 06:17:08
|
Update of /cvsroot/popfile/engine/Devel
In directory sc8-pr-cvs1:/tmp/cvs-serv21679/Devel
Modified Files:
TestCoverage.pm
Log Message:
Add colorization test and improve TestMailParse to bring up to 91% coverage... will get to 100% tomorrow
Index: TestCoverage.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Devel/TestCoverage.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestCoverage.pm 12 Jul 2003 05:59:02 -0000 1.4
--- TestCoverage.pm 12 Jul 2003 06:17:03 -0000 1.5
***************
*** 90,94 ****
}
} else {
! print "$file $_\n" if ( $file =~/Configuration/);
}
}
--- 90,94 ----
}
} else {
! print "$file:$current_line $_" if ( $file =~/MailParse/);
}
}
|