r5787 - in /packages/libdbix-searchbuilder-perl/trunk: ./ debian/ inc/Module/ inc/Module/Install/ t/
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Sat Jul 14 20:41:37 UTC 2007
Author: gregoa-guest
Date: Sat Jul 14 20:41:37 2007
New Revision: 5787
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=5787
Log:
* New upstream release.
* Add libdbix-searchbuilder-perl to debian/control.
Modified:
packages/libdbix-searchbuilder-perl/trunk/Changes
packages/libdbix-searchbuilder-perl/trunk/META.yml
packages/libdbix-searchbuilder-perl/trunk/Makefile.PL
packages/libdbix-searchbuilder-perl/trunk/SIGNATURE
packages/libdbix-searchbuilder-perl/trunk/SearchBuilder.pm
packages/libdbix-searchbuilder-perl/trunk/debian/changelog
packages/libdbix-searchbuilder-perl/trunk/debian/control
packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install.pm
packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/AutoInstall.pm
packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Base.pm
packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Include.pm
packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Makefile.pm
packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Metadata.pm
packages/libdbix-searchbuilder-perl/trunk/t/01records.t
packages/libdbix-searchbuilder-perl/trunk/t/01searches.t
packages/libdbix-searchbuilder-perl/trunk/t/02records_cachable.t
packages/libdbix-searchbuilder-perl/trunk/t/02records_integers.t
packages/libdbix-searchbuilder-perl/trunk/t/02records_object.t
packages/libdbix-searchbuilder-perl/trunk/t/02searches_joins.t
packages/libdbix-searchbuilder-perl/trunk/t/03rebless.t
packages/libdbix-searchbuilder-perl/trunk/t/03transactions.t
packages/libdbix-searchbuilder-perl/trunk/t/03versions.t
packages/libdbix-searchbuilder-perl/trunk/t/11schema_records.t
packages/libdbix-searchbuilder-perl/trunk/t/utils.pl
Modified: packages/libdbix-searchbuilder-perl/trunk/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/Changes?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/Changes (original)
+++ packages/libdbix-searchbuilder-perl/trunk/Changes Sat Jul 14 20:41:37 2007
@@ -1,4 +1,8 @@
Revision history for Perl extension DBIx::SearchBuilder.
+
+1.49 Sat Jul 7 18:45:41 EDT 2007
+
+* Fix a CPAN signature issue
1.48 Sun Mar 11 05:24:40 UTC 2007
Modified: packages/libdbix-searchbuilder-perl/trunk/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/META.yml?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/META.yml (original)
+++ packages/libdbix-searchbuilder-perl/trunk/META.yml Sat Jul 14 20:41:37 2007
@@ -1,9 +1,14 @@
+---
build_requires:
DBD::SQLite: 0
+ File::Temp: 0
Test::More: 0.52
distribution_type: module
-generated_by: Module::Install version 0.64
+generated_by: Module::Install version 0.67
license: perl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
+ version: 1.3
name: DBIx-SearchBuilder
no_index:
directory:
@@ -18,4 +23,4 @@
DBI: 0
Encode: 0
Want: 0
-version: 1.48
+version: 1.49
Modified: packages/libdbix-searchbuilder-perl/trunk/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/Makefile.PL?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/Makefile.PL (original)
+++ packages/libdbix-searchbuilder-perl/trunk/Makefile.PL Sat Jul 14 20:41:37 2007
@@ -11,6 +11,7 @@
requires('Clone');
build_requires('Test::More' => 0.52);
build_requires('DBD::SQLite');
+build_requires('File::Temp');
features(
'Lower case API' => [
-default => 0,
Modified: packages/libdbix-searchbuilder-perl/trunk/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/SIGNATURE?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/SIGNATURE (original)
+++ packages/libdbix-searchbuilder-perl/trunk/SIGNATURE Sat Jul 14 20:41:37 2007
@@ -1,5 +1,5 @@
This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.54.
+signed via the Module::Signature module, version 0.55.
To verify the content in this distribution, first make sure you have
Module::Signature installed, then type:
@@ -14,58 +14,58 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-SHA1 1c596889ad6d44cf320e0f2e1d7b6db524405b72 Changes
+SHA1 7f92930618cf0faa0b5a503be7e66f8d87527c0b Changes
SHA1 2e9746a7afda5167d8c7ff25a88f345ea5e35a02 MANIFEST
-SHA1 d334e6a8a058e1c74d3f12ccb17df36079e151b2 META.yml
-SHA1 3276df7ccabe8b5e7960c7bd319b3873749035a0 Makefile.PL
+SHA1 61d5fb7ba86d8afb17b4db523621da09c40c7973 META.yml
+SHA1 9caac7d42ee2e69b1768c238bd199b260756a0e6 Makefile.PL
SHA1 d7a41642c368f2a587587e09f9e815d434feebff README
SHA1 5a53d12d5cccd94845a6a7cc105cd9be34e20f1c ROADMAP
-SHA1 8927ec9875c730b0a5a2f7845a89c65525d89f4a SearchBuilder.pm
-SHA1 0c1bc49940a35630ad9ff166920b8038a6d40d97 SearchBuilder/Handle.pm
-SHA1 38b773e6069d3dc91308ea9e4f2ef322ddef9419 SearchBuilder/Handle/Informix.pm
-SHA1 25d73426d93cece304b6eea8c786b224e14e1b5c SearchBuilder/Handle/ODBC.pm
-SHA1 59871a88e8228ed27d216af9e9af0b76184fd41d SearchBuilder/Handle/Oracle.pm
-SHA1 939dffb56c5dd5839732b75ef1f94722bfde0569 SearchBuilder/Handle/Pg.pm
-SHA1 c7222d65546ad693a6f786ed0428084732547dc6 SearchBuilder/Handle/SQLite.pm
-SHA1 088e3584eb431d1467ef7ef45a1863da52b40ea6 SearchBuilder/Handle/Sybase.pm
-SHA1 0b48632b9044c8b289685c7d38c9381d74b433fe SearchBuilder/Handle/mysql.pm
-SHA1 f4f6ea88631e6310243b6351e8df11e1ec88b261 SearchBuilder/Handle/mysqlPP.pm
-SHA1 3d6a2fe0f63a230ed447dddc72443b68f06ad22b SearchBuilder/Record.pm
-SHA1 5ca3b5fa47cfeb5711df99136548641fd01a5a95 SearchBuilder/Record/Cachable.pm
+SHA1 3a75b15d8683426a543af789abe5336ffa208331 SearchBuilder.pm
+SHA1 0777214c051789d8a42951997e897b7bd49510ce SearchBuilder/Handle.pm
+SHA1 55d337e6dd1ab5aecc39d2ae491bffb12e9ca449 SearchBuilder/Handle/Informix.pm
+SHA1 4efdcaefa5f94d994b052d1b343d2f5164ef4b52 SearchBuilder/Handle/ODBC.pm
+SHA1 5e3af079baf4651c464fca8e168c52eb8f130c30 SearchBuilder/Handle/Oracle.pm
+SHA1 4e096c7cf4583c2ab01a5a893741bf1f26cf48a4 SearchBuilder/Handle/Pg.pm
+SHA1 ecb52a19979aea9528fc690028d16a05ab356c13 SearchBuilder/Handle/SQLite.pm
+SHA1 ec3fbc03b27c008d93a52b6b7fb0076529e5fcc8 SearchBuilder/Handle/Sybase.pm
+SHA1 ea451e77f452b7739fccb2af4301b70866c6cf19 SearchBuilder/Handle/mysql.pm
+SHA1 877685aaff265e36fa37298c372aa56864f68aa5 SearchBuilder/Handle/mysqlPP.pm
+SHA1 e83d5f379f845d69117bb1b255b8cb14ec38e2cd SearchBuilder/Record.pm
+SHA1 1680fe8c21ca1667c55501c5f0e9b7bef434647f SearchBuilder/Record/Cachable.pm
SHA1 a15065e472797e2bfe8149f04d3bdc58f67a7a6d SearchBuilder/SchemaGenerator.pm
-SHA1 446f59a1fa8fa631c908f1fe3ea671c7178c9270 SearchBuilder/Union.pm
+SHA1 772cc5877b1575823a404222ffb028b176177661 SearchBuilder/Union.pm
SHA1 1eb4e838ff1d8d927bfe177bf578df246802b03d SearchBuilder/Unique.pm
SHA1 e7c7c7c91025072d25da78c93cefa2bc0aaf2b35 ex/Example/Model/Address.pm
SHA1 f821661849153c21ad99393b6a3ea6720fdaf581 ex/Example/Model/Employee.pm
SHA1 9689368197327e7b38af7f3d1f863e918ed4fa98 ex/create_tables.pl
SHA1 603bb9de29fb8cba7f13409c546750972eff645d inc/Module/AutoInstall.pm
-SHA1 9b2f9d83bcf77860f53a0c07c90a4a59ad9f5df1 inc/Module/Install.pm
-SHA1 ad955f51ad2c40d4ba35395c27f5ed899a80bf7a inc/Module/Install/AutoInstall.pm
-SHA1 abe32855d75ab13747cf65765af9947b7a8c3057 inc/Module/Install/Base.pm
-SHA1 0606a8b02a420600bc3e2b65ab82f70266784926 inc/Module/Install/Include.pm
-SHA1 2249171a2b72cd73ff2c0a06597d29f86e5df456 inc/Module/Install/Makefile.pm
-SHA1 381bb98ea3877bba49ae85e7a7ea130645fd3dbf inc/Module/Install/Metadata.pm
+SHA1 78edb89a439463e44c33a72bbee84c54d0dc8aaf inc/Module/Install.pm
+SHA1 ae32c02b539901de91f06366ce9bdbb7a7bd040b inc/Module/Install/AutoInstall.pm
+SHA1 8ea4e37df83fd0c1c050be5c8da75545c3828d9b inc/Module/Install/Base.pm
+SHA1 6bf0d0d100b94d1a2ce64d010c8813dec26ac480 inc/Module/Install/Include.pm
+SHA1 2054450e1e9c1dd8056362bf4a64ae70d5d71476 inc/Module/Install/Makefile.pm
+SHA1 5d6189b2cad15cf9932a28faafd55130c8247e83 inc/Module/Install/Metadata.pm
SHA1 e59ea21b9407644714a5f67c7132a11916c25133 t/00.load.t
SHA1 a7ed1ee359ebe2842b354b5652a441403e802080 t/01basics.t
SHA1 2b2dc6f72370f60e1d233f2f8c12bb87414e825c t/01nocap_api.t
-SHA1 812aede3c0fd6e3cfb895f8190b9ee427189f35f t/01records.t
-SHA1 b21cfbf17b537f564510d06bf30a8fcd0f20dc69 t/01searches.t
-SHA1 48e092e60073801d12cefceb61ee303ec62f6bc2 t/02records_cachable.t
-SHA1 bae8ad859dccd45f6c6386a1596eb76e6940177e t/02records_integers.t
-SHA1 5e4b2bcef304c827e566f29d67b2d2184ff3f61f t/02records_object.t
-SHA1 c19ab98f9fda6c7f495b5cb8669b8c6a23bf4aae t/02searches_joins.t
-SHA1 a1808be8dd28bd176ae0243876de36691afefefb t/03rebless.t
-SHA1 b1dc1178e2f52a175d95ee7dd6218740087dc9fb t/03transactions.t
-SHA1 ff8bfffa9e14d8fd492bdd3c0858ffc87de09df4 t/03versions.t
+SHA1 92f07d6d6c3a098f7c5e3524204522f2ec960f75 t/01records.t
+SHA1 049fa2ff4a443b27ca64dfa6e50d4fdcfc8c0edb t/01searches.t
+SHA1 67d4c0dca9d1914eadba64460f3a2da4e074ae14 t/02records_cachable.t
+SHA1 e791bc2dc9ebcfe194f00eb9d0d61c391200b589 t/02records_integers.t
+SHA1 6e50e77f1b54fe28fd6bcbb6eb104527f25d2601 t/02records_object.t
+SHA1 1398226c92dac259a3178e273b6674e45df8225e t/02searches_joins.t
+SHA1 fdc1ebd0353a4483f9a64a1b6558fd8c22b6a0e4 t/03rebless.t
+SHA1 0832f29ca227de8b962b74788e1e1637dc110ddc t/03transactions.t
+SHA1 1fe8ef579aa7e503f3227d42674c2218e4400ab5 t/03versions.t
SHA1 f8f5634e7dc28068722347f47d7e05d06435e22c t/10schema.t
-SHA1 8afb80e49acc3ef8258929e06ad1bdaf1da680cd t/11schema_records.t
+SHA1 b22ee88495de953e688cda8d0959511864aa936b t/11schema_records.t
SHA1 e9c6a5881fc60173fbc8d479c1afd2ce3b43bef1 t/pod.t
SHA1 afd320ea000cbe83b08691cc37bea45da20002d3 t/testmodels.pl
-SHA1 4788496012998da32d01aef7e74d2070931290e0 t/utils.pl
+SHA1 50bd534c8ee459d9e28fd51843dd1ad70fd5c9b1 t/utils.pl
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (Darwin)
-iD8DBQFFGUKcEi9d9xCOQEYRAqHQAKCsWgCDMW+VflysRFk2D8HCXI75LgCfYcm3
-M3f0LJfE8Sn4dtx66F41jXU=
-=OxlK
+iD8DBQFGkBf2Ei9d9xCOQEYRAklJAJ95tcXfOc6IFaKoNQW9cos0s36u3wCguaUU
+ypSNFRuSemtNhEXbHQacPPA=
+=RsYX
-----END PGP SIGNATURE-----
Modified: packages/libdbix-searchbuilder-perl/trunk/SearchBuilder.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/SearchBuilder.pm?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/SearchBuilder.pm (original)
+++ packages/libdbix-searchbuilder-perl/trunk/SearchBuilder.pm Sat Jul 14 20:41:37 2007
@@ -4,7 +4,7 @@
use strict;
use warnings;
-our $VERSION = "1.48";
+our $VERSION = "1.49";
use Clone qw();
use Encode qw();
Modified: packages/libdbix-searchbuilder-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/debian/changelog?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/debian/changelog (original)
+++ packages/libdbix-searchbuilder-perl/trunk/debian/changelog Sat Jul 14 20:41:37 2007
@@ -1,3 +1,10 @@
+libdbix-searchbuilder-perl (1.49-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add libdbix-searchbuilder-perl to debian/control.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 14 Jul 2007 22:39:22 +0200
+
libdbix-searchbuilder-perl (1.48-1) unstable; urgency=low
* New upstream release.
Modified: packages/libdbix-searchbuilder-perl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/debian/control?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/debian/control (original)
+++ packages/libdbix-searchbuilder-perl/trunk/debian/control Sat Jul 14 20:41:37 2007
@@ -4,8 +4,9 @@
Build-Depends: debhelper (>= 5)
Build-Depends-Indep: perl (>= 5.8.3), libextutils-autoinstall-perl (>= 0.49), libclass-returnvalue-perl (>= 0.40), libwant-perl, libcache-simple-timedexpiry-perl (>= 0.21), libdbix-dbschema-perl, libclass-accessor-perl, libclone-perl, libdbd-sqlite3-perl, libdevel-symdump-perl, libtest-pod-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Niko Tyni <ntyni at iki.fi>, Carlo Segre <segre at debian.org>
+Uploaders: Niko Tyni <ntyni at iki.fi>, Carlo Segre <segre at debian.org>, gregor herrmann <gregor+debian at comodo.priv.at>
Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/
Package: libdbix-searchbuilder-perl
Architecture: all
Modified: packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install.pm?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install.pm (original)
+++ packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install.pm Sat Jul 14 20:41:37 2007
@@ -28,7 +28,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.64';
+ $VERSION = '0.67';
}
# Whether or not inc::Module::Install is actually loaded, the
Modified: packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/AutoInstall.pm?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/AutoInstall.pm (original)
+++ packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/AutoInstall.pm Sat Jul 14 20:41:37 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Base.pm?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Base.pm (original)
+++ packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Base.pm Sat Jul 14 20:41:37 2007
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.64';
+$VERSION = '0.67';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Include.pm?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Include.pm (original)
+++ packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Include.pm Sat Jul 14 20:41:37 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Makefile.pm?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Makefile.pm (original)
+++ packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Makefile.pm Sat Jul 14 20:41:37 2007
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -17,192 +17,221 @@
my %seen = ();
sub prompt {
- shift;
-
- # Infinite loop protection
- my @c = caller();
- if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
- die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
- }
-
- # In automated testing, always use defaults
- if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) {
- local $ENV{PERL_MM_USE_DEFAULT} = 1;
- goto &ExtUtils::MakeMaker::prompt;
- } else {
- goto &ExtUtils::MakeMaker::prompt;
- }
+ shift;
+
+ # Infinite loop protection
+ my @c = caller();
+ if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
+ die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
+ }
+
+ # In automated testing, always use defaults
+ if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) {
+ local $ENV{PERL_MM_USE_DEFAULT} = 1;
+ goto &ExtUtils::MakeMaker::prompt;
+ } else {
+ goto &ExtUtils::MakeMaker::prompt;
+ }
}
sub makemaker_args {
- my $self = shift;
- my $args = ($self->{makemaker_args} ||= {});
- %$args = ( %$args, @_ ) if @_;
- $args;
+ my $self = shift;
+ my $args = ($self->{makemaker_args} ||= {});
+ %$args = ( %$args, @_ ) if @_;
+ $args;
}
# For mm args that take multiple space-seperated args,
# append an argument to the current list.
sub makemaker_append {
- my $self = shift;
- my $name = shift;
- my $args = $self->makemaker_args;
- $args->{name} = defined $args->{$name}
- ? join( ' ', $args->{name}, @_ )
- : join( ' ', @_ );
+ my $self = sShift;
+ my $name = shift;
+ my $args = $self->makemaker_args;
+ $args->{name} = defined $args->{$name}
+ ? join( ' ', $args->{name}, @_ )
+ : join( ' ', @_ );
}
sub build_subdirs {
- my $self = shift;
- my $subdirs = $self->makemaker_args->{DIR} ||= [];
- for my $subdir (@_) {
- push @$subdirs, $subdir;
- }
+ my $self = shift;
+ my $subdirs = $self->makemaker_args->{DIR} ||= [];
+ for my $subdir (@_) {
+ push @$subdirs, $subdir;
+ }
}
sub clean_files {
- my $self = shift;
- my $clean = $self->makemaker_args->{clean} ||= {};
- %$clean = (
- %$clean,
- FILES => join(' ', grep length, $clean->{FILES}, @_),
- );
+ my $self = shift;
+ my $clean = $self->makemaker_args->{clean} ||= {};
+ %$clean = (
+ %$clean,
+ FILES => join(' ', grep length, $clean->{FILES}, @_),
+ );
}
sub realclean_files {
- my $self = shift;
- my $realclean = $self->makemaker_args->{realclean} ||= {};
- %$realclean = (
- %$realclean,
- FILES => join(' ', grep length, $realclean->{FILES}, @_),
- );
+ my $self = shift;
+ my $realclean = $self->makemaker_args->{realclean} ||= {};
+ %$realclean = (
+ %$realclean,
+ FILES => join(' ', grep length, $realclean->{FILES}, @_),
+ );
}
sub libs {
- my $self = shift;
- my $libs = ref $_[0] ? shift : [ shift ];
- $self->makemaker_args( LIBS => $libs );
+ my $self = shift;
+ my $libs = ref $_[0] ? shift : [ shift ];
+ $self->makemaker_args( LIBS => $libs );
}
sub inc {
- my $self = shift;
- $self->makemaker_args( INC => shift );
+ my $self = shift;
+ $self->makemaker_args( INC => shift );
+}
+
+my %test_dir = ();
+
+sub _wanted_t {
+ /\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1;
+}
+
+sub tests_recursive {
+ my $self = shift;
+ if ( $self->tests ) {
+ die "tests_recursive will not work if tests are already defined";
+ }
+ my $dir = shift || 't';
+ unless ( -d $dir ) {
+ die "tests_recursive dir '$dir' does not exist";
+ }
+ require File::Find;
+ %test_dir = ();
+ File::Find::find( \&_wanted_t, $dir );
+ $self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir );
}
sub write {
- my $self = shift;
- die "&Makefile->write() takes no arguments\n" if @_;
-
- my $args = $self->makemaker_args;
- $args->{DISTNAME} = $self->name;
- $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args);
- $args->{VERSION} = $self->version || $self->determine_VERSION($args);
- $args->{NAME} =~ s/-/::/g;
- if ( $self->tests ) {
- $args->{test} = { TESTS => $self->tests };
- }
- if ($] >= 5.005) {
- $args->{ABSTRACT} = $self->abstract;
- $args->{AUTHOR} = $self->author;
- }
- if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
- $args->{NO_META} = 1;
- }
- if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) {
- $args->{SIGN} = 1;
- }
- unless ( $self->is_admin ) {
- delete $args->{SIGN};
- }
-
- # merge both kinds of requires into prereq_pm
- my $prereq = ($args->{PREREQ_PM} ||= {});
- %$prereq = ( %$prereq, map { @$_ } map { @$_ } grep $_,
- ($self->build_requires, $self->requires) );
-
- # merge both kinds of requires into prereq_pm
- my $subdirs = ($args->{DIR} ||= []);
- if ($self->bundles) {
- foreach my $bundle (@{ $self->bundles }) {
- my ($file, $dir) = @$bundle;
- push @$subdirs, $dir if -d $dir;
- delete $prereq->{$file};
- }
- }
-
- if ( my $perl_version = $self->perl_version ) {
- eval "use $perl_version; 1"
- or die "ERROR: perl: Version $] is installed, "
- . "but we need version >= $perl_version";
- }
-
- my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
- if ($self->admin->preop) {
- $args{dist} = $self->admin->preop;
- }
-
- my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
- $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
+ my $self = shift;
+ die "&Makefile->write() takes no arguments\n" if @_;
+
+ my $args = $self->makemaker_args;
+ $args->{DISTNAME} = $self->name;
+ $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args);
+ $args->{VERSION} = $self->version || $self->determine_VERSION($args);
+ $args->{NAME} =~ s/-/::/g;
+ if ( $self->tests ) {
+ $args->{test} = { TESTS => $self->tests };
+ }
+ if ($] >= 5.005) {
+ $args->{ABSTRACT} = $self->abstract;
+ $args->{AUTHOR} = $self->author;
+ }
+ if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
+ $args->{NO_META} = 1;
+ }
+ if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) {
+ $args->{SIGN} = 1;
+ }
+ unless ( $self->is_admin ) {
+ delete $args->{SIGN};
+ }
+
+ # merge both kinds of requires into prereq_pm
+ my $prereq = ($args->{PREREQ_PM} ||= {});
+ %$prereq = ( %$prereq,
+ map { @$_ }
+ map { @$_ }
+ grep $_,
+ ($self->build_requires, $self->requires)
+ );
+
+ # merge both kinds of requires into prereq_pm
+ my $subdirs = ($args->{DIR} ||= []);
+ if ($self->bundles) {
+ foreach my $bundle (@{ $self->bundles }) {
+ my ($file, $dir) = @$bundle;
+ push @$subdirs, $dir if -d $dir;
+ delete $prereq->{$file};
+ }
+ }
+
+ if ( my $perl_version = $self->perl_version ) {
+ eval "use $perl_version; 1"
+ or die "ERROR: perl: Version $] is installed, "
+ . "but we need version >= $perl_version";
+ }
+
+ $args->{INSTALLDIRS} = $self->installdirs;
+
+ my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
+
+ my $user_preop = delete $args{dist}->{PREOP};
+ if (my $preop = $self->admin->preop($user_preop)) {
+ $args{dist} = $preop;
+ }
+
+ my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
+ $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
}
sub fix_up_makefile {
- my $self = shift;
- my $makefile_name = shift;
- my $top_class = ref($self->_top) || '';
- my $top_version = $self->_top->VERSION || '';
-
- my $preamble = $self->preamble
- ? "# Preamble by $top_class $top_version\n"
- . $self->preamble
- : '';
- my $postamble = "# Postamble by $top_class $top_version\n"
- . ($self->postamble || '');
-
- local *MAKEFILE;
- open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
- my $makefile = do { local $/; <MAKEFILE> };
- close MAKEFILE or die $!;
-
- $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
- $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
- $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
- $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
- $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
-
- # Module::Install will never be used to build the Core Perl
- # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
- # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
- $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
- #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
-
- # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
- $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g;
-
- # XXX - This is currently unused; not sure if it breaks other MM-users
- # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
-
- open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
- print MAKEFILE "$preamble$makefile$postamble" or die $!;
- close MAKEFILE or die $!;
-
- 1;
+ my $self = shift;
+ my $makefile_name = shift;
+ my $top_class = ref($self->_top) || '';
+ my $top_version = $self->_top->VERSION || '';
+
+ my $preamble = $self->preamble
+ ? "# Preamble by $top_class $top_version\n"
+ . $self->preamble
+ : '';
+ my $postamble = "# Postamble by $top_class $top_version\n"
+ . ($self->postamble || '');
+
+ local *MAKEFILE;
+ open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ my $makefile = do { local $/; <MAKEFILE> };
+ close MAKEFILE or die $!;
+
+ $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
+ $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
+ $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
+ $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
+ $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
+
+ # Module::Install will never be used to build the Core Perl
+ # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
+ # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
+ $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
+ #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
+
+ # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
+ $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g;
+
+ # XXX - This is currently unused; not sure if it breaks other MM-users
+ # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
+
+ open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ print MAKEFILE "$preamble$makefile$postamble" or die $!;
+ close MAKEFILE or die $!;
+
+ 1;
}
sub preamble {
- my ($self, $text) = @_;
- $self->{preamble} = $text . $self->{preamble} if defined $text;
- $self->{preamble};
+ my ($self, $text) = @_;
+ $self->{preamble} = $text . $self->{preamble} if defined $text;
+ $self->{preamble};
}
sub postamble {
- my ($self, $text) = @_;
- $self->{postamble} ||= $self->admin->postamble;
- $self->{postamble} .= $text if defined $text;
- $self->{postamble}
+ my ($self, $text) = @_;
+ $self->{postamble} ||= $self->admin->postamble;
+ $self->{postamble} .= $text if defined $text;
+ $self->{postamble}
}
1;
__END__
-#line 334
+#line 363
Modified: packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Metadata.pm?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Metadata.pm (original)
+++ packages/libdbix-searchbuilder-perl/trunk/inc/Module/Install/Metadata.pm Sat Jul 14 20:41:37 2007
@@ -6,14 +6,14 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
my @scalar_keys = qw{
name module_name abstract author version license
- distribution_type perl_version tests
+ distribution_type perl_version tests installdirs
};
my @tuple_keys = qw{
@@ -56,9 +56,23 @@
};
}
+# configure_requires is currently a null-op
+sub configure_requires { 1 }
+
+# Aliases for build_requires that will have alternative
+# meanings in some future version of META.yml.
+sub test_requires { shift->build_requires(@_) }
+sub install_requires { shift->build_requires(@_) }
+
+# Aliases for installdirs options
+sub install_as_core { $_[0]->installdirs('perl') }
+sub install_as_cpan { $_[0]->installdirs('site') }
+sub install_as_site { $_[0]->installdirs('site') }
+sub install_as_vendor { $_[0]->installdirs('vendor') }
+
sub sign {
my $self = shift;
- return $self->{'values'}{'sign'} if defined wantarray and !@_;
+ return $self->{'values'}{'sign'} if defined wantarray and ! @_;
$self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 );
return $self;
}
@@ -279,9 +293,11 @@
if (
$self->_slurp($file) =~ m/
- =head \d \s+
- (?:licen[cs]e|licensing|copyright|legal)\b
- (.*?)
+ (
+ =head \d \s+
+ (?:licen[cs]e|licensing|copyright|legal)\b
+ .*?
+ )
(=head\\d.*|=cut.*|)
\z
/ixms
@@ -289,19 +305,24 @@
{
my $license_text = $1;
my @phrases = (
- 'under the same (?:terms|license) as perl itself' => 'perl',
- 'GNU public license' => 'gpl',
- 'GNU lesser public license' => 'gpl',
- 'BSD license' => 'bsd',
- 'Artistic license' => 'artistic',
- 'GPL' => 'gpl',
- 'LGPL' => 'lgpl',
- 'BSD' => 'bsd',
- 'Artistic' => 'artistic',
+ 'under the same (?:terms|license) as perl itself' => 'perl', 1,
+ 'GNU public license' => 'gpl', 1,
+ 'GNU lesser public license' => 'gpl', 1,
+ 'BSD license' => 'bsd', 1,
+ 'Artistic license' => 'artistic', 1,
+ 'GPL' => 'gpl', 1,
+ 'LGPL' => 'lgpl', 1,
+ 'BSD' => 'bsd', 1,
+ 'Artistic' => 'artistic', 1,
+ 'MIT' => 'mit', 1,
+ 'proprietary' => 'proprietary', 0,
);
- while ( my ( $pattern, $license ) = splice( @phrases, 0, 2 ) ) {
+ while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
$pattern =~ s{\s+}{\\s+}g;
if ( $license_text =~ /\b$pattern\b/i ) {
+ if ( $osi and $license_text =~ /All rights reserved/i ) {
+ warn "LEGAL WARNING: 'All rights reserved' may invalidate Open Source licenses. Consider removing it.";
+ }
$self->license($license);
return 1;
}
Modified: packages/libdbix-searchbuilder-perl/trunk/t/01records.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/t/01records.t?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/t/01records.t (original)
+++ packages/libdbix-searchbuilder-perl/trunk/t/01records.t Sat Jul 14 20:41:37 2007
@@ -3,7 +3,6 @@
use strict;
use warnings;
-use File::Spec;
use Test::More;
BEGIN { require "t/utils.pl" }
our (@AvailableDrivers);
Modified: packages/libdbix-searchbuilder-perl/trunk/t/01searches.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/t/01searches.t?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/t/01searches.t (original)
+++ packages/libdbix-searchbuilder-perl/trunk/t/01searches.t Sat Jul 14 20:41:37 2007
@@ -3,7 +3,6 @@
use strict;
use warnings;
-use File::Spec;
use Test::More;
BEGIN { require "t/utils.pl" }
our (@AvailableDrivers);
Modified: packages/libdbix-searchbuilder-perl/trunk/t/02records_cachable.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/t/02records_cachable.t?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/t/02records_cachable.t (original)
+++ packages/libdbix-searchbuilder-perl/trunk/t/02records_cachable.t Sat Jul 14 20:41:37 2007
@@ -3,7 +3,6 @@
use strict;
use warnings;
-use File::Spec;
use Test::More;
BEGIN { require "t/utils.pl" }
our (@AvailableDrivers);
Modified: packages/libdbix-searchbuilder-perl/trunk/t/02records_integers.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/t/02records_integers.t?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/t/02records_integers.t (original)
+++ packages/libdbix-searchbuilder-perl/trunk/t/02records_integers.t Sat Jul 14 20:41:37 2007
@@ -2,7 +2,6 @@
use strict;
use warnings;
-use File::Spec;
use Test::More;
BEGIN { require "t/utils.pl" }
our (@AvailableDrivers);
Modified: packages/libdbix-searchbuilder-perl/trunk/t/02records_object.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/t/02records_object.t?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/t/02records_object.t (original)
+++ packages/libdbix-searchbuilder-perl/trunk/t/02records_object.t Sat Jul 14 20:41:37 2007
@@ -3,7 +3,6 @@
use strict;
use warnings;
-use File::Spec;
use Test::More;
BEGIN { require "t/utils.pl" }
Modified: packages/libdbix-searchbuilder-perl/trunk/t/02searches_joins.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/t/02searches_joins.t?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/t/02searches_joins.t (original)
+++ packages/libdbix-searchbuilder-perl/trunk/t/02searches_joins.t Sat Jul 14 20:41:37 2007
@@ -1,7 +1,6 @@
#!/usr/bin/perl -w
use strict;
-use File::Spec;
use Test::More;
BEGIN { require "t/utils.pl" }
Modified: packages/libdbix-searchbuilder-perl/trunk/t/03rebless.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/t/03rebless.t?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/t/03rebless.t (original)
+++ packages/libdbix-searchbuilder-perl/trunk/t/03rebless.t Sat Jul 14 20:41:37 2007
@@ -3,7 +3,6 @@
use strict;
use warnings;
-use File::Spec;
use Test::More;
use DBIx::SearchBuilder::Handle;
Modified: packages/libdbix-searchbuilder-perl/trunk/t/03transactions.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/t/03transactions.t?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/t/03transactions.t (original)
+++ packages/libdbix-searchbuilder-perl/trunk/t/03transactions.t Sat Jul 14 20:41:37 2007
@@ -3,7 +3,6 @@
use strict;
use warnings;
-use File::Spec;
use Test::More;
BEGIN { require "t/utils.pl" }
our (@AvailableDrivers);
Modified: packages/libdbix-searchbuilder-perl/trunk/t/03versions.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/t/03versions.t?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/t/03versions.t (original)
+++ packages/libdbix-searchbuilder-perl/trunk/t/03versions.t Sat Jul 14 20:41:37 2007
@@ -2,7 +2,6 @@
use strict;
use warnings;
-use File::Spec;
use Test::More;
use DBIx::SearchBuilder::Handle;
Modified: packages/libdbix-searchbuilder-perl/trunk/t/11schema_records.t
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/t/11schema_records.t?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/t/11schema_records.t (original)
+++ packages/libdbix-searchbuilder-perl/trunk/t/11schema_records.t Sat Jul 14 20:41:37 2007
@@ -3,7 +3,6 @@
use strict;
use warnings;
-use File::Spec;
use Test::More;
BEGIN { require "t/utils.pl" }
Modified: packages/libdbix-searchbuilder-perl/trunk/t/utils.pl
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libdbix-searchbuilder-perl/trunk/t/utils.pl?rev=5787&op=diff
==============================================================================
--- packages/libdbix-searchbuilder-perl/trunk/t/utils.pl (original)
+++ packages/libdbix-searchbuilder-perl/trunk/t/utils.pl Sat Jul 14 20:41:37 2007
@@ -1,6 +1,7 @@
#!/usr/bin/perl -w
use strict;
+use File::Temp qw/ tempfile /;
=head1 VARIABLES
@@ -92,13 +93,15 @@
goto &$call;
}
-sub connect_sqlite
-{
- my $handle = shift;
- return $handle->Connect(
- Driver => 'SQLite',
- Database => File::Spec->catfile(File::Spec->tmpdir(), "sb-test.$$")
- );
+sub connect_sqlite {
+
+ my ( $fh, $filename ) = tempfile();
+ close($fh);
+ my $handle = shift;
+ return $handle->Connect(
+ Driver => 'SQLite',
+ Database => $filename
+ );
}
sub connect_mysql
More information about the Pkg-perl-cvs-commits
mailing list