Imported Upstream version 0.62

14 files changed, 68 insertions, 21 deletions

diff --git a/Build.PL b/Build.PL
index 011db44..3abd5d9 100644
--- a/Build.PL
+++ b/Build.PL
@@ -4,6 +4,8 @@ use warnings;
 use lib 'inc';
 use MyBuilder;
 use Config;
+use File::Spec::Functions qw.catdir catfile.;
+use File::Copy;
 
 my $version = get_version();
 
@@ -54,7 +56,23 @@ my $builder = MyBuilder->new
 ## HACK  HACK  HACK  HACK
 my $libdir = $builder->install_destination("bin");
 if ($^O =~ /mswin32/i) {
-    $libdir = $ENV{WINDIR} || 'c:\\WINDOWS\\'; ## HACK HACK HACK
+    $libdir = undef;
+    # Find a place where we can write.
+    my @folders = split /;/, $ENV{PATH};
+    my $installed = 0;
+    my $target = "text-bibtex.$$";
+    while(@folders && !$installed) {
+        $libdir = shift @folders;	
+
+        copy("MANIFEST", catfile($libdir,$target));
+        $installed = 1 if -f catfile($libdir, $target);
+    }
+    if (!$installed) {
+        warn("Wasn't able to find a suitable place for libbtparse.dll!");
+    } else {
+        print STDERR "libbtparse.dll will be installed in $libdir\n";
+        unlink catfile($libdir, $target);
+    }
 } else {
     if ($Config{archname} =~ /^x86_64/) {
         $libdir =~ s/\bbin\b/lib64/;
diff --git a/CHANGES b/CHANGES
index d9d92fb..b6e7164 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,12 @@
-Release 0.61 - 20 Outubro, 2011
+Release 0.62 - 11 January, 2012
+-------------------------------
+* Releasing stable
+
+Release 0.62_01 - 7 January, 2012
+---------------------------------
+* Better installation under Windows, and specifically, Win 7.
+
+Release 0.61 - 20 October, 2011
 -------------------------------
 * Thanks to Philip Kime (again), we have STDERR working on Windows
   (hopefully)
diff --git a/META.json b/META.json
index 2d3d6c9..806136e 100644
--- a/META.json
+++ b/META.json
@@ -5,7 +5,7 @@
       "Greg Ward <gward@python.net>"
    ],
    "dynamic_config" : 1,
-   "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112621",
+   "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.113640",
    "license" : [
       "perl_5"
    ],
@@ -36,7 +36,7 @@
    "provides" : {
       "Text::BibTeX" : {
          "file" : "lib/Text/BibTeX.pm",
-         "version" : "0.61"
+         "version" : "0.62"
       },
       "Text::BibTeX::BibEntry" : {
          "file" : "lib/Text/BibTeX/Bib.pm",
@@ -93,5 +93,5 @@
          "http://dev.perl.org/licenses/"
       ]
    },
-   "version" : "0.61"
+   "version" : "0.62"
 }
diff --git a/META.yml b/META.yml
index 1a51793..0435c6e 100644
--- a/META.yml
+++ b/META.yml
@@ -15,7 +15,7 @@ configure_requires:
   ExtUtils::LibBuilder: 0.02
   Module::Build: 0.36
 dynamic_config: 1
-generated_by: 'Module::Build version 0.38, CPAN::Meta::Converter version 2.112621'
+generated_by: 'Module::Build version 0.38, CPAN::Meta::Converter version 2.113640'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -24,7 +24,7 @@ name: Text-BibTeX
 provides:
   Text::BibTeX:
     file: lib/Text/BibTeX.pm
-    version: 0.61
+    version: 0.62
   Text::BibTeX::BibEntry:
     file: lib/Text/BibTeX/Bib.pm
     version: 0
@@ -63,4 +63,4 @@ provides:
     version: 0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.61
+version: 0.62
diff --git a/btparse/src/error.c b/btparse/src/error.c
index 47f07f1..b292883 100644
--- a/btparse/src/error.c
+++ b/btparse/src/error.c
@@ -10,7 +10,7 @@
 @CALLS      : 
 @CREATED    : 1996/08/28, Greg Ward
 @MODIFIED   : 
-@VERSION    : $Id: error.c 8524 2010-03-11 18:29:46Z ambs $
+@VERSION    : $Id: error.c 10121 2011-10-20 18:57:43Z ambs $
 @COPYRIGHT  : Copyright (c) 1996-99 by Gregory P. Ward.  All rights reserved.
 
               This file is part of the btparse library.  This library is
diff --git a/lib/Text/BibTeX.pm b/lib/Text/BibTeX.pm
index de66810..d41fbb4 100644
--- a/lib/Text/BibTeX.pm
+++ b/lib/Text/BibTeX.pm
@@ -24,7 +24,7 @@ use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $AUTOLOAD);
 require Exporter;
 require DynaLoader;
 
-our $VERSION='0.61';
+our $VERSION='0.62';
 
 @ISA = qw(Exporter DynaLoader);
 %EXPORT_TAGS = (nodetypes => [qw(BTAST_STRING BTAST_MACRO BTAST_NUMBER)],
diff --git a/lib/Text/BibTeX/BibFormat.pm b/lib/Text/BibTeX/BibFormat.pm
index 54f126d..edb7999 100644
--- a/lib/Text/BibTeX/BibFormat.pm
+++ b/lib/Text/BibTeX/BibFormat.pm
@@ -7,7 +7,7 @@
 #              bibliographic entries.
 # CREATED    : 1997/11/24, GPW
 # MODIFIED   : 
-# VERSION    : $Id: BibFormat.pm 8423 2010-02-13 20:40:27Z ambs $
+# VERSION    : $Id: BibFormat.pm 10124 2011-10-21 10:15:41Z ambs $
 # COPYRIGHT  : Copyright (c) 1997 by Gregory P. Ward.  All rights reserved.
 # 
 #              This file is part of the Text::BibTeX library.  This is free
@@ -19,13 +19,14 @@ package Text::BibTeX::BibFormat;
 
 use Carp;
 use strict;
-use vars qw(@ISA);
+use vars qw(@ISA $VERSION);
 
 use Text::BibTeX::Name;
 use Text::BibTeX::NameFormat;
 use Text::BibTeX::Structure;
 
 @ISA = qw(Text::BibTeX::StructuredEntry);
+$VERSION = 0;
 
 use Text::BibTeX qw(:subs display_list :nameparts :joinmethods);
 
diff --git a/lib/Text/BibTeX/BibSort.pm b/lib/Text/BibTeX/BibSort.pm
index 5029989..4bc892a 100644
--- a/lib/Text/BibTeX/BibSort.pm
+++ b/lib/Text/BibTeX/BibSort.pm
@@ -7,7 +7,7 @@
 #              in a BibTeX-style bibliographic database.
 # CREATED    : 1997/11/24, GPW (taken from Bib.pm)
 # MODIFIED   : 
-# VERSION    : $Id: BibSort.pm 8423 2010-02-13 20:40:27Z ambs $
+# VERSION    : $Id: BibSort.pm 10124 2011-10-21 10:15:41Z ambs $
 # COPYRIGHT  : Copyright (c) 1997-2000 by Gregory P. Ward.  All rights 
 #              reserved.
 # 
@@ -18,11 +18,12 @@
 
 package Text::BibTeX::BibSort;
 use strict;
-use vars qw(@ISA);
+use vars qw(@ISA $VERSION);
 
 use Text::BibTeX::Structure;
 
 @ISA = qw(Text::BibTeX::StructuredEntry);
+$VERSION = 0;
 
 use Text::BibTeX qw(purify_string change_case);
 
diff --git a/lib/Text/BibTeX/Entry.pm b/lib/Text/BibTeX/Entry.pm
index e083c9e..3db5d32 100644
--- a/lib/Text/BibTeX/Entry.pm
+++ b/lib/Text/BibTeX/Entry.pm
@@ -6,7 +6,7 @@
 # DESCRIPTION: Provides an object-oriented interface to BibTeX entries.
 # CREATED    : March 1997, Greg Ward
 # MODIFIED   : 
-# VERSION    : $Id: Entry.pm 10034 2011-08-19 21:02:11Z ambs $
+# VERSION    : $Id: Entry.pm 10124 2011-10-21 10:15:41Z ambs $
 # COPYRIGHT  : Copyright (c) 1997-2000 by Gregory P. Ward.  All rights
 #              reserved.
 # 
@@ -19,10 +19,12 @@ package Text::BibTeX::Entry;
 require 5.004;                          # for isa, and delete on a slice
 
 use strict;
-
+use vars qw'$VERSION';
 use Carp;
 use Text::BibTeX qw(:metatypes :nodetypes);
 
+$VERSION = 0;
+
 =head1 NAME
 
 Text::BibTeX::Entry - read and parse BibTeX files
diff --git a/lib/Text/BibTeX/File.pm b/lib/Text/BibTeX/File.pm
index cb6805d..0467bfd 100644
--- a/lib/Text/BibTeX/File.pm
+++ b/lib/Text/BibTeX/File.pm
@@ -6,7 +6,7 @@
 #              files.
 # CREATED    : March 1997, Greg Ward
 # MODIFIED   : 
-# VERSION    : $Id: File.pm 8423 2010-02-13 20:40:27Z ambs $
+# VERSION    : $Id: File.pm 10124 2011-10-21 10:15:41Z ambs $
 # COPYRIGHT  : Copyright (c) 1997-2000 by Gregory P. Ward.  All rights
 #              reserved.
 # 
@@ -21,6 +21,9 @@ use strict;
 use Carp;
 use IO::File;
 
+use vars qw'$VERSION';
+$VERSION = 0;
+
 =head1 NAME
 
 Text::BibTeX::File - interface to whole BibTeX files
diff --git a/lib/Text/BibTeX/Name.pm b/lib/Text/BibTeX/Name.pm
index 6534c57..39c0a7c 100644
--- a/lib/Text/BibTeX/Name.pm
+++ b/lib/Text/BibTeX/Name.pm
@@ -7,7 +7,7 @@
 #              them is done by the Text::BibTeX::NameFormat class).
 # CREATED    : Nov 1997, Greg Ward
 # MODIFIED   : 
-# VERSION    : $Id: Name.pm 8536 2010-03-14 18:21:28Z ambs $
+# VERSION    : $Id: Name.pm 10124 2011-10-21 10:15:41Z ambs $
 # COPYRIGHT  : Copyright (c) 1997-2000 by Gregory P. Ward.  All rights
 #              reserved.
 # 
@@ -22,6 +22,8 @@ require 5.004;
 
 use strict;
 use Carp;
+use vars qw'$VERSION';
+$VERSION = 0;
 
 use Text::BibTeX;
 
diff --git a/lib/Text/BibTeX/NameFormat.pm b/lib/Text/BibTeX/NameFormat.pm
index 2293795..4d3f44e 100644
--- a/lib/Text/BibTeX/NameFormat.pm
+++ b/lib/Text/BibTeX/NameFormat.pm
@@ -7,7 +7,7 @@
 #              Text::BibTeX:Name class.)
 # CREATED    : Nov 1997, Greg Ward
 # MODIFIED   : 
-# VERSION    : $Id: NameFormat.pm 8423 2010-02-13 20:40:27Z ambs $
+# VERSION    : $Id: NameFormat.pm 10311 2012-01-07 16:14:49Z ambs $
 # COPYRIGHT  : Copyright (c) 1997-2000 by Gregory P. Ward.  All rights
 #              reserved.
 # 
@@ -22,6 +22,8 @@ require 5.004;
 
 use strict;
 use Carp;
+use vars qw'$VERSION';
+$VERSION = 0;
 
 =head1 NAME
 
@@ -304,3 +306,7 @@ is part of the Text::BibTeX library.  This library is free software; you
 may redistribute it and/or modify it under the same terms as Perl itself.
 
 =cut
+
+
+1;
+
diff --git a/lib/Text/BibTeX/Structure.pm b/lib/Text/BibTeX/Structure.pm
index 1281abf..e7abdb2 100644
--- a/lib/Text/BibTeX/Structure.pm
+++ b/lib/Text/BibTeX/Structure.pm
@@ -7,7 +7,7 @@
 # CREATED    : in original form: Apr 1997
 #              completely redone: Oct 1997
 # MODIFIED   : 
-# VERSION    : $Id: Structure.pm 8423 2010-02-13 20:40:27Z ambs $
+# VERSION    : $Id: Structure.pm 10124 2011-10-21 10:15:41Z ambs $
 # COPYRIGHT  : Copyright (c) 1997-2000 by Gregory P. Ward.  All rights
 #              reserved.
 # 
@@ -23,6 +23,9 @@ require 5.004;                              # for 'isa' and 'can'
 use strict;
 use Carp;
 
+use vars qw'$VERSION';
+$VERSION = 0;
+
 use Text::BibTeX ('check_class');
 
 =head1 NAME
diff --git a/lib/Text/BibTeX/Value.pm b/lib/Text/BibTeX/Value.pm
index 293d05c..7a4d13c 100644
--- a/lib/Text/BibTeX/Value.pm
+++ b/lib/Text/BibTeX/Value.pm
@@ -6,7 +6,7 @@
 #              values) and simple values (string/macro/number).
 # CREATED    : 1998/03/12, Greg Ward
 # MODIFIED   : 
-# VERSION    : $Id: Value.pm 8423 2010-02-13 20:40:27Z ambs $
+# VERSION    : $Id: Value.pm 10124 2011-10-21 10:15:41Z ambs $
 # COPYRIGHT  : Copyright (c) 1997-2000 by Gregory P. Ward.  All rights
 #              reserved.
 # 
@@ -21,6 +21,9 @@ use strict;
 use UNIVERSAL 'isa';
 use Carp;
 
+use vars qw'$VERSION';
+$VERSION = 0;
+
 =head1 NAME
 
 Text::BibTeX::Value - interfaces to BibTeX values and simple values