Skip to content

fix: scan root-level .pm files alongside lib/ in MakeMaker #500

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: scan root-level .pm files alongside lib/ in MakeMaker #500

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
4 changes: 2 additions & 2 deletions src/main/java/org/perlonjava/core/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public final class Configuration {
* Automatically populated by Gradle/Maven during build.
* DO NOT EDIT MANUALLY - this value is replaced at build time.
*/
public static final String gitCommitId = "f006e8c7b";
public static final String gitCommitId = "1afee082e";

/**
* Git commit date of the build (ISO format: YYYY-MM-DD).
Expand All @@ -48,7 +48,7 @@ public final class Configuration {
* Parsed by App::perlbrew and other tools via: perl -V | grep "Compiled at"
* DO NOT EDIT MANUALLY - this value is replaced at build time.
*/
public static final String buildTimestamp = "Apr 13 2026 11:44:38";
public static final String buildTimestamp = "Apr 13 2026 13:09:59";

// Prevent instantiation
private Configuration() {
Expand Down
22 changes: 13 additions & 9 deletions src/main/perl/lib/ExtUtils/MakeMaker.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,14 +233,16 @@ sub _install_pure_perl {
}, 'blib/lib');
}

# Fallback: scan current directory for .pm files (flat layout)
# Some CPAN distributions (e.g. Crypt::RC4) have .pm files at the
# root level instead of in lib/. Standard MakeMaker handles this via
# PMLIBDIRS which defaults to ['lib', $self->{BASEEXT}].
# We derive the install subdirectory from the NAME parameter.
if (!%pm && $name) {
# Scan root-level .pm files and BASEEXT directory.
# Standard MakeMaker maps: ./*.pm => $(INST_LIBDIR)/*.pm
# where INST_LIBDIR = INST_LIB/Parent/Path (derived from NAME).
# PMLIBDIRS defaults to ['lib', $BASEEXT], so both lib/ (handled
# above) and root .pm files / BASEEXT dir are always scanned.
# This handles distributions like Math::Base::Convert where the
# main .pm lives at the root alongside sub-modules in lib/.
if ($name) {
my @parts = split /::/, $name;
my $baseext = pop @parts; # Remove BASEEXT (e.g. XML::Parser -> Parser)
my $baseext = pop @parts; # BASEEXT (e.g. XML::Parser -> Parser)
my $parent_dir = @parts ? File::Spec->catdir(@parts) : '';

# Scan flat .pm files in current directory
Expand All @@ -251,7 +253,8 @@ sub _install_pure_perl {
my $dest_rel = $parent_dir
? File::Spec->catfile($parent_dir, $file)
: $file;
$pm{$file} = File::Spec->catfile($INSTALL_BASE, $dest_rel);
$pm{$file} = File::Spec->catfile($INSTALL_BASE, $dest_rel)
unless exists $pm{$file};
}
closedir($dh);
}
Expand All @@ -266,7 +269,8 @@ sub _install_pure_perl {
my $rel = $parent_dir
? File::Spec->catfile($parent_dir, $src)
: $src;
$pm{$src} = File::Spec->catfile($INSTALL_BASE, $rel);
$pm{$src} = File::Spec->catfile($INSTALL_BASE, $rel)
unless exists $pm{$src};
},
no_chdir => 1,
}, $baseext);
Expand Down
Loading