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 2013/05/20 20:48:58 UTC
[lucy-commits] [1/3] git commit: refs/heads/install-c-library - Use -DCFP_LUCY when
compiling Perl bindings
Updated Branches:
refs/heads/install-c-library 7b85c8a34 -> d5c3256bf
Use -DCFP_LUCY when compiling Perl bindings
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/cdc54a77
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/cdc54a77
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/cdc54a77
Branch: refs/heads/install-c-library
Commit: cdc54a77d3d38519a66de82ab23d2fa3a6a6712a
Parents: 7b85c8a
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 20 20:21:08 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon May 20 20:21:08 2013 +0200
----------------------------------------------------------------------
perl/Build.PL | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/cdc54a77/perl/Build.PL
----------------------------------------------------------------------
diff --git a/perl/Build.PL b/perl/Build.PL
index d13ecf7..db8a3d9 100644
--- a/perl/Build.PL
+++ b/perl/Build.PL
@@ -68,6 +68,7 @@ my $builder = Lucy::Build->new(
$UTF8PROC_SRC_DIR,
],
},
+ extra_compiler_flags => '-DCFP_LUCY',
add_to_cleanup => [
qw(
Lucy-*
[lucy-commits] [3/3] git commit: refs/heads/install-c-library - Fix quoting of MSVC
compiler options for real
Posted by nw...@apache.org.
Fix quoting of MSVC compiler options for real
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/d5c3256b
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/d5c3256b
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/d5c3256b
Branch: refs/heads/install-c-library
Commit: d5c3256bf2281fb8b7e3cf2f4c1fa6000294424e
Parents: 6b7dc71
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 20 20:48:28 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon May 20 20:48:28 2013 +0200
----------------------------------------------------------------------
.../compiler/perl/buildlib/Clownfish/CFC/Build.pm | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/d5c3256b/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
----------------------------------------------------------------------
diff --git a/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm b/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
index ff8dc36..4ba1a6b 100644
--- a/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
+++ b/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
@@ -137,10 +137,11 @@ sub ACTION_code {
$self->dispatch('ppport');
$self->dispatch('parsers');
- $self->extra_compiler_flags(
- '-DCFCPERL',
- $self->split_like_shell($self->charmony("EXTRA_CFLAGS")),
- );
+ my @flags = $self->split_like_shell($self->charmony("EXTRA_CFLAGS"));
+ # The flag for the MSVC6 hack contains spaces. Make sure it stays quoted.
+ @flags = map { /\s/ ? qq{"$_"} : $_ } @flags;
+
+ $self->extra_compiler_flags( '-DCFCPERL', @flags );
$self->SUPER::ACTION_code;
}
[lucy-commits] [2/3] git commit: refs/heads/install-c-library - Revert "Fix quoting
of MSVC compiler options"
Posted by nw...@apache.org.
Revert "Fix quoting of MSVC compiler options"
This reverts commit 85c1ee7fc69d3c31ee5c1b102001a766f4d1695c.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/6b7dc71d
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/6b7dc71d
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/6b7dc71d
Branch: refs/heads/install-c-library
Commit: 6b7dc71d0f316106b8c166781a9f23c8e729c252
Parents: cdc54a7
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon May 20 20:27:21 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon May 20 20:27:21 2013 +0200
----------------------------------------------------------------------
.../compiler/perl/buildlib/Clownfish/CFC/Build.pm | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/6b7dc71d/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
----------------------------------------------------------------------
diff --git a/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm b/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
index 0b65af9..ff8dc36 100644
--- a/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
+++ b/clownfish/compiler/perl/buildlib/Clownfish/CFC/Build.pm
@@ -138,7 +138,8 @@ sub ACTION_code {
$self->dispatch('parsers');
$self->extra_compiler_flags(
- join( ' ', '-DCFCPERL', $self->charmony("EXTRA_CFLAGS") ),
+ '-DCFCPERL',
+ $self->split_like_shell($self->charmony("EXTRA_CFLAGS")),
);
$self->SUPER::ACTION_code;