You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2014/04/12 08:50:01 UTC
[lucy-commits] [26/27] git commit: refs/heads/master - Stop using bundled Clownfish.
Stop using bundled Clownfish.
Don't use bundled Clownfish compiler or runtime.
Eliminate commands to build bundled Clownfish compiler and runtime.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/ba087226
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/ba087226
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/ba087226
Branch: refs/heads/master
Commit: ba087226d6c053fd552b156911afc1ba97c4ef89
Parents: 746f4c0
Author: Tim Wilkens <ti...@gmail.com>
Authored: Fri Mar 21 15:57:06 2014 -0700
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Sat Apr 12 00:38:34 2014 -0600
----------------------------------------------------------------------
perl/buildlib/Lucy/Build.pm | 71 +---------------------------------------
1 file changed, 1 insertion(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/ba087226/perl/buildlib/Lucy/Build.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build.pm b/perl/buildlib/Lucy/Build.pm
index 8f45e82..0d611ef 100644
--- a/perl/buildlib/Lucy/Build.pm
+++ b/perl/buildlib/Lucy/Build.pm
@@ -16,25 +16,8 @@
use strict;
use warnings;
-use lib '../clownfish/compiler/perl/blib/arch';
-use lib '../clownfish/compiler/perl/blib/lib';
-use lib 'clownfish/compiler/perl/blib/arch';
-use lib 'clownfish/compiler/perl/blib/lib';
-use lib '../clownfish/runtime/perl/blib/arch';
-use lib '../clownfish/runtime/perl/blib/lib';
-use lib 'clownfish/runtime/perl/blib/arch';
-use lib 'clownfish/runtime/perl/blib/lib';
-
package Lucy::Build;
-
-# We want to subclass Clownfish::CFC::Perl::Build, but CFC might not be built
-# yet. So we look in 'clownfish/compiler/perl/lib' directly and cleanup @INC
-# afterwards.
-use lib '../clownfish/compiler/perl/lib';
-use lib 'clownfish/compiler/perl/lib';
use base qw( Clownfish::CFC::Perl::Build );
-no lib '../clownfish/compiler/perl/lib';
-no lib 'clownfish/compiler/perl/lib';
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
@@ -53,10 +36,6 @@ my $CHARMONIZER_C = catfile( $COMMON_SOURCE_DIR, 'charmonizer.c' );
my $LEMON_DIR = catdir( @BASE_PATH, 'lemon' );
my $LEMON_EXE_PATH = catfile( $LEMON_DIR, "lemon$Config{_exe}" );
my $CORE_SOURCE_DIR = catdir( @BASE_PATH, 'core' );
-my $CFC_DIR = catdir( @BASE_PATH, 'clownfish', 'compiler', 'perl' );
-my $CFC_BUILD = catfile( $CFC_DIR, 'Build' );
-my $CFR_DIR = catdir( @BASE_PATH, 'clownfish', 'runtime', 'perl' );
-my $CFR_BUILD = catfile( $CFR_DIR, 'Build' );
my $LIB_DIR = 'lib';
sub new {
@@ -103,32 +82,6 @@ sub ACTION_lemon {
);
}
-sub ACTION_cfc {
- my $self = shift;
- my $old_dir = getcwd();
- chdir($CFC_DIR);
- if ( !-f 'Build' ) {
- print "\nBuilding Clownfish compiler... \n";
- system("$^X Build.PL");
- system("$^X Build code");
- print "\nFinished building Clownfish compiler.\n\n";
- }
- chdir($old_dir);
-}
-
-sub ACTION_cfr {
- my $self = shift;
- my $old_dir = getcwd();
- chdir($CFR_DIR);
- if ( !-f 'Build' ) {
- print "\nBuilding Clownfish runtime... \n";
- system("$^X Build.PL");
- system("$^X Build code");
- print "\nFinished building Clownfish runtime.\n\n";
- }
- chdir($old_dir);
-}
-
sub ACTION_copy_clownfish_includes {
my $self = shift;
@@ -145,8 +98,6 @@ sub ACTION_clownfish {
my $self = shift;
$self->dispatch('charmony');
- $self->dispatch('cfc');
- $self->dispatch('cfr');
$self->SUPER::ACTION_clownfish;
}
@@ -448,29 +399,9 @@ sub ACTION_semiclean {
}
}
-# Run the cleanup targets for independent prerequisite builds.
-sub _clean_prereq_builds {
- my $self = shift;
- if ( -e $CFC_BUILD ) {
- my $old_dir = getcwd();
- chdir $CFC_DIR;
- system("$^X Build realclean")
- and die "Clownfish compiler clean failed";
- chdir $old_dir;
- }
- if ( -e $CFR_BUILD ) {
- my $old_dir = getcwd();
- chdir $CFR_DIR;
- system("$^X Build realclean")
- and die "Clownfish runtime clean failed";
- chdir $old_dir;
- }
- $self->_run_make( dir => $LEMON_DIR, args => ['clean'] );
-}
-
sub ACTION_clean {
my $self = shift;
- _clean_prereq_builds($self);
+ $self->_run_make( dir => $LEMON_DIR, args => ['clean'] );
$self->SUPER::ACTION_clean;
}