From 8c3bca09299c62b7cf0ac007adb9743b21198e05 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sat, 29 Nov 2008 21:33:08 -0800 Subject: [PATCH] Changed the place where list of subsystems is stored to GSLBuilder, so that Build.PL does not depend on Math::GSL --- Build.PL | 3 +-- inc/GSLBuilder.pm | 18 ++++++++++++++++++ lib/Math/GSL.pm | 20 -------------------- t/00-load.t | 9 +++++++-- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Build.PL b/Build.PL index 0680605..7c86ec5 100644 --- a/Build.PL +++ b/Build.PL @@ -23,7 +23,6 @@ use Config; use Data::Dumper; use Module::Build; use lib 'inc'; -use Math::GSL; use GSLBuilder; use File::Spec::Functions qw/:ALL/; @@ -168,7 +167,7 @@ if ($Config{archname} =~ /x86_64/ ) { $ccflags .= ' -fPIC -fno-omit-frame-pointer '; } -my @Subsystems = grep { ! /^Test$/ } Math::GSL::subsystems; +my @Subsystems = grep { ! /^Test$/ } GSLBuilder::subsystems; # BSplines appeared in 1.9 if ($current_minor_version < 9 ) { diff --git a/inc/GSLBuilder.pm b/inc/GSLBuilder.pm index 7e47bd2..2962036 100644 --- a/inc/GSLBuilder.pm +++ b/inc/GSLBuilder.pm @@ -6,6 +6,24 @@ use File::Spec::Functions qw/:ALL/; use Data::Dumper; use base 'Module::Build'; +sub subsystems { + sort qw/ + Diff Machine Statistics BLAS + Eigen Matrix Poly MatrixComplex + BSpline Errno PowInt VectorComplex + CBLAS FFT Min IEEEUtils + CDF Fit QRNG + Chebyshev Monte RNG Vector + Heapsort Multifit Randist Roots + Combination Histogram Multimin Wavelet + Complex Histogram2D Multiroots Wavelet2D + Const Siman Sum Sys + NTuple Integration Sort Test + DHT Interp ODEIV SF + Deriv Linalg Permutation Spline + /; +} + sub process_swig_files { my $self = shift; my $p = $self->{properties}; diff --git a/lib/Math/GSL.pm b/lib/Math/GSL.pm index 00cd418..15976cd 100644 --- a/lib/Math/GSL.pm +++ b/lib/Math/GSL.pm @@ -16,26 +16,8 @@ our @EXPORT_OK = qw( gsl_fopen gsl_fclose $GSL_MODE_DEFAULT $GSL_PREC_DOUBLE $GSL_PREC_SINGLE $GSL_PREC_APPROX - subsystems ); -sub subsystems { - sort qw/ - Diff Machine Statistics - Eigen Matrix Poly MatrixComplex - BSpline Errno PowInt VectorComplex - CBLAS FFT Min IEEEUtils - CDF Fit QRNG - Chebyshev Monte RNG Vector - Heapsort Multifit Randist Roots - Combination Histogram Multimin Wavelet - Complex Histogram2D Multiroots Wavelet2D - Const Siman Sum Sys - NTuple Integration Sort Test - DHT Interp ODEIV SF - Deriv Linalg Permutation Spline - /; -} our %EXPORT_TAGS = ( all => \@EXPORT_OK, ); @@ -51,8 +33,6 @@ Math::GSL - Perl interface to the GNU Scientific Library (GSL) Version 0.15_04 -=cut - =head1 SYNOPSIS use Math::GSL::Matrix; diff --git a/t/00-load.t b/t/00-load.t index 8174d1f..ad9b0dc 100644 --- a/t/00-load.t +++ b/t/00-load.t @@ -1,11 +1,16 @@ -use Test::More tests => 51; +use Test::More tests => 52; use Config; use File::Spec::Functions; use lib catfile 'blib', 'lib'; +use lib 'inc'; +use GSLBuilder; +use strict; +use warnings; + BEGIN { use_ok( 'Math::GSL' ); - map { use_ok("Math::GSL::$_") } Math::GSL::subsystems() + map { use_ok("Math::GSL::$_") } GSLBuilder::subsystems(); } my $arch = $Config{archname}; -- 2.11.4.GIT