r35297 - in /branches/upstream/libfile-libmagic-perl/current: Changes LibMagic.pm MANIFEST Makefile.PL README inc/ inc/Devel/ inc/Devel/CheckLib.pm
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Wed May 13 05:22:29 UTC 2009
Author: ryan52-guest
Date: Wed May 13 05:22:24 2009
New Revision: 35297
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=35297
Log:
[svn-upgrade] Integrating new upstream version, libfile-libmagic-perl (0.93)
Added:
branches/upstream/libfile-libmagic-perl/current/inc/
branches/upstream/libfile-libmagic-perl/current/inc/Devel/
branches/upstream/libfile-libmagic-perl/current/inc/Devel/CheckLib.pm
Modified:
branches/upstream/libfile-libmagic-perl/current/Changes
branches/upstream/libfile-libmagic-perl/current/LibMagic.pm
branches/upstream/libfile-libmagic-perl/current/MANIFEST
branches/upstream/libfile-libmagic-perl/current/Makefile.PL
branches/upstream/libfile-libmagic-perl/current/README
Modified: branches/upstream/libfile-libmagic-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-libmagic-perl/current/Changes?rev=35297&op=diff
==============================================================================
--- branches/upstream/libfile-libmagic-perl/current/Changes (original)
+++ branches/upstream/libfile-libmagic-perl/current/Changes Wed May 13 05:22:24 2009
@@ -1,68 +1,66 @@
Revision history for Perl extension File::LibMagic.
-0.92
- May 2009
+0.93 May 2009
+ using Devel::CheckLib as suggested in
+ http://wiki.cpantesters.org/wiki/CPANAuthorNotes
+0.92 May 2009
"normalisation"-problem -> changed t/6-oo.t
-0.91
- Feb 2009
-
+0.91 Feb 2009
Changed t/6-oo.t in order to pass 'make test' for file-5.x
-0.90
- Nov 2008
+0.90 Nov 2008
removed some debugging code I accidently left in
-0.89
- Aug 2008
+0.89 Aug 2008
added -lz to Makefile.PL in order to compile under
FreeBSD
-0.88 May 2008
+0.88 May 2008
more experiments
-0.87 May 2008
+0.87 May 2008
experimenting with magic_buffer_offset
-0.86 May 2008
+0.86 May 2008
'file' version 4.24 returns slightly different filetypes.
this makes 'make test' fail. fixed it for the new
version. But I'm afraid this breaks the 'make test' for
older versions of the package 'file'.
-0.85 June 2006
+0.85 June 2006
Minor cleanup of the MANIFEST to avoid warnings (Michael Hendricks)
-0.84 June 2006
+0.84 June 2006
(all implemented by Michael Hendricks)
some XS-Code cleanup,
import of constants like MAGIC_NONE from magic.h,
much improved error handling.
additional OO-Interface
-0.83 June 2006
+0.83 June 2006
Small documentation update
-0.82 April 2005
+0.82 April 2005
Found two bugs
-0.81 April 2005
+0.81 April 2005
Port to AMD-64, thanks to Nathan Hawkins <utsl at quic.net>
-0.80 July 2004
+0.80 July 2004
some improvements in colaboration with James Olin Oden <joden at lee.k12.nc.us>
-0.10 Apr 2004
+0.10 Apr 2004
some cleanup
-0.03 Tue Mar 23 20:19:23 CET 2004
+0.03 Tue Mar 23 20:19:23 CET 2004
hacked magic_open & magic_load but it's not mature enough
-0.02 Tue Mar 23 15:23:17 CET 2004
+0.02 Tue Mar 23 15:23:17 CET 2004
magic_file implemented
-0.01 Mon Mar 15 22:52:03 2004
+0.01 Mon Mar 15 22:52:03 2004
- original version; created by h2xs 1.22 with options
--skip-ppport File::LibMagic
Modified: branches/upstream/libfile-libmagic-perl/current/LibMagic.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-libmagic-perl/current/LibMagic.pm?rev=35297&op=diff
==============================================================================
--- branches/upstream/libfile-libmagic-perl/current/LibMagic.pm (original)
+++ branches/upstream/libfile-libmagic-perl/current/LibMagic.pm Wed May 13 05:22:24 2009
@@ -30,7 +30,7 @@
our @EXPORT = qw( );
-our $VERSION = '0.92';
+our $VERSION = '0.93';
sub AUTOLOAD {
# This AUTOLOAD is used to 'autoload' constants from the constant()
@@ -267,7 +267,13 @@
=over 1
-=item "normalisation"-problem, fixme
+=item "normalisation"-problem:
+
+The results from libmagic are dependend on the (linux) distribution being used.
+A Gentoo-Linux might return "text/plain; charset=us-asci", an OpenSUSE
+"text/plain charset=us-asci" (no semicolon!). Please check this if you run
+your project on a different platform (and send me an mail if you see different
+outputs/return-values).
=item I'm still learning perlxs ...
Modified: branches/upstream/libfile-libmagic-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-libmagic-perl/current/MANIFEST?rev=35297&op=diff
==============================================================================
--- branches/upstream/libfile-libmagic-perl/current/MANIFEST (original)
+++ branches/upstream/libfile-libmagic-perl/current/MANIFEST Wed May 13 05:22:24 2009
@@ -1,19 +1,20 @@
Changes
-LibMagic.pm
-LibMagic.xs
-MANIFEST
-Makefile.PL
-README
-README.64-bit
const-c.inc
const-xs.inc
-example/Makefile
example/a.pl
example/b.pl
example/c.pl
+example/Makefile
example/pointersize.c
example/t2.pl
example/test-libmagic.c
+inc/Devel/CheckLib.pm
+LibMagic.pm
+LibMagic.xs
+Makefile.PL
+MANIFEST
+README
+README.64-bit
t/1.t
t/2-easy.t
t/3-complete-errors.t
Modified: branches/upstream/libfile-libmagic-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-libmagic-perl/current/Makefile.PL?rev=35297&op=diff
==============================================================================
--- branches/upstream/libfile-libmagic-perl/current/Makefile.PL (original)
+++ branches/upstream/libfile-libmagic-perl/current/Makefile.PL Wed May 13 05:22:24 2009
@@ -4,14 +4,17 @@
use ExtUtils::MakeMaker;
use Config qw/%Config/;
-# See lib/ExtUtils/MakeMaker.pm for details of how to influence
-# the contents of the Makefile that is written.
+use lib qw(inc);
+use Devel::CheckLib;
+
+check_lib_or_exit( lib => 'magic', header => 'magic.h' );
+
WriteMakefile(
'NAME' => 'File::LibMagic',
'VERSION_FROM' => 'LibMagic.pm', # finds $VERSION
- 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1
+ 'PREREQ_PM' => { },
'ABSTRACT_FROM' => 'LibMagic.pm', # retrieve abstract from module
- 'AUTHOR' => 'Andreas Fitzner <fitzner at informatik.hu-berlin.de>',
+ 'AUTHOR' => 'Andreas Fitzner <andreas.fitzner at fv-berlin.de>',
'LIBS' => ['-lmagic -lz'], # e.g., '-lm'
'DEFINE' => '', # e.g., '-DHAVE_SOMETHING'
'INC' => '-I.', # e.g., '-I. -I/usr/include/other'
Modified: branches/upstream/libfile-libmagic-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-libmagic-perl/current/README?rev=35297&op=diff
==============================================================================
--- branches/upstream/libfile-libmagic-perl/current/README (original)
+++ branches/upstream/libfile-libmagic-perl/current/README Wed May 13 05:22:24 2009
@@ -1,5 +1,5 @@
-File/LibMagic version 0.92
-==========================
+File/LibMagic
+=============
DESCRIPTION
Added: branches/upstream/libfile-libmagic-perl/current/inc/Devel/CheckLib.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfile-libmagic-perl/current/inc/Devel/CheckLib.pm?rev=35297&op=file
==============================================================================
--- branches/upstream/libfile-libmagic-perl/current/inc/Devel/CheckLib.pm (added)
+++ branches/upstream/libfile-libmagic-perl/current/inc/Devel/CheckLib.pm Wed May 13 05:22:24 2009
@@ -1,0 +1,350 @@
+# $Id: CheckLib.pm,v 1.22 2008/03/12 19:52:50 drhyde Exp $
+
+package Devel::CheckLib;
+
+use strict;
+use vars qw($VERSION @ISA @EXPORT);
+$VERSION = '0.5';
+use Config;
+
+use File::Spec;
+use File::Temp;
+
+require Exporter;
+ at ISA = qw(Exporter);
+ at EXPORT = qw(assert_lib check_lib_or_exit);
+
+# localising prevents the warningness leaking out of this module
+local $^W = 1; # use warnings is a 5.6-ism
+
+_findcc(); # bomb out early if there's no compiler
+
+=head1 NAME
+
+Devel::CheckLib - check that a library is available
+
+=head1 DESCRIPTION
+
+Devel::CheckLib is a perl module that checks whether a particular C
+library and its headers are available.
+
+=head1 SYNOPSIS
+
+ # in a Makefile.PL or Build.PL
+ use lib qw(inc);
+ use Devel::CheckLib;
+
+ check_lib_or_exit( lib => 'jpeg', header => 'jpeglib.h' );
+ check_lib_or_exit( lib => [ 'iconv', 'jpeg' ] );
+
+ # or prompt for path to library and then do this:
+ check_lib_or_exit( lib => 'jpeg', libpath => $additional_path );
+
+=head1 HOW IT WORKS
+
+You pass named parameters to a function, describing to it how to build
+and link to the libraries.
+
+It works by trying to compile this:
+
+ int main(void) { return 0; }
+
+and linking it to the specified libraries. If something pops out the end
+which looks executable, then we know that it worked. That tiny program is
+built once for each library that you specify, and (without linking) once
+for each header file.
+
+=head1 FUNCTIONS
+
+All of these take the same named parameters and are exported by default.
+To avoid exporting them, C<use Devel::CheckLib ()>.
+
+=head2 assert_lib
+
+This takes several named parameters, all of which are optional, and dies
+with an error message if any of the libraries listed can
+not be found. B<Note>: dying in a Makefile.PL or Build.PL may provoke
+a 'FAIL' report from CPAN Testers' automated smoke testers. Use
+C<check_lib_or_exit> instead.
+
+The named parameters are:
+
+=over
+
+=item lib
+
+Must be either a string with the name of a single
+library or a reference to an array of strings of library names. Depending
+on the compiler found, library names will be fed to the compiler either as
+C<-l> arguments or as C<.lib> file names. (E.g. C<-ljpeg> or C<jpeg.lib>)
+
+=item libpath
+
+a string or an array of strings
+representing additional paths to search for libraries.
+
+=item LIBS
+
+a C<ExtUtils::MakeMaker>-style space-seperated list of
+libraries (each preceded by '-l') and directories (preceded by '-L').
+
+=back
+
+And libraries are no use without header files, so ...
+
+=over
+
+=item header
+
+Must be either a string with the name of a single
+header file or a reference to an array of strings of header file names.
+
+=item incpath
+
+a string or an array of strings
+representing additional paths to search for headers.
+
+=item INC
+
+a C<ExtUtils::MakeMaker>-style space-seperated list of
+incpaths, each preceded by '-I'.
+
+=back
+
+=head2 check_lib_or_exit
+
+This behaves exactly the same as C<assert_lib()> except that instead of
+dieing, it warns (with exactly the same error message) and exits.
+This is intended for use in Makefile.PL / Build.PL
+when you might want to prompt the user for various paths and
+things before checking that what they've told you is sane.
+
+If any library or header is missing, it exits with an exit value of 0 to avoid
+causing a CPAN Testers 'FAIL' report. CPAN Testers should ignore this
+result -- which is what you want if an external library dependency is not
+available.
+
+=cut
+
+sub check_lib_or_exit {
+ eval 'assert_lib(@_)';
+ if($@) {
+ warn $@;
+ exit;
+ }
+}
+
+sub assert_lib {
+ my %args = @_;
+ my (@libs, @libpaths, @headers, @incpaths);
+
+ # FIXME: these four just SCREAM "refactor" at me
+ @libs = (ref($args{lib}) ? @{$args{lib}} : $args{lib})
+ if $args{lib};
+ @libpaths = (ref($args{libpath}) ? @{$args{libpath}} : $args{libpath})
+ if $args{libpath};
+ @headers = (ref($args{header}) ? @{$args{header}} : $args{header})
+ if $args{header};
+ @incpaths = (ref($args{incpath}) ? @{$args{incpath}} : $args{incpath})
+ if $args{incpath};
+
+ # work-a-like for Makefile.PL's LIBS and INC arguments
+ if(defined($args{LIBS})) {
+ foreach my $arg (split(/\s+/, $args{LIBS})) {
+ die("LIBS argument badly-formed: $arg\n") unless($arg =~ /^-l/i);
+ push @{$arg =~ /^-l/ ? \@libs : \@libpaths}, substr($arg, 2);
+ }
+ }
+ if(defined($args{INC})) {
+ foreach my $arg (split(/\s+/, $args{INC})) {
+ die("INC argument badly-formed: $arg\n") unless($arg =~ /^-I/);
+ push @incpaths, substr($arg, 2);
+ }
+ }
+
+ my @cc = _findcc();
+ my @missing;
+
+ # first figure out which headers we can't find ...
+ for my $header (@headers) {
+ my($ch, $cfile) = File::Temp::tempfile(
+ 'assertlibXXXXXXXX', SUFFIX => '.c'
+ );
+ print $ch qq{#include <$header>\nint main(void) { return 0; }\n};
+ close($ch);
+ my $exefile = File::Temp::mktemp( 'assertlibXXXXXXXX' ) . $Config{_exe};
+ my @sys_cmd;
+ # FIXME: re-factor - almost identical code later when linking
+ if ( $Config{cc} eq 'cl' ) { # Microsoft compiler
+ require Win32;
+ @sys_cmd = (@cc, $cfile, "/Fe$exefile", (map { '/I'.Win32::GetShortPathName($_) } @incpaths));
+ } elsif($Config{cc} =~ /bcc32(\.exe)?/) { # Borland
+ @sys_cmd = (@cc, (map { "-I$_" } @incpaths), "-o$exefile", $cfile);
+ } else { # Unix-ish
+ # gcc, Sun, AIX (gcc, cc)
+ @sys_cmd = (@cc, $cfile, (map { "-I$_" } @incpaths), "-o", "$exefile");
+ }
+ warn "# @sys_cmd\n" if $args{debug};
+ my $rv = $args{debug} ? system(@sys_cmd) : _quiet_system(@sys_cmd);
+ push @missing, $header if $rv != 0 || ! -x $exefile;
+ _cleanup_exe($exefile);
+ unlink $cfile;
+ }
+
+ # now do each library in turn with no headers
+ my($ch, $cfile) = File::Temp::tempfile(
+ 'assertlibXXXXXXXX', SUFFIX => '.c'
+ );
+ print $ch "int main(void) { return 0; }\n";
+ close($ch);
+ for my $lib ( @libs ) {
+ my $exefile = File::Temp::mktemp( 'assertlibXXXXXXXX' ) . $Config{_exe};
+ my @sys_cmd;
+ if ( $Config{cc} eq 'cl' ) { # Microsoft compiler
+ require Win32;
+ my @libpath = map {
+ q{/libpath:} . Win32::GetShortPathName($_)
+ } @libpaths;
+ @sys_cmd = (@cc, $cfile, "${lib}.lib", "/Fe$exefile",
+ "/link", @libpath
+ );
+ } elsif($Config{cc} eq 'CC/DECC') { # VMS
+ } elsif($Config{cc} =~ /bcc32(\.exe)?/) { # Borland
+ my @libpath = map { "-L$_" } @libpaths;
+ @sys_cmd = (@cc, "-o$exefile", "-l$lib", @libpath, $cfile);
+ } else { # Unix-ish
+ # gcc, Sun, AIX (gcc, cc)
+ my @libpath = map { "-L$_" } @libpaths;
+ @sys_cmd = (@cc, $cfile, "-o", "$exefile", "-l$lib", @libpath);
+ }
+ warn "# @sys_cmd\n" if $args{debug};
+ my $rv = $args{debug} ? system(@sys_cmd) : _quiet_system(@sys_cmd);
+ push @missing, $lib if $rv != 0 || ! -x $exefile;
+ _cleanup_exe($exefile);
+ }
+ unlink $cfile;
+
+ my $miss_string = join( q{, }, map { qq{'$_'} } @missing );
+ die("Can't link/include $miss_string\n") if @missing;
+}
+
+sub _cleanup_exe {
+ my ($exefile) = @_;
+ my $ofile = $exefile;
+ $ofile =~ s/$Config{_exe}$/$Config{_o}/;
+ unlink $exefile if -f $exefile;
+ unlink $ofile if -f $ofile;
+ unlink "$exefile\.manifest" if -f "$exefile\.manifest";
+ return
+}
+
+sub _findcc {
+ my @paths = split(/$Config{path_sep}/, $ENV{PATH});
+ my @cc = split(/\s+/, $Config{cc});
+ return @cc if -x $cc[0];
+ foreach my $path (@paths) {
+ my $compiler = File::Spec->catfile($path, $cc[0]) . $Config{_exe};
+ return ($compiler, @cc[1 .. $#cc]) if -x $compiler;
+ }
+ die("Couldn't find your C compiler\n");
+}
+
+# code substantially borrowed from IPC::Run3
+sub _quiet_system {
+ my (@cmd) = @_;
+
+ # save handles
+ local *STDOUT_SAVE;
+ local *STDERR_SAVE;
+ open STDOUT_SAVE, ">&STDOUT" or die "CheckLib: $! saving STDOUT";
+ open STDERR_SAVE, ">&STDERR" or die "CheckLib: $! saving STDERR";
+
+ # redirect to nowhere
+ local *DEV_NULL;
+ open DEV_NULL, ">" . File::Spec->devnull
+ or die "CheckLib: $! opening handle to null device";
+ open STDOUT, ">&" . fileno DEV_NULL
+ or die "CheckLib: $! redirecting STDOUT to null handle";
+ open STDERR, ">&" . fileno DEV_NULL
+ or die "CheckLib: $! redirecting STDERR to null handle";
+
+ # run system command
+ my $rv = system(@cmd);
+
+ # restore handles
+ open STDOUT, ">&" . fileno STDOUT_SAVE
+ or die "CheckLib: $! restoring STDOUT handle";
+ open STDERR, ">&" . fileno STDERR_SAVE
+ or die "CheckLib: $! restoring STDERR handle";
+
+ return $rv;
+}
+
+=head1 PLATFORMS SUPPORTED
+
+You must have a C compiler installed. We check for C<$Config{cc}>,
+both literally as it is in Config.pm and also in the $PATH.
+
+It has been tested with varying degrees on rigourousness on:
+
+=over
+
+=item gcc (on Linux, *BSD, Mac OS X, Solaris, Cygwin)
+
+=item Sun's compiler tools on Solaris
+
+=item IBM's tools on AIX
+
+=item Microsoft's tools on Windows
+
+=item MinGW on Windows (with Strawberry Perl)
+
+=item Borland's tools on Windows
+
+=back
+
+=head1 WARNINGS, BUGS and FEEDBACK
+
+This is a very early release intended primarily for feedback from
+people who have discussed it. The interface may change and it has
+not been adequately tested.
+
+Feedback is most welcome, including constructive criticism.
+Bug reports should be made using L<http://rt.cpan.org/> or by email.
+
+When submitting a bug report, please include the output from running:
+
+ perl -V
+ perl -MDevel::CheckLib -e0
+
+=head1 SEE ALSO
+
+L<Devel::CheckOS>
+
+L<Probe::Perl>
+
+=head1 AUTHORS
+
+David Cantrell E<lt>david at cantrell.org.ukE<gt>
+
+David Golden E<lt>dagolden at cpan.orgE<gt>
+
+Thanks to the cpan-testers-discuss mailing list for prompting us to write it
+in the first place;
+
+to Chris Williams for help with Borland support.
+
+=head1 COPYRIGHT and LICENCE
+
+Copyright 2007 David Cantrell. Portions copyright 2007 David Golden.
+
+This module is free-as-in-speech software, and may be used, distributed,
+and modified under the same conditions as perl itself.
+
+=head1 CONSPIRACY
+
+This module is also free-as-in-mason software.
+
+=cut
+
+1;
More information about the Pkg-perl-cvs-commits
mailing list