WIP

ingydotnet · Nov 19, 2014 · d5e573f · d5e573f
1 parent 164e4e0
commit d5e573f
Showing 1 changed file with 25 additions and 75 deletions.
diff --git a/lib/Inline/Module/MakeMaker.pm b/lib/Inline/Module/MakeMaker.pm
@@ -2,85 +2,50 @@ use strict;
 use warnings;
 package Inline::Module::MakeMaker;
 
-use Exporter 'import';
-use ExtUtils::MakeMaker();
+use Exporter;
+our @EXPORT_OK = qw/postamble/;
+sub import {
+    my ($class, @args) = @_;
+    if (@args == 1 and $args[0] eq '-global') {
+        no warnings 'once';
+        *MY::postamble = \&postamble;
+    }
+    else {
+        goto &Exporter::import;
+    }
+}
+
 use Carp;
 
 our @EXPORT = qw(FixMakefile);
 
 #                     use XXX;
 
-# TODO This should probably become OO, rather than a package lexical:
-my $INLINE;
-
-sub FixMakefile {
-    my %args = @_;
-    croak "'inc' must be in \@INC. Add 'use lib \"inc\";' to Makefile.PL.\n"
-        unless grep /^inc$/, @INC;
-    $INLINE = default_args(\%args);
-    my $makefile = read_makefile();
-    fixup_makefile($makefile);
-    add_postamble($makefile);
-    write_makefile($makefile);
-}
-
 sub default_args {
-    my $args = shift;
-    croak "FixMakefile requires 'module' argument.\n"
-        unless $args->{module};
+    my ($self, $args) = @_;
+    $args->{module} = $self->{NAME} unless $args->{module};
     $args->{module} = [ $args->{module} ] unless ref $args->{module};
     $args->{inline} ||= [ map "${_}::Inline", @{$args->{module}} ];
     $args->{inline} = [ $args->{inline} ] unless ref $args->{inline};
     $args->{ILSM} ||= 'Inline::C';
     return $args;
 }
 
-sub read_makefile {
-    open MF_IN, '<', 'Makefile'
-        or croak "Can't open 'Makefile' for input:\n$!";
-    my $makefile = do {local $/; <MF_IN>};
-    close MF_IN;
-    return $makefile;
-}
-
-sub write_makefile {
-    my $makefile = shift;
-    open MF_OUT, '>', 'Makefile'
-        or croak "Can't open 'Makefile' for output:\n$!";
-    print MF_OUT $makefile;
-    close MF_OUT;
-}
-
-sub fixup_makefile {
-    $_[0] =~ s/^(distdir\s+):(\s+)/$1::$2/m;
-    $_[0] =~ s/^(pure_all\s+):(\s+)/$1::$2/m;
-}
-
-sub add_postamble {
-    my $inline_section = make_distdir_section();
-
-    $_[0] .= <<"...";
-
-# Inline::Module::MakeMaker is adding this section:
-
-# --- MakeMaker Inline::Module sections:
-
-$inline_section
-...
-}
-
-sub make_distdir_section {
-    my $code_modules = $INLINE->{module};
-    my $inlined_modules = $INLINE->{inline};
-    my @included_modules = included_modules();
+sub postamble {
+    my ($self, %args) = @_;
+    my $inline = default_args($self, \%args);
+    my $code_modules = $inline->{module};
+    my $inlined_modules = $inline->{inline};
+    my @included_modules = included_modules($inline->{ILSM});
 
     my $section = <<"...";
-distdir ::
+distdir : distdir_inline
+
+distdir_inline : create_distdir
 \t\$(NOECHO) \$(ABSPERLRUN) -MInline::Module=distdir -e 1 -- \$(DISTVNAME) @$inlined_modules -- @included_modules
 
 pure_all ::
 ...
-
     for my $module (@$code_modules) {
         $section .=
             "\t\$(NOECHO) \$(ABSPERLRUN) -Iinc -Ilib -e 'use $module'\n";
@@ -91,23 +56,8 @@ pure_all ::
     return $section;
 }
 
-sub include_module {
-    my $module = shift;
-    eval "require $module; 1" or die $@;
-    my $path = $module;
-    $path =~ s!::!/!g;
-    my $source_path = $INC{"$path.pm"}
-        or die "Can't locate $path.pm in %INC";
-    my $inc_path = "inc/$path.pm";
-    my $inc_dir = $path;
-    $inc_dir =~ s!(.*/).*!$1! or
-        $inc_dir = '';
-    $inc_dir = "inc/$inc_dir";
-    return ("$path.pm", $inc_path, $inc_dir);
-}
-
 sub included_modules {
-    my $ilsm = $INLINE->{ILSM}
+    my $ilsm = shift
         or croak "INLINE section requires 'ILSM' key in Makefile.PL";
     $ilsm = [ $ilsm ] unless ref $ilsm;
     return (