From f97a4fb19d8926c77f089c35e95a389609c087d9 Mon Sep 17 00:00:00 2001 From: Rob Hoelz Date: Thu, 20 Nov 2014 17:19:50 +0000 Subject: [PATCH] Import of RHOELZ/Mac-FSEvents-0.11.tar.gz from CPAN. gitpan-cpan-distribution: Mac-FSEvents gitpan-cpan-version: 0.11 gitpan-cpan-path: RHOELZ/Mac-FSEvents-0.11.tar.gz gitpan-cpan-author: RHOELZ gitpan-cpan-maturity: released --- Changes | 3 +++ META.json | 13 +++++-------- META.yml | 6 ++---- MacVersion.pm | 4 ++-- Makefile.PL | 6 +++--- hints/darwin.pl | 5 +++-- lib/Mac/FSEvents.pm | 2 +- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Changes b/Changes index dc0ef61..beb2de7 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,8 @@ Revision history for Perl extension Mac::FSEvents. +0.11 2014-11-19 12:00:00 + - Fix build problems on OS X Yosemite + 0.10 2013-06-20 12:00:00 - fix Pod coverage problem diff --git a/META.json b/META.json index 6fd80d6..b6149b3 100644 --- a/META.json +++ b/META.json @@ -4,7 +4,7 @@ "Andy Grundman , Rob Hoelz " ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.112621", + "generated_by" : "ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.133380", "license" : [ "unknown" ], @@ -17,28 +17,25 @@ "directory" : [ "t", "inc" - ], - "file" : [ - "MacVersion.pm" ] }, "prereqs" : { "build" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "0" } }, "configure" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "0" } }, "runtime" : { "requires" : { - "File::Slurp" : 0 + "File::Slurp" : "0" } } }, "release_status" : "stable", - "version" : "0.10" + "version" : "0.11" } diff --git a/META.yml b/META.yml index 3fe41b5..d45f45a 100644 --- a/META.yml +++ b/META.yml @@ -7,7 +7,7 @@ build_requires: configure_requires: ExtUtils::MakeMaker: 0 dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.112621' +generated_by: 'ExtUtils::MakeMaker version 6.66, CPAN::Meta::Converter version 2.133380' license: unknown meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -17,8 +17,6 @@ no_index: directory: - t - inc - file: - - MacVersion.pm requires: File::Slurp: 0 -version: 0.10 +version: 0.11 diff --git a/MacVersion.pm b/MacVersion.pm index 6b41474..cf12e45 100644 --- a/MacVersion.pm +++ b/MacVersion.pm @@ -9,8 +9,8 @@ our @EXPORT = qw(osx_version); sub osx_version { my $os_version = qx(system_profiler SPSoftwareDataType); - if($os_version =~ /System Version:(?: Mac)? OS X (?:Server )?(10\.\d+)/) { - return $1; + if($os_version =~ /System Version:(?: Mac)? OS X (?:Server )?(?:(10)\.(\d+)(?:\.(\d+))?)/) { + return ($1, $2, $3 || 0); } else { $os_version =~ s/^/> /gm; diff --git a/Makefile.PL b/Makefile.PL index f63e85a..94697cb 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -29,12 +29,12 @@ my @names = qw{ kFSEventStreamCreateFlagWatchRoot }; -my $version = osx_version(); +my ( $major, $minor, $release ) = osx_version(); -if($version >= 10.6) { +if($minor >= 6) { push @names, 'kFSEventStreamCreateFlagIgnoreSelf'; - if($version >= 10.7) { + if($minor >= 7) { push @names, 'kFSEventStreamCreateFlagFileEvents'; } } diff --git a/hints/darwin.pl b/hints/darwin.pl index 4654db1..1127d36 100644 --- a/hints/darwin.pl +++ b/hints/darwin.pl @@ -4,9 +4,10 @@ use MacVersion; if ( $Config{myarchname} =~ /i386/ ) { - my $os_version = osx_version(); + my ( $major, $minor, $release ) = osx_version(); + my $os_version = join('.', $major, $minor); - if($os_version >= 10.5) { # Leopard and up + if($minor >= 5) { # Leopard and up my @directories = ( "/Developer/SDKs/MacOSX$os_version.sdk", "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$os_version.sdk", diff --git a/lib/Mac/FSEvents.pm b/lib/Mac/FSEvents.pm index 5b0e620..204c55a 100644 --- a/lib/Mac/FSEvents.pm +++ b/lib/Mac/FSEvents.pm @@ -6,7 +6,7 @@ use base 'Exporter'; use Mac::FSEvents::Event; -our $VERSION = '0.10'; +our $VERSION = '0.11'; our @EXPORT_OK = qw(NONE WATCH_ROOT); our %EXPORT_TAGS = ( flags => \@EXPORT_OK );