From: Sébastien Aperghis-Tramoni <sebastien@aperghis.net>
Date: Wed, 5 Sep 2007 12:27:54 +0000 (+0200)
Subject: Fw: CPAN Upload: S/SA/SAPER/Sys-Syslog-0.20.tar.gz
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=47ebfcbbf4f22b9627f8dba20414b7989eb3b835;p=p5sagit%2Fp5-mst-13.2.git

Fw: CPAN Upload: S/SA/SAPER/Sys-Syslog-0.20.tar.gz
Message-ID: <1188988074.46de84aa8fceb@imp.free.fr>

p4raw-id: //depot/perl@31792
---

diff --git a/MANIFEST b/MANIFEST
index adf62c9..5350e35 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1082,6 +1082,7 @@ ext/Sys/Syslog/fallback/const-c.inc	Sys::Syslog constants fallback file
 ext/Sys/Syslog/fallback/const-xs.inc	Sys::Syslog constants fallback file
 ext/Sys/Syslog/Makefile.PL	Sys::Syslog extension makefile writer
 ext/Sys/Syslog/README		README for Sys::Syslog
+ext/Sys/Syslog/README.win32	README for Sys::Syslog on Windows
 ext/Sys/Syslog/Syslog.pm	Sys::Syslog extension Perl module
 ext/Sys/Syslog/Syslog.xs	Sys::Syslog extension external subroutines
 ext/Sys/Syslog/t/00-load.t	test for Sys::Syslog
diff --git a/ext/Sys/Syslog/Changes b/ext/Sys/Syslog/Changes
index fdb71a3..8018b81 100644
--- a/ext/Sys/Syslog/Changes
+++ b/ext/Sys/Syslog/Changes
@@ -1,6 +1,9 @@
 Revision history for Sys-Syslog
 
-0.19 -- 2007.08.xx -- Sebastien Aperghis-Tramoni (SAPER)
+0.20 -- 2007.09.05 -- Sebastien Aperghis-Tramoni (SAPER)
+        [DOC] Added README.win32 which was missing in MANIFEST.
+
+0.19 -- 2007.09.05 -- Sebastien Aperghis-Tramoni (SAPER)
         [BUGFIX] CPAN-RT#20635: Fix tests to avoid problems related to the 
         "stream" mechanism which occured on Debian and Cygwin.
         [BUGFIX] CPAN-RT#20780: Facility could not be temporarily changed.
diff --git a/ext/Sys/Syslog/Makefile.PL b/ext/Sys/Syslog/Makefile.PL
index 679a2ff..511eba0 100644
--- a/ext/Sys/Syslog/Makefile.PL
+++ b/ext/Sys/Syslog/Makefile.PL
@@ -100,14 +100,14 @@ if (-c "/dev/conslog" and -w _) {
     # permissions.
     $_PATH_LOG = "/dev/conslog";
 }
-elsif (-S "/dev/log" and -w _) {
-    # Most unixes have a unix domain socket /dev/log.
-    $_PATH_LOG = "/dev/log";
-}
 elsif (-S "/var/run/syslog" and -w _) {
     # Mac OS X puts it at a different path.
     $_PATH_LOG = "/var/run/syslog";
 }
+elsif (-S "/dev/log" and -w _) {
+    # Most unixes have a unix domain socket /dev/log.
+    $_PATH_LOG = "/dev/log";
+}
 else {
     $_PATH_LOG = "";
 }
diff --git a/ext/Sys/Syslog/README.win32 b/ext/Sys/Syslog/README.win32
new file mode 100644
index 0000000..adf253a
--- /dev/null
+++ b/ext/Sys/Syslog/README.win32
@@ -0,0 +1,30 @@
+NAME
+
+    README.win32 - Customise and build Sys::Syslog with Win32 EventLog support
+
+
+DESCRIPTION
+
+    This package includes support for the Win32 Event log.  This requires 
+    building a message file and then compiling it and linking it into the 
+    final .DLL produced by MakeMaker.  The default message text file used 
+    by Sys::Syslog is PerlLog.mc, located in the win32/ subdirectory.
+
+    If the message file is updated then you need to go in the win32/ 
+    subdirectory and run the "compile.pl" command to update the relevent 
+    files. Note that Sys::Syslog::Win32 is built by this process.
+
+    The following files are in the win32 directory:
+
+        PerlLog.mc  -- Message file, change this if you change anything.
+        compile.pl  -- Compile the message file and produce Win32.pm and 
+                       PerlLog.RES. Requires that mc.exe and rc.exe are 
+                       in the path.
+
+        PerlLog.RES -- Precompiled resource file, used when building the DLL
+        Win32.pm    -- Generated Win32 module for working with the resource file
+
+    When building win32/PerlLog.RES will be linked into the final XS file, 
+    and win32/Win32.pm will be copied to lib/Sys/Syslog/Win32.pm, which will
+    then be installed by MakeMaker as per normal.
+
diff --git a/ext/Sys/Syslog/Syslog.pm b/ext/Sys/Syslog/Syslog.pm
index 957c22a..b401d48 100644
--- a/ext/Sys/Syslog/Syslog.pm
+++ b/ext/Sys/Syslog/Syslog.pm
@@ -10,7 +10,7 @@ require 5.006;
 require Exporter;
 
 {   no strict 'vars';
-    $VERSION = '0.19_01';
+    $VERSION = '0.20';
     @ISA = qw(Exporter);
 
     %EXPORT_TAGS = (
@@ -705,7 +705,7 @@ Sys::Syslog - Perl interface to the UNIX syslog(3) calls
 
 =head1 VERSION
 
-Version 0.19
+Version 0.20
 
 =head1 SYNOPSIS
 
diff --git a/ext/Sys/Syslog/t/00-load.t b/ext/Sys/Syslog/t/00-load.t
index 92dcb15..3fa291b 100644
--- a/ext/Sys/Syslog/t/00-load.t
+++ b/ext/Sys/Syslog/t/00-load.t
@@ -3,8 +3,8 @@ use strict;
 use Test::More tests => 1;
 
 BEGIN {
-	use_ok( 'Sys::Syslog' );
+    use_ok( 'Sys::Syslog' );
 }
 
 diag( "Testing Sys::Syslog $Sys::Syslog::VERSION, Perl $], $^X" )
-    if (! exists($ENV{'PERL_CORE'}));
+    unless $ENV{PERL_CORE};
diff --git a/ext/Sys/Syslog/t/syslog.t b/ext/Sys/Syslog/t/syslog.t
index 5a2fc3e..d8a4f8f 100755
--- a/ext/Sys/Syslog/t/syslog.t
+++ b/ext/Sys/Syslog/t/syslog.t
@@ -155,7 +155,7 @@ for my $sock_type (qw(native eventlog unix stream inet tcp udp)) {
 
         # syslog() with facilities "local0" and "local1" (as a strings), should fail
         $r = eval { syslog('local0,local1', "$test_string by connecting to a $sock_type socket") } || 0;
-        like( $@, '/^syslog: too many facilities given: local1/', "[$sock_type] syslog() called with level 'info,notice'" );
+        like( $@, '/^syslog: too many facilities given: local1/', "[$sock_type] syslog() called with level 'local0,local1'" );
         ok( !$r, "[$sock_type] syslog() should return false: '$r'" );
 
         # syslog() with level "info" (as a string), should pass