Changeset 5582

Timestamp:

06/25/09 12:23:29 (3 years ago)

Author:

szabgab

Message:

allow the reusing of a partial build, allow skipping the perl building part

Location:

trunk/Perl-Dist-XL

Files:

• lib/Perl/Dist/XL.pm (modified) (8 diffs)
• script/perldist_xl.pl (modified) (1 diff)

trunk/Perl-Dist-XL/lib/Perl/Dist/XL.pm

@@ -12 +12 @@
     my ($class, %args) = @_;
     my $self = bless \%args, $class;
-    $self->{temp}             ||= tempdir( CLEANUP => 0 );
-    $self->{perl_install_dir} = "$self->{temp}/perl";
-    $self->{cwd}              = cwd;
+
+    $self->{cwd} = cwd;
+
+    if ($self->{temp}) {
+        die "$self->{temp} does not exist\n" if not -d $self->{temp};
+    } else {
+        $self->{temp} = tempdir( CLEANUP => 1 );
+    }
+    $self->{perl_install_dir} = $self->temp_dir . '/' . $self->release_name;
     return $self;
 }
@@ -23 +29 @@
 }
 
-sub install_modules {
-    my ($self) = @_;
-    
-    my @modules = (
-        ['Test::Simple'     => '0.88'],
-        ['Sub::Uplevel'     => '0.2002'],
-        ['Array::Compare'   => '1.17'],
-        ['Tree::DAG_Node'   => '1.06'],
-        ['Test::Exception'  => '0.27'],
-        ['Test::Warn'       => '0.11'],
-        ['Test::Tester'     => '0'],
-        ['Test::NoWarnings' => '0'],
-        ['Test::Deep'       => '0'],
-        ['IO::Scalar'       => '0'],
-    );
-    foreach my $m (@modules) {
-        _system("$self->{perl_install_dir}/bin/perl $self->{perl_install_dir}/bin/mycpan.pl $m->[0]");
-    }
-}
 
 sub build {
     my ($self) = @_;
-    $self->get_perl;
-    $self->build_perl;
 
+    $self->get_perl   unless $self->skip_perl;
+    $self->build_perl unless $self->skip_perl;
 
     $self->configure_cpan;
@@ -53 +40 @@
     $self->remove_cpan_dir;
 
-    #$self->test_perl;
-    $self->move_to_other_path;
-    #$self->test_perl;
+    # TODO: run some tests
+    $self->create_zip;
+    # TODO: unzip and in some other place and run some more tests
 
-    $self->create_zip;
     return;
 }
 
-sub configure_cpan {
-    my ($self) = @_;
-    my $from = "$self->{cwd}/share/files/mycpan.pl"; # TODO not from cwd ?
-    my $to   = $self->temp_dir . '/perl/bin/';
-    debug("copy '$from', '$to'");
-    copy $from, $to;
-    return;
-}
-
-sub remove_cpan_dir {
-    my ($self) = @_;
-    _system("rm -rf " . $self->temp_dir . '/perl/.cpan');
-    return;
-}
 
 sub get_perl {
@@ -100 +72 @@
 sub build_perl {
     my ($self) = @_;
+
     my $dir = $self->cache;
     my $temp = $self->temp_dir;
@@ -108 +81 @@
     _system("make test");
     _system("make install");
+
+    return;
+}
+
+sub configure_cpan {
+    my ($self) = @_;
+    my $from = "$self->{cwd}/share/files/mycpan.pl"; # TODO not from cwd ?
+    my $to   = $self->{perl_install_dir} . '/bin/';
+    debug("copy '$from', '$to'");
+    copy $from, $to;
+    return;
+}
+
+sub install_modules {
+    my ($self) = @_;
+    
+    my @modules = (
+        ['Test::Simple'     => '0.88'],
+        ['Sub::Uplevel'     => '0.2002'],
+        ['Array::Compare'   => '1.17'],
+        ['Tree::DAG_Node'   => '1.06'],
+        ['Test::Exception'  => '0.27'],
+        ['Test::Warn'       => '0.11'],
+        ['Test::Tester'     => '0'],
+        ['Test::NoWarnings' => '0'],
+        ['Test::Deep'       => '0'],
+        ['IO::Scalar'       => '0'],
+    );
+    foreach my $m (@modules) {
+        _system("$self->{perl_install_dir}/bin/perl $self->{perl_install_dir}/bin/mycpan.pl $m->[0]");
+    }
+}
+
+sub remove_cpan_dir {
+    my ($self) = @_;
+    _system("rm -rf " . $self->{perl_install_dir} . '/.cpan');
+    return;
 }
 
@@ -115 +125 @@
     chdir $self->temp_dir;
     my $file = "$self->{cwd}/" . $self->release_name . '.tar.gz';
-    _system("tar czf $file " . $self->release_name);
+    _system("tar czf $file " . $self->{perl_install_dir});
     return;
 }   
+
+
+#### helper subs
 
 sub temp_dir {
@@ -131 +144 @@
 }
 
-sub move_to_other_path {
-    my ($self) = @_;
-    
-    chdir $self->temp_dir;
-    my $release_dir = $self->release_name;
-#   debug(cwd);
-    debug("move perl to $release_dir");
-    rename 'perl', $release_dir or die $!;
-    return;
-}
 
 sub release_name {
@@ -153 +156 @@
 }
 
+sub skip_perl {
+    return $_[0]->{skipperl};
+}
 
 sub debug {

trunk/Perl-Dist-XL/script/perldist_xl.pl

@@ -16 +16 @@
     "temp=s",
     "release=s",
-    ) or die;
-die "need --release VERSION\n" if not $conf{release};
+    "skipperl",
+    ) or usage();
+usage("need --release VERSION") if not $conf{release};
 
 my $p = Perl::Dist::XL->new(%conf);
 $p->build;
 
+sub usage {
+    my $str = shift;
+    if ($str) {
+        print "\n$str\n\n";
+    }
+    print <<"END_USAGE";
+Usage: $0 --release VERSION    ( e.g. 0.01 )
 
+       --temp  PATH/TO/TEMP/DIR
+       --skipperl       to skip getting and building perl
+
+END_USAGE
+    exit;
+}
+