Author: marvin
Date: Tue Sep 25 23:49:46 2012
New Revision: 1390225
URL: http://svn.apache.org/viewvc?rev=1390225&view=rev
Log:
Adapt build to use new location of CFC.
Modified:
lucy/trunk/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
lucy/trunk/perl/buildlib/Lucy/Build.pm
Modified: lucy/trunk/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
URL:
http://svn.apache.org/viewvc/lucy/trunk/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm?rev=1390225&r1=1390224&r2=1390225&view=diff
==============================================================================
--- lucy/trunk/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
(original)
+++ lucy/trunk/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm Tue Sep
25 23:49:46 2012
@@ -22,8 +22,9 @@ use base qw( Module::Build );
use File::Spec::Functions qw( catfile updir catdir );
use Config;
use Cwd qw( getcwd );
+use Carp;
-my $base_dir = catdir( updir(), updir() );
+my $base_dir = catdir( updir(), updir(), updir() );
my $PPPORT_H_PATH = catfile( updir(), qw( include ppport.h ) );
my $LEMON_DIR = catdir( $base_dir, 'lemon' );
my $LEMON_EXE_PATH = catfile( $LEMON_DIR, "lemon$Config{_exe}" );
Modified: lucy/trunk/perl/buildlib/Lucy/Build.pm
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/buildlib/Lucy/Build.pm?rev=1390225&r1=1390224&r2=1390225&view=diff
==============================================================================
--- lucy/trunk/perl/buildlib/Lucy/Build.pm (original)
+++ lucy/trunk/perl/buildlib/Lucy/Build.pm Tue Sep 25 23:49:46 2012
@@ -16,21 +16,21 @@
use strict;
use warnings;
-use lib '../clownfish/perl/blib/arch';
-use lib '../clownfish/perl/blib/lib';
-use lib 'clownfish/perl/blib/arch';
-use lib 'clownfish/perl/blib/lib';
+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';
package Lucy::Build;
-# We want to subclass Clownfish::CFC::Perl::Build, but Clownfish might not be
-# built yet. So we look in 'clownfish/perl/lib' directly and cleanup @INC
+# 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/perl/lib';
-use lib 'clownfish/perl/lib';
+use lib '../clownfish/compiler/perl/lib';
+use lib 'clownfish/compiler/perl/lib';
use base qw( Clownfish::CFC::Perl::Build );
-no lib '../clownfish/perl/lib';
-no lib 'clownfish/perl/lib';
+no lib '../clownfish/compiler/perl/lib';
+no lib 'clownfish/compiler/perl/lib';
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
@@ -54,7 +54,7 @@ my $CHARMONY_PM_PATH = 'Charmony.pm'
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 $CLOWNFISH_DIR = catdir( @BASE_PATH, 'clownfish', 'perl' );
+my $CLOWNFISH_DIR = catdir( @BASE_PATH, 'clownfish', 'compiler', 'perl' );
my $CLOWNFISH_BUILD = catfile( $CLOWNFISH_DIR, 'Build' );
my $LIB_DIR = 'lib';
