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/07/10 07:27:08 UTC
[1/2] git commit: refs/heads/prep_cpan_dist_for_0.4.0 - Remove
Clownfish::Obj safety code for Storable.
Repository: lucy
Updated Branches:
refs/heads/prep_cpan_dist_for_0.4.0 [created] 9c64ff4ab
Remove Clownfish::Obj safety code for Storable.
This has been moved into Clownfish directly. The CPAN toolchain didn't
like packaging a Clownfish::Obj package with Lucy anyway -- at least not
without a $VERSION, which would have been a bad idea.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/d7514593
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/d7514593
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/d7514593
Branch: refs/heads/prep_cpan_dist_for_0.4.0
Commit: d751459387974cbd53a836a6a9ff47dd30cd6c7b
Parents: f095229
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Wed Jul 9 22:20:14 2014 -0700
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Wed Jul 9 22:22:05 2014 -0700
----------------------------------------------------------------------
perl/lib/Lucy.pm | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/d7514593/perl/lib/Lucy.pm
----------------------------------------------------------------------
diff --git a/perl/lib/Lucy.pm b/perl/lib/Lucy.pm
index 805bbf7..ad9b46c 100644
--- a/perl/lib/Lucy.pm
+++ b/perl/lib/Lucy.pm
@@ -103,19 +103,6 @@ BEGIN {
}
{
- package Clownfish::Obj;
- use Carp qw( confess );
- sub STORABLE_freeze {
- my $class_name = shift->get_class_name;
- confess("Storable serialization not implemented for $class_name");
- }
- sub STORABLE_thaw {
- my $class_name = shift->get_class_name;
- confess("Storable serialization not implemented for $class_name");
- }
-}
-
-{
package Lucy::Index::DocVector;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
[2/2] git commit: refs/heads/prep_cpan_dist_for_0.4.0 - Repair `dist`
build action.
Posted by ma...@apache.org.
Repair `dist` build action.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/9c64ff4a
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/9c64ff4a
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/9c64ff4a
Branch: refs/heads/prep_cpan_dist_for_0.4.0
Commit: 9c64ff4ab2a048d03afc1be12d9f500fb12bf411
Parents: d751459
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Sun Jul 6 22:37:14 2014 -0700
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Wed Jul 9 22:26:31 2014 -0700
----------------------------------------------------------------------
perl/buildlib/Lucy/Build.pm | 51 +++++++++++++++++++++++-----------------
1 file changed, 30 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/9c64ff4a/perl/buildlib/Lucy/Build.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build.pm b/perl/buildlib/Lucy/Build.pm
index 7bdf648..9eae2ae 100644
--- a/perl/buildlib/Lucy/Build.pm
+++ b/perl/buildlib/Lucy/Build.pm
@@ -35,11 +35,18 @@ use Cwd qw( getcwd );
my @BASE_PATH = __PACKAGE__->cf_base_path;
my $COMMON_SOURCE_DIR = catdir( @BASE_PATH, 'common' );
-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 $LIB_DIR = 'lib';
+my $LEMON_EXE_PATH = catfile( $LEMON_DIR, "lemon$Config{_exe}" );
+my $CORE_SOURCE_DIR = catdir( @BASE_PATH, 'core' );
+my $LIB_DIR = 'lib';
+my $IS_CPAN_DIST = !@BASE_PATH;
+my $CHARMONIZER_C;
+if ($IS_CPAN_DIST) {
+ $CHARMONIZER_C = 'charmonizer.c';
+}
+else {
+ $CHARMONIZER_C = catfile( $COMMON_SOURCE_DIR, 'charmonizer.c' );
+}
sub new {
my $self = shift->SUPER::new( recursive_test_files => 1, @_ );
@@ -289,9 +296,9 @@ sub ACTION_dist {
my $self = shift;
_check_module_build_for_dist;
- # Create POD but make sure not to include build artifacts.
+ # Create POD.
$self->depends_on('pod');
- _clean_prereq_builds($self);
+ rmtree("autogen");
# We build our Perl release tarball from $REPOS_ROOT/perl, rather than
# from the top-level.
@@ -299,24 +306,25 @@ sub ACTION_dist {
# Because some items we need are outside this directory, we need to copy a
# bunch of stuff. After the tarball is packaged up, we delete the copied
# directories.
- my @items_to_copy = qw(
- core
- modules
- devel
- lemon
- CHANGES
- CONTRIBUTING
- LICENSE
- NOTICE
- README
+ my %to_copy = (
+ '../core' => 'core',
+ '../modules' => 'modules',
+ '../devel' => 'devel',
+ '../lemon' => 'lemon',
+ '../CHANGES' => 'CHANGES',
+ '../CONTRIBUTING' => 'CONTRIBUTING',
+ '../LICENSE' => 'LICENSE',
+ '../NOTICE' => 'NOTICE',
+ '../README' => 'README',
+ $CHARMONIZER_C => 'charmonizer.c',
);
print "Copying files...\n";
-
- for my $item (@items_to_copy) {
- confess("'$item' already exists") if -e $item;
- system("cp -R ../$item $item");
+ while (my ($from, $to) = each %to_copy) {
+ confess("'$to' already exists") if -e $to;
+ system("cp -R $from $to") and confess();
}
+ move( "MANIFEST", "MANIFEST.bak" ) or die "move() failed: $!";
$self->depends_on('manifest');
my $no_index = $self->_gen_pause_exclusion_list;
my $meta_add = $self->meta_add || {};
@@ -326,8 +334,9 @@ sub ACTION_dist {
# Clean up.
print "Removing copied files...\n";
- rmtree($_) for @items_to_copy;
+ rmtree($_) for values %to_copy;
unlink("META.yml");
+ unlink("META.json");
move( "MANIFEST.bak", "MANIFEST" ) or die "move() failed: $!";
}