You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2016/07/11 11:25:37 UTC
[04/14] lucy-clownfish git commit: Rename core directory to "cfcore"
for CPAN tarball
Rename core directory to "cfcore" for CPAN tarball
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/5bda4dad
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/5bda4dad
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/5bda4dad
Branch: refs/heads/master
Commit: 5bda4dadd15edf1cd9c0b1d171b99dcf935a6c68
Parents: 56f1982
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Fri Jul 8 13:57:06 2016 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Fri Jul 8 14:25:36 2016 +0200
----------------------------------------------------------------------
compiler/perl/lib/Clownfish/CFC/Perl/Build.pm | 2 +-
runtime/perl/buildlib/Clownfish/Build.pm | 12 +++++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/5bda4dad/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
----------------------------------------------------------------------
diff --git a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
index 804ba87..6d0f584 100644
--- a/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
+++ b/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
@@ -48,7 +48,7 @@ else {
# development, the files are accessed from their original locations.
my @BASE_PATH;
-push(@BASE_PATH, updir()) unless -e 'core';
+push(@BASE_PATH, updir()) unless -d 'core' || -d 'cfcore';
my $AUTOGEN_DIR = 'autogen';
my $LIB_DIR = 'lib';
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/5bda4dad/runtime/perl/buildlib/Clownfish/Build.pm
----------------------------------------------------------------------
diff --git a/runtime/perl/buildlib/Clownfish/Build.pm b/runtime/perl/buildlib/Clownfish/Build.pm
index 3d1b8c3..9506662 100644
--- a/runtime/perl/buildlib/Clownfish/Build.pm
+++ b/runtime/perl/buildlib/Clownfish/Build.pm
@@ -21,7 +21,7 @@ package Clownfish::Build;
my $IS_CPAN_DIST;
BEGIN {
- $IS_CPAN_DIST = -e 'core';
+ $IS_CPAN_DIST = -e 'cfcore';
if (!$IS_CPAN_DIST) {
unshift @INC,
@@ -49,17 +49,19 @@ use Cwd qw( getcwd );
my @BASE_PATH = __PACKAGE__->cf_base_path;
my $COMMON_SOURCE_DIR = catdir( @BASE_PATH, 'common' );
-my $CORE_SOURCE_DIR = catdir( @BASE_PATH, 'core' );
my $CFC_DIR = catdir( @BASE_PATH, updir(), 'compiler', 'perl' );
my $XS_SOURCE_DIR = 'xs';
my $CFC_BUILD = catfile( $CFC_DIR, 'Build' );
my $LIB_DIR = 'lib';
+my $CORE_SOURCE_DIR;
my $CHARMONIZER_C;
if ($IS_CPAN_DIST) {
- $CHARMONIZER_C = 'charmonizer.c';
+ $CORE_SOURCE_DIR = 'cfcore';
+ $CHARMONIZER_C = 'charmonizer.c';
}
else {
- $CHARMONIZER_C = catfile( $COMMON_SOURCE_DIR, 'charmonizer.c' );
+ $CORE_SOURCE_DIR = catdir( @BASE_PATH, 'core' );
+ $CHARMONIZER_C = catfile( $COMMON_SOURCE_DIR, 'charmonizer.c' );
}
sub new {
@@ -314,7 +316,7 @@ sub ACTION_dist {
'../../LICENSE' => 'LICENSE',
'../../NOTICE' => 'NOTICE',
'../../README.md' => 'README.md',
- $CORE_SOURCE_DIR => 'core',
+ $CORE_SOURCE_DIR => 'cfcore',
$CHARMONIZER_C => 'charmonizer.c',
);
print "Copying files...\n";