Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove build dependent strings from probe.pl #157

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 14 additions & 16 deletions inc/My/Config.pm
Expand Up @@ -127,27 +127,24 @@ sub probe
{
my($self) = @_;

my $probe = $self->{probe} ||= FFI::Probe->new(
$self->{probe} ||= FFI::Probe->new(
runner => $self->probe_runner,
log => "config.log",
data_filename => "./blib/lib/auto/share/dist/FFI-Platypus/probe/probe.pl",
alien => [$self->share_config->get('alien')->{class}],
cflags => ['-Iinclude'],
);
}

unless(exists $probe->data->{alien})
{
my $class = $self->share_config->get('alien')->{class};
my $pm = $class . ".pm";
$pm =~ s{::}{/}g;
require $pm;
$probe->set( 'alien', 'ffi', 'class' => $class );
$probe->set( 'alien', 'ffi', 'version', => $class->config('version') );
$probe->set( 'alien', 'ffi', 'cflags' => $class->cflags );
$probe->set( 'alien', 'ffi', 'libs' => $class->libs );
}
sub probe2
{
my($self) = @_;

$probe;
my $probe = $self->{probe2} ||= FFI::Probe->new(
runner => $self->probe_runner,
log => "config.log",
data_filename => "./_mm/probe.pl",
);
}

sub probe_runner
Expand All @@ -169,9 +166,10 @@ sub probe_runner_build
{
my($self) = @_;
my $probe = $self->probe;
my $probe2 = $self->probe2;
my $builder = FFI::Probe::Runner::Builder->new;
foreach my $key (qw( cc ccflags optimize ld ldflags ))
{ @{ $builder->$key } = @{ $probe->data->{eumm}->{$key} } }
{ @{ $builder->$key } = @{ $probe2->data->{eumm}->{$key} } }
$builder->build unless -e $builder->exe;
}

Expand Down Expand Up @@ -374,9 +372,9 @@ sub platform
{
my($self) = @_;
my %Config = %Config;
foreach my $key (keys %{ $self->probe->data->{eumm} })
foreach my $key (keys %{ $self->probe2->data->{eumm} })
{
$Config{$key} = $self->probe->data->{eumm}->{$key};
$Config{$key} = $self->probe2->data->{eumm}->{$key};
}
require FFI::Build::Platform;
FFI::Build::Platform->new(\%Config);
Expand Down
14 changes: 13 additions & 1 deletion inc/mm-config-set.pl
Expand Up @@ -7,4 +7,16 @@
my @key = split /\./, $key;

my $config = My::Config->new;
$config->probe->set(@key, \@value);

use YAML ();
warn YAML::Dump(\@key);

my $probe;

if($key[0] && $key[0] eq 'eumm')
{ warn "1"; $probe = $config->probe2 }
else
{ warn "2"; $probe = $config->probe }

$probe->set(@key, \@value);
$probe->save;
6 changes: 5 additions & 1 deletion lib/FFI/Probe.pm
Expand Up @@ -561,7 +561,11 @@ sub save
->Sortkeys(1)
->Dump;

mkpath( $dir, 0, 0755 ) unless -d $dir;
unless(-d $dir)
{
require File::Path;
File::Path::mkpath( $dir, 0, 0755 );
}

my $fh;
open($fh, '>', $self->{data_filename}) || die "error writing @{[ $self->{data_filename} ]}";
Expand Down