lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [1/2] git commit: refs/heads/master - More adjustments for Clownfish removal
Date Tue, 15 Apr 2014 19:13:09 GMT
Repository: lucy
Updated Branches:
  refs/heads/master 6fab33e7e -> 7329c7ee8


More adjustments for Clownfish removal


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/4087b617
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/4087b617
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/4087b617

Branch: refs/heads/master
Commit: 4087b61762abad37f5c78fbf7bef0dd97771c778
Parents: 6fab33e
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Tue Apr 15 20:52:46 2014 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Tue Apr 15 20:52:46 2014 +0200

----------------------------------------------------------------------
 perl/Build.PL               | 6 ------
 perl/buildlib/Lucy/Build.pm | 3 ---
 2 files changed, 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/4087b617/perl/Build.PL
----------------------------------------------------------------------
diff --git a/perl/Build.PL b/perl/Build.PL
index 2ff802e..756af6f 100644
--- a/perl/Build.PL
+++ b/perl/Build.PL
@@ -31,10 +31,6 @@ my $UTF8PROC_SRC_DIR = catdir( $MODULES_DIR, qw( unicode utf8proc ) );
 my $CORE_SOURCE_DIR  = catdir( @BASE_PATH, 'core' );
 my $XS_SOURCE_DIR    = 'xs';
 
-my $CFR_DIR             = catdir( @BASE_PATH, qw( clownfish runtime ) );
-my $CFR_CORE_SOURCE_DIR = catdir( $CFR_DIR, 'core' );
-my $CFR_XS_SOURCE_DIR   = catdir( $CFR_DIR, qw( perl xs ) );
-
 my $builder = Lucy::Build->new(
     module_name => 'Lucy',
     license     => 'apache',
@@ -69,7 +65,6 @@ my $builder = Lucy::Build->new(
         $SNOWSTEM_INC_DIR,
         $UCD_INC_DIR,
         $UTF8PROC_SRC_DIR,
-        $CFR_XS_SOURCE_DIR,
         @CF_SYS_INCLUDES,
     ],
     clownfish_params => {
@@ -82,7 +77,6 @@ my $builder = Lucy::Build->new(
         ],
         include => [
             @CF_SYS_INCLUDES,
-            $CFR_CORE_SOURCE_DIR,
         ],
     },
     extra_compiler_flags => '-DCFP_LUCY -DCFP_TESTLUCY',

http://git-wip-us.apache.org/repos/asf/lucy/blob/4087b617/perl/buildlib/Lucy/Build.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build.pm b/perl/buildlib/Lucy/Build.pm
index 0d611ef..cf82aa1 100644
--- a/perl/buildlib/Lucy/Build.pm
+++ b/perl/buildlib/Lucy/Build.pm
@@ -89,8 +89,6 @@ sub ACTION_copy_clownfish_includes {
 
     $self->SUPER::ACTION_copy_clownfish_includes;
 
-    $self->cf_copy_include_file( 'charmony.h' );
-    $self->cf_copy_include_file( 'XSBind.h' );
     $self->cf_copy_include_file( qw( Lucy Util ToolSet.h ) );
 }
 
@@ -300,7 +298,6 @@ sub ACTION_dist {
         core
         modules
         devel
-        clownfish
         lemon
         CHANGES
         CONTRIBUTING


Mime
View raw message