Build Perl bindings with CommonMark
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/b671360a Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/b671360a Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/b671360a Branch: refs/heads/markdown_v2 Commit: b671360a3c6f22325c538de79ca7a61c497221bc Parents: 8f14a75 Author: Nick Wellnhofer <[email protected]> Authored: Mon Nov 10 17:35:04 2014 +0100 Committer: Nick Wellnhofer <[email protected]> Committed: Tue Dec 2 18:31:15 2014 +0100 ---------------------------------------------------------------------- compiler/perl/buildlib/Clownfish/CFC/Build.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b671360a/compiler/perl/buildlib/Clownfish/CFC/Build.pm ---------------------------------------------------------------------- diff --git a/compiler/perl/buildlib/Clownfish/CFC/Build.pm b/compiler/perl/buildlib/Clownfish/CFC/Build.pm index 342d8a3..45e49b5 100644 --- a/compiler/perl/buildlib/Clownfish/CFC/Build.pm +++ b/compiler/perl/buildlib/Clownfish/CFC/Build.pm @@ -42,29 +42,34 @@ my $CHARMONIZER_C; my $LEMON_DIR; my $INCLUDE; my $CFC_SOURCE_DIR; +my $MODULES_DIR; my $IS_CPAN = -e 'LICENSE'; if ($IS_CPAN) { $CHARMONIZER_C = 'charmonizer.c'; $INCLUDE = 'include'; $LEMON_DIR = 'lemon'; $CFC_SOURCE_DIR = 'src'; + $MODULES_DIR = 'modules'; } else { $CHARMONIZER_C = catfile( updir(), 'common', 'charmonizer.c' ); $INCLUDE = catdir( updir(), 'include' ); $LEMON_DIR = catdir( updir(), updir(), 'lemon' ); $CFC_SOURCE_DIR = catdir( updir(), 'src' ); + $MODULES_DIR = catdir( updir(), 'modules' ); } -my $LEMON_EXE_PATH = catfile( $LEMON_DIR, "lemon$Config{_exe}" ); -my $PPPORT_H_PATH = catfile( $INCLUDE, 'ppport.h' ); +my $CMARK_SOURCE_DIR = catdir( $MODULES_DIR, 'CommonMark', 'src' ); +my $LEMON_EXE_PATH = catfile( $LEMON_DIR, "lemon$Config{_exe}" ); +my $PPPORT_H_PATH = catfile( $INCLUDE, 'ppport.h' ); sub new { my ( $class, %args ) = @_; - $args{c_source} = $CFC_SOURCE_DIR; + $args{c_source} = [ $CFC_SOURCE_DIR, $CMARK_SOURCE_DIR ]; $args{include_dirs} ||= []; my @aux_include = ( $INCLUDE, $CFC_SOURCE_DIR, + $CMARK_SOURCE_DIR, curdir(), # for charmony.h ); push @{ $args{include_dirs} }, @aux_include;
