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/02/22 18:17:26 UTC
[1/2] lucy-clownfish git commit: Revert "Cloak POD for the CPAN dist
of Clownfish."
Repository: lucy-clownfish
Updated Branches:
refs/heads/master 2b6e27a24 -> e4c04e2e0
Revert "Cloak POD for the CPAN dist of Clownfish."
This reverts commit fc58f35714556471476fe0c474bc5b80dda06a96.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/46536926
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/46536926
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/46536926
Branch: refs/heads/master
Commit: 465369261883818cebf1fae97881c18669808c9e
Parents: 2b6e27a
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon Feb 22 17:38:40 2016 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Feb 22 17:38:40 2016 +0100
----------------------------------------------------------------------
runtime/perl/buildlib/Clownfish/Build.pm | 52 ---------------------------
runtime/perl/lib/Clownfish.pm | 28 ---------------
2 files changed, 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/46536926/runtime/perl/buildlib/Clownfish/Build.pm
----------------------------------------------------------------------
diff --git a/runtime/perl/buildlib/Clownfish/Build.pm b/runtime/perl/buildlib/Clownfish/Build.pm
index 3778a2c..412d3d6 100644
--- a/runtime/perl/buildlib/Clownfish/Build.pm
+++ b/runtime/perl/buildlib/Clownfish/Build.pm
@@ -42,7 +42,6 @@ $VERSION = eval $VERSION;
use File::Spec::Functions qw( catdir catfile updir rel2abs );
use File::Path qw( rmtree );
use File::Copy qw( move );
-use File::Find qw( find );
use Config;
use Carp;
use Cwd qw( getcwd );
@@ -317,10 +316,8 @@ sub ACTION_dist {
system("cp -R $from $to") and confess("cp failed");
}
move( "MANIFEST", "MANIFEST.bak" ) or die "move() failed: $!";
- my $saved = _hide_pod( $self, { 'lib/Clownfish.pm' => 1 } );
$self->depends_on("manifest");
$self->SUPER::ACTION_dist;
- _restore_pod( $self, $saved );
# Now that the tarball is packaged up, delete the copied assets.
rmtree($_) for values %to_copy;
@@ -329,54 +326,5 @@ sub ACTION_dist {
move( "MANIFEST.bak", "MANIFEST" ) or die "move() failed: $!";
}
-
-# Strip POD from files in the `lib` directory. This is a temporary measure to
-# allow us to release Clownfish as a separate dist but with a cloaked API.
-sub _hide_pod {
- my ( $self, $excluded ) = @_;
- my %saved;
- find(
- {
- no_chdir => 1,
- wanted => sub {
- my $path = $File::Find::name;
- return if $excluded->{$path};
- return unless $path =~ /\.(pm|pod)$/;
- open( my $fh, '<:encoding(UTF-8)', $path )
- or confess("Can't open '$path' for reading: $!");
- my $content = do { local $/; <$fh> };
- close $fh;
- if ( $path =~ /\.pod$/ ) {
- $saved{$path} = $content;
- print "Hiding POD for $path\n";
- unlink($path) or confess("Can't unlink '$path': $!");
- }
- else {
- my $copy = $content;
- $copy =~ s/^=\w+.*?^=cut\s*$//gsm;
- return if $copy eq $content;
- print "Hiding POD for $path\n";
- $saved{$path} = $content;
- open( $fh, '>:encoding(UTF-8)', $path )
- or confess("Can't open '$path' for writing: $!");
- print $fh $copy;
- }
- },
- },
- 'lib',
- );
- return \%saved;
-}
-
-# Undo POD hiding.
-sub _restore_pod {
- my ( $self, $saved ) = @_;
- while ( my ( $path, $content ) = each %$saved ) {
- open( my $fh, '>:encoding(UTF-8)', $path )
- or confess("Can't open '$path' for writing: $!");
- print $fh $saved->{$path};
- }
-}
-
1;
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/46536926/runtime/perl/lib/Clownfish.pm
----------------------------------------------------------------------
diff --git a/runtime/perl/lib/Clownfish.pm b/runtime/perl/lib/Clownfish.pm
index 1a6f7cd..bc45c17 100644
--- a/runtime/perl/lib/Clownfish.pm
+++ b/runtime/perl/lib/Clownfish.pm
@@ -181,31 +181,3 @@ sub error {$Clownfish::Err::error}
1;
-__END__
-
-=head1 NAME
-
-Clownfish - Apache Clownfish symbiotic object system.
-
-=head1 VERSION
-
-0.4.0
-
-=head1 DESCRIPTION
-
-The Apache Clownfish "symbiotic" object system for C is designed to pair with
-a "host" dynamic language environment, facilitating the development of high
-performance host language extensions. Clownfish classes are declared in
-header files with a C<.cfh> extension. The Clownfish headers are used by the
-Clownfish compiler to generate C header files and host language bindings.
-Methods, functions and variables are defined in normal C source files.
-
-The API for this alpha release of Clownfish has been cloaked.
-
-=head1 COPYRIGHT
-
-Clownfish is distributed under the Apache License, Version 2.0, as
-described in the file C<LICENSE> included with the distribution.
-
-=cut
-
[2/2] lucy-clownfish git commit: Mark buildlib dirs as private
Posted by nw...@apache.org.
Mark buildlib dirs as private
This hopefully stops search.cpan.org and metacpan.org from creating
broken documentation from here-docs in Bindings.pm.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/e4c04e2e
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/e4c04e2e
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/e4c04e2e
Branch: refs/heads/master
Commit: e4c04e2e0646d126ad3e5c1299d015ee28f95cd6
Parents: 4653692
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon Feb 22 17:48:03 2016 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Feb 22 17:48:03 2016 +0100
----------------------------------------------------------------------
compiler/perl/Build.PL | 3 +++
runtime/perl/Build.PL | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/e4c04e2e/compiler/perl/Build.PL
----------------------------------------------------------------------
diff --git a/compiler/perl/Build.PL b/compiler/perl/Build.PL
index c19200e..e509e16 100644
--- a/compiler/perl/Build.PL
+++ b/compiler/perl/Build.PL
@@ -41,6 +41,9 @@ my $builder = Clownfish::CFC::Build->new(
repository => 'https://git-wip-us.apache.org/repos/asf/lucy-clownfish.git',
bugtracker => 'https://issues.apache.org/jira/browse/CLOWNFISH',
},
+ no_index => {
+ directory => [qw( buildlib )],
+ },
},
add_to_cleanup => [
qw(
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/e4c04e2e/runtime/perl/Build.PL
----------------------------------------------------------------------
diff --git a/runtime/perl/Build.PL b/runtime/perl/Build.PL
index 245b8bf..8cec25d 100644
--- a/runtime/perl/Build.PL
+++ b/runtime/perl/Build.PL
@@ -45,6 +45,9 @@ my $builder = Clownfish::Build->new(
repository => 'https://git-wip-us.apache.org/repos/asf/lucy-clownfish.git',
bugtracker => 'https://issues.apache.org/jira/browse/CLOWNFISH',
},
+ no_index => {
+ directory => [qw( buildlib )],
+ },
},
add_to_cleanup => [
qw(