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/11/17 18:33:34 UTC
[2/8] lucy git commit: Regen charmonizer in prep for Go bindings.
Regen charmonizer in prep for Go bindings.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/b4ce4965
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/b4ce4965
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/b4ce4965
Branch: refs/heads/go_bindings_1
Commit: b4ce4965bb19ad3649aee062c52314d25a444de8
Parents: 1b06574
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Sun Nov 16 16:37:32 2014 -0800
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Sun Nov 16 16:37:32 2014 -0800
----------------------------------------------------------------------
common/charmonizer.c | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/b4ce4965/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 465938b..12dade5 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -7792,6 +7792,8 @@ int main(int argc, const char **argv) {
chaz_CLI_register(cli, "clownfish-prefix",
"prefix of Clownfish installation",
CHAZ_CLI_ARG_OPTIONAL);
+ chaz_CLI_register(cli, "enable-go", "enable Go bindings",
+ CHAZ_CLI_NO_ARG);
chaz_CLI_set_usage(cli, "Usage: charmonizer [OPTIONS] [-- [CFLAGS]]");
if (!chaz_Probe_parse_cli_args(argc, argv, cli)) {
chaz_Probe_die_usage();
@@ -7920,6 +7922,9 @@ lucy_MakeFile_new(chaz_CLI *cli) {
if (chaz_CLI_defined(cli, "enable-perl")) {
self->host_src_dir = "xs";
}
+ else if (chaz_CLI_defined(cli, "enable-go")) {
+ self->host_src_dir = "../c/src";
+ }
else {
self->host_src_dir = "src";
}
@@ -8104,6 +8109,8 @@ lucy_MakeFile_write(lucy_MakeFile *self) {
chaz_MakeFile_add_rule(self->makefile, "all", scratch);
free(scratch);
+ chaz_MakeFile_add_rule(self->makefile, "static", self->static_lib_filename);
+
chaz_MakeFile_add_lemon_exe(self->makefile, self->lemon_dir);
chaz_MakeFile_add_lemon_grammar(self->makefile, self->json_parser);