Imported Upstream version 3.014

diff --git a/Changes b/Changes
index 214fa49803dcbca8cfdd60846782e101a91d3a02..2bc43f9d2aa94fc203b99495897acf9e007d7b6b 100644 (file)
--- a/Changes
+++ b/Changes
@@ -5,6 +5,20 @@ Revision history for Perl extension Sereal-Encoder
 *          of the decoder before upgrading to version 3 of the *
 *          encoder!                                            *
 ****************************************************************
+3.014 Dec  7 2015
+  * Fix builds under 5.8.9
+
+3.012 Dec  6 2015
+  * Yet another release related to broken META files. 
+    ExtUtils::MakeMaker and CPAN::Meta need to be up to date
+    or the META files miss stuff.
+
+3.011 Dec  6 2015
+  * No significant changes. Doc typo fixes, and build tweaks.
+
+3.010 Dec  1 2015
+  * Build fixes.
+
 3.009 Nov 30 2015
   * Re-relase 3.008 with updated META files.
 

diff --git a/META.json b/META.json
index e613c80b514c64edbbb5341922965fd738541e74..7e38862d769da652a8f81631fccaddcfcc931aa4 100644 (file)
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
       "Steffen Mueller <smueller@cpan.org>, Yves Orton <yves@cpan.org>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "ExtUtils::MakeMaker version 7.0401, CPAN::Meta::Converter version 2.150001",
+   "generated_by" : "ExtUtils::MakeMaker version 7.1, CPAN::Meta::Converter version 2.150005",
    "license" : [
       "perl_5"
    ],
@@ -60,5 +60,6 @@
          "url" : "git://github.com/Sereal/Sereal.git"
       }
    },
-   "version" : "3.009"
+   "version" : "3.014",
+   "x_serialization_backend" : "JSON::PP version 2.27300"
 }

diff --git a/META.yml b/META.yml
index cbd3a574a5efddc7de7e39fa54ebfdf6ddfa39c0..8b0507931cebd17b7c58beeed60ca2d535387d31 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -16,7 +16,7 @@ build_requires:
 configure_requires:
   ExtUtils::MakeMaker: '7.0'
 dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.0401, CPAN::Meta::Converter version 2.150001'
+generated_by: 'ExtUtils::MakeMaker version 7.1, CPAN::Meta::Converter version 2.150005'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -32,4 +32,5 @@ requires:
 resources:
   bugtracker: https://github.com/Sereal/Sereal/issues
   repository: git://github.com/Sereal/Sereal.git
-version: '3.009'
+version: '3.014'
+x_serialization_backend: 'CPAN::Meta::YAML version 0.012'

diff --git a/Makefile.PL b/Makefile.PL
index 2437510a49aec639d1c3f45e2fbb1dd821557de0..6fb2e43655557cace8062467664bc59bb750a098 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,12 +7,19 @@ use ExtUtils::MakeMaker;
 use Config;
 
 my $shared_dir = "../shared";
-my $in_source_repo = -d "../../.git" and -d $shared_dir;
+my $its_our_repo_file= "../this_is_the_Sereal_repo.txt";
+my $in_source_repo =(       -d "../../.git"
+                        and -d $shared_dir
+                        and -e "../this_is_the_Sereal_repo.txt"
+                );
 
-my $module = "Sereal::Encoder";
 
 unshift @INC, ".", "./inc";
-unshift @INC, $shared_dir, "$shared_dir/inc" if $in_source_repo;
+unshift @INC, $shared_dir, "$shared_dir/inc"
+    if $in_source_repo;
+
+
+my $module = "Sereal::Encoder";
 require inc::Sereal::BuildTools;
 inc::Sereal::BuildTools::link_files($shared_dir) if $in_source_repo;
 inc::Sereal::BuildTools::generate_constant_includes($module) if $in_source_repo;

diff --git a/lib/Sereal/Encoder.pm b/lib/Sereal/Encoder.pm
index 94fd0f8b954da15e666eb862bb3b5989c4ebccd1..a5b01c99013e3d5b0b438eff585d684a18cdb143 100644 (file)
--- a/lib/Sereal/Encoder.pm
+++ b/lib/Sereal/Encoder.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp qw/croak/;
 use XSLoader;
 
-our $VERSION = '3.009'; # Don't forget to update the TestCompat set for testing against installed decoders!
+our $VERSION = '3.014'; # Don't forget to update the TestCompat set for testing against installed decoders!
 our $XS_VERSION = $VERSION; $VERSION= eval $VERSION;
 
 # not for public consumption, just for testing.
@@ -100,7 +100,7 @@ my $flags= sub {
 
 sub flag_names {
     my ($self, $val)= @_;
-    return $flags->($val // $self->flags, _FLAG_NAME);
+    return $flags->(defined $val ? $val : $self->flags, _FLAG_NAME);
 }
 
 1;
@@ -302,7 +302,7 @@ do so.
 Do note that the setting is somewhat approximate. Setting it to 10000 may break at
 somewhere between 9997 and 10003 nested structures depending on their types.
 
-=head3 canoncial
+=head3 canonical
 
 Enable all options which are related to producing canonical output, so that
 two strucutures with similar contents produce the same serialized form.
@@ -321,7 +321,7 @@ in a future release by enabling other options than those listed here.
 Normally C<Sereal::Encoder> will ARRAYREF and HASHREF tags when the item contains
 less than 16 items, and and is not referenced more than once. This flag will
 override this optimization and use a standard REFN ARRAY style tag output. This
-is primarily useful for producing canoncial output and for testing Sereal itself.
+is primarily useful for producing canonical output and for testing Sereal itself.
 
 See L</CANONICAL REPRESENTATION> for why you might want to use this, and
 for the various caveats involved.

diff --git a/lib/Sereal/Encoder/Constants.pm b/lib/Sereal/Encoder/Constants.pm
index 6eed64ba8570e8ff69c10764574a45b133c44e11..3c2e9540b3ca22afd0ac48470e24df1678337630 100644 (file)
--- a/lib/Sereal/Encoder/Constants.pm
+++ b/lib/Sereal/Encoder/Constants.pm
@@ -4,7 +4,7 @@ use warnings;
 require Exporter;
 our @ISA= qw(Exporter);
 
-our $VERSION = '3.009'; # Don't forget to update the TestCompat set for testing against installed encoders!
+our $VERSION = '3.014'; # Don't forget to update the TestCompat set for testing against installed encoders!
 
 our (@EXPORT_OK, %DEFINE, %TAG_INFO_HASH, @TAG_INFO_ARRAY);
 

diff --git a/t/030_canonical_vs_test_deep.t b/t/030_canonical_vs_test_deep.t
index 1b3705e8f36612b15b2304018851b151a511a3e6..00740afcfeead62a072bc40dc5c1fd631a174b74 100644 (file)
--- a/t/030_canonical_vs_test_deep.t
+++ b/t/030_canonical_vs_test_deep.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use Sereal::Encoder qw(encode_sereal);
 use Test::More;
-
+use version;
 my %tests = (
     # IMPORTANT: If you add new types of cases here please update the
     # "CANONICAL REPRESENTATION" documentation.