Skip to content

Fix Config core paths for CBuilder #831

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.

Sign up for GitHub

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

Closed
fglock wants to merge 1 commit into from
Closed

Fix Config core paths for CBuilder #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 39 additions & 3 deletions src/main/perl/lib/Config.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ my $user_home = getProperty('user.home') || '';
my $user_dir = getProperty('user.dir') || '';
my $java_home = getProperty('java.home') || '';
my $user_name = getProperty('user.name') || 'unknown';
my $perlonjava_home = $user_home
? _catdir($file_separator, $user_home, '.perlonjava')
: '.perlonjava';
my $core_privlib = _catdir($file_separator, $perlonjava_home, 'core', 'lib', 'perl5', '5.42.0');
my $core_archlib = _catdir($file_separator, $core_privlib, "java-$java_version-$os_arch");
_ensure_dir(_catdir($file_separator, $core_archlib, 'CORE'));

# Best-effort hostname; falls back to "localhost" if Java doesn't expose it.
my $host_name = eval {
Expand Down Expand Up @@ -133,6 +139,8 @@ $os_name =~ s/\s+/_/g;
# implement full taint checking. This allows tests that check for taint
# support to skip gracefully.
ccflags => '-DSILENT_NO_TAINT_SUPPORT',
ldflags => '',
lddlflags => '',
optimize => '',

# Library/path configuration
Expand All @@ -154,9 +162,10 @@ $os_name =~ s/\s+/_/g;
cf_by => $user_name,
myhostname => $host_name,

# Standard Perl paths (relative to jar or filesystem)
archlibexp => 'perlonjava/lib/perl5/5.42.0/' . "java-$java_version-$os_arch",
privlibexp => 'perlonjava/lib/perl5/5.42.0',
# Standard Perl paths. The core exp paths must be real directories because
# CPAN build helpers such as ExtUtils::CBuilder probe $archlibexp/CORE.
archlibexp => $core_archlib,
privlibexp => $core_privlib,
sitearchexp => 'perlonjava/lib/perl5/site_perl/5.42.0/' . "java-$java_version-$os_arch",
sitelibexp => 'perlonjava/lib/perl5/site_perl/5.42.0',
vendorarchexp => 'perlonjava/lib/perl5/vendor_perl/5.42.0/' . "java-$java_version-$os_arch",
Expand Down Expand Up @@ -351,6 +360,33 @@ $os_name =~ s/\s+/_/g;
sub non_bincompat_options() {}
sub bincompat_options() {}

sub _catdir {
my ($sep, @parts) = @_;
my $path = shift @parts;
for my $part (@parts) {
next unless defined $part && length $part;
$path =~ s/\Q$sep\E+\z//;
$path .= $sep . $part;
}
return $path;
}

sub _ensure_dir {
my ($dir) = @_;
return if -d $dir;

my $sep = $file_separator;
my @parts = grep length, split /\Q$sep\E+/, $dir;
my $current = $dir =~ /^\Q$sep\E/ ? $sep : '';

for my $part (@parts) {
$current = length($current) && $current ne $sep
? _catdir($sep, $current, $part)
: $current . $part;
mkdir $current unless -d $current;
}
}

# Return a string describing the perl configuration (like perl -V)
sub myconfig {
my $config = "Summary of my perl5 (revision 5 version 42 subversion 0) configuration:\n";
Expand Down
16 changes: 16 additions & 0 deletions src/test/resources/unit/config_core_paths.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
use strict;
use warnings;
use Test::More tests => 7;
use Config;
use File::Spec;

ok(File::Spec->file_name_is_absolute($Config{archlibexp}), 'archlibexp is absolute');
ok(File::Spec->file_name_is_absolute($Config{privlibexp}), 'privlibexp is absolute');

my $core_dir = File::Spec->catdir($Config{archlibexp}, 'CORE');
ok(-d $Config{privlibexp}, 'privlibexp directory exists');
ok(-d $Config{archlibexp}, 'archlibexp directory exists');
ok(-d $core_dir, 'archlib CORE directory exists');

is($Config{ldflags}, '', 'ldflags has an empty default');
is($Config{lddlflags}, '', 'lddlflags has an empty default');
Loading