[lucy-commits] svn commit: r1390751 - in /lucy/trunk/clownfish/runtime/perl: Build.PL buildlib/Clownfish/Build.pm

[ma...@apache.org]

Author: marvin
Date: Wed Sep 26 22:10:05 2012
New Revision: 1390751

URL: http://svn.apache.org/viewvc?rev=1390751&view=rev
Log:
Get charmonize and CFC to build.

Modified:
    lucy/trunk/clownfish/runtime/perl/Build.PL
    lucy/trunk/clownfish/runtime/perl/buildlib/Clownfish/Build.pm

Modified: lucy/trunk/clownfish/runtime/perl/Build.PL
URL: http://svn.apache.org/viewvc/lucy/trunk/clownfish/runtime/perl/Build.PL?rev=1390751&r1=1390750&r2=1390751&view=diff
==============================================================================
--- lucy/trunk/clownfish/runtime/perl/Build.PL (original)
+++ lucy/trunk/clownfish/runtime/perl/Build.PL Wed Sep 26 22:10:05 2012
@@ -18,9 +18,9 @@ use strict;
 use warnings;
 use lib 'buildlib';
 use File::Spec::Functions qw( catdir );
-use Lucy::Build;
+use Clownfish::Build;
 
-my @BASE_PATH        = Lucy::Build->cf_base_path;
+my @BASE_PATH        = Clownfish::Build->cf_base_path;
 my $MODULES_DIR      = catdir( @BASE_PATH, 'modules' );
 my $SNOWSTEM_SRC_DIR = catdir( $MODULES_DIR, qw( analysis snowstem source ) );
 my $SNOWSTEM_INC_DIR = catdir( $SNOWSTEM_SRC_DIR, 'include' );
@@ -30,8 +30,8 @@ my $UTF8PROC_SRC_DIR = catdir( $MODULES_
 my $CORE_SOURCE_DIR  = catdir( @BASE_PATH, 'core' );
 my $XS_SOURCE_DIR    = 'xs';
 
-my $builder = Lucy::Build->new(
-    module_name => 'Lucy',
+my $builder = Clownfish::Build->new(
+    module_name => 'Clownfish',
     license     => 'apache',
     dist_author =>
         'The Apache Lucy Project <dev at lucy dot apache dot org>',
@@ -44,7 +44,7 @@ my $builder = Lucy::Build->new(
         'ExtUtils::ParseXS'  => 2.18,
         'Devel::PPPort'      => 3.13,
     },
-    meta_merge => { keywords => [qw( search lucy lucene )], },
+    meta_merge => { keywords => [qw( clownfish )], },
     meta_add   => {
         resources => {
             homepage   => 'http://lucy.apache.org',
@@ -70,7 +70,7 @@ my $builder = Lucy::Build->new(
     },
     add_to_cleanup => [
         qw(
-            Lucy-*
+            Clownfish-*
             MANIFEST.bak
             perltidy.ERR
             *.pdb

Modified: lucy/trunk/clownfish/runtime/perl/buildlib/Clownfish/Build.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/clownfish/runtime/perl/buildlib/Clownfish/Build.pm?rev=1390751&r1=1390750&r2=1390751&view=diff
==============================================================================
--- lucy/trunk/clownfish/runtime/perl/buildlib/Clownfish/Build.pm (original)
+++ lucy/trunk/clownfish/runtime/perl/buildlib/Clownfish/Build.pm Wed Sep 26 22:10:05 2012
@@ -16,21 +16,17 @@
 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 '../../compiler/perl/blib/arch';
+use lib '../../compiler/perl/blib/lib';
 
-package Lucy::Build;
+package Clownfish::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 lib '../../compiler/perl/lib';
 use base qw( Clownfish::CFC::Perl::Build );
-no lib '../clownfish/compiler/perl/lib';
-no lib 'clownfish/compiler/perl/lib';
+no lib '../../compiler/perl/lib';
 
 our $VERSION = '0.003000';
 $VERSION = eval $VERSION;
@@ -47,15 +43,16 @@ BEGIN { unshift @PATH, rel2abs( getcwd()
 
 my @BASE_PATH = __PACKAGE__->cf_base_path;
 
-my $CHARMONIZER_ORIG_DIR = catdir( @BASE_PATH, 'charmonizer' );
+my $CHARMONIZER_ORIG_DIR
+    = rel2abs( catdir( @BASE_PATH, updir(), updir(), 'charmonizer' ) );
 my $CHARMONIZE_EXE_PATH  = "charmonize$Config{_exe}";
 my $CHARMONY_H_PATH      = 'charmony.h';
 my $CHARMONY_PM_PATH     = 'Charmony.pm';
-my $LEMON_DIR      = catdir( @BASE_PATH, 'lemon' );
+my $LEMON_DIR      = catdir( @BASE_PATH, updir(), updir(), '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', 'compiler', 'perl' );
-my $CLOWNFISH_BUILD  = catfile( $CLOWNFISH_DIR, 'Build' );
+my $CFC_DIR = catdir( @BASE_PATH, updir(), 'compiler', 'perl' );
+my $CFC_BUILD  = catfile( $CFC_DIR, 'Build' );
 my $LIB_DIR          = 'lib';
 
 sub new {
@@ -196,7 +193,7 @@ sub ACTION_lemon {
 sub ACTION_cfc {
     my $self    = shift;
     my $old_dir = getcwd();
-    chdir($CLOWNFISH_DIR);
+    chdir($CFC_DIR);
     if ( !-f 'Build' ) {
         print "\nBuilding Clownfish compiler... \n";
         system("$^X Build.PL");
@@ -528,9 +525,9 @@ sub ACTION_semiclean {
 # Run the cleanup targets for independent prerequisite builds.
 sub _clean_prereq_builds {
     my $self = shift;
-    if ( -e $CLOWNFISH_BUILD ) {
+    if ( -e $CFC_BUILD ) {
         my $old_dir = getcwd();
-        chdir $CLOWNFISH_DIR;
+        chdir $CFC_DIR;
         system("$^X Build realclean")
             and die "Clownfish clean failed";
         chdir $old_dir;