Repository: lucy Updated Branches: refs/heads/win_fixes_for_0.4 30418016e -> 563ce53ca
Correct cfish library name on Windows Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/a509f697 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/a509f697 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/a509f697 Branch: refs/heads/win_fixes_for_0.4 Commit: a509f6970617c90d97f5acb160188f6327734eb0 Parents: 3041801 Author: Nick Wellnhofer <[email protected]> Authored: Mon Jul 21 14:04:09 2014 +0200 Committer: Nick Wellnhofer <[email protected]> Committed: Mon Jul 21 14:04:09 2014 +0200 ---------------------------------------------------------------------- common/charmonizer.c | 36 ++++++++++++++++++++++-------------- common/charmonizer.main | 36 ++++++++++++++++++++++-------------- 2 files changed, 44 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/a509f697/common/charmonizer.c ---------------------------------------------------------------------- diff --git a/common/charmonizer.c b/common/charmonizer.c index 441f752..683dfe0 100644 --- a/common/charmonizer.c +++ b/common/charmonizer.c @@ -7194,10 +7194,11 @@ S_write_makefile(struct chaz_CLIArgs *chaz_args, chaz_SharedLib *lib; - char *cfish_lib = NULL; - char *lib_filename; - char *test_command; - char *scratch; + const char *cfish_lib_name = NULL; + char *cfish_lib_dir = NULL; + char *lib_filename = NULL; + char *test_command = NULL; + char *scratch = NULL; printf("Creating Makefile...\n"); @@ -7311,18 +7312,25 @@ S_write_makefile(struct chaz_CLIArgs *chaz_args, free(scratch); if (cfish_prefix) { - cfish_lib = chaz_Util_join(dir_sep, cfish_prefix, "lib", NULL); + cfish_lib_dir = chaz_Util_join(dir_sep, cfish_prefix, "lib", NULL); + } + + if (strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0) { + cfish_lib_name = "cfish-0.3"; + } + else { + cfish_lib_name = "cfish"; } link_flags = chaz_CC_new_cflags(); chaz_CFlags_enable_debugging(link_flags); - if (cfish_lib) { - chaz_CFlags_add_library_path(link_flags, cfish_lib); + if (cfish_lib_dir) { + chaz_CFlags_add_library_path(link_flags, cfish_lib_dir); } if (math_lib) { chaz_CFlags_add_external_library(link_flags, math_lib); } - chaz_CFlags_add_external_library(link_flags, "cfish"); + chaz_CFlags_add_external_library(link_flags, cfish_lib_name); if (chaz_HeadCheck_check_header("pcre.h")) { chaz_CFlags_add_external_library(link_flags, "pcre"); } @@ -7337,10 +7345,10 @@ S_write_makefile(struct chaz_CLIArgs *chaz_args, chaz_CFlags_enable_optimization(test_cflags); chaz_CFlags_add_include_dir(test_cflags, autogen_inc_dir); chaz_CFlags_add_library(test_cflags, lib); - if (cfish_lib) { - chaz_CFlags_add_library_path(link_flags, cfish_lib); + if (cfish_lib_dir) { + chaz_CFlags_add_library_path(link_flags, cfish_lib_dir); } - chaz_CFlags_add_external_library(test_cflags, "cfish"); + chaz_CFlags_add_external_library(test_cflags, cfish_lib_name); scratch = chaz_Util_join(dir_sep, "t", "test_lucy.c", NULL); rule = chaz_MakeFile_add_compiled_exe(makefile, test_lucy_exe, scratch, test_cflags); @@ -7350,9 +7358,9 @@ S_write_makefile(struct chaz_CLIArgs *chaz_args, rule = chaz_MakeFile_add_rule(makefile, "test", test_lucy_exe); if (strcmp(chaz_OS_shared_lib_ext(), ".so") == 0) { - if (cfish_lib) { + if (cfish_lib_dir) { test_command - = chaz_Util_join("", "LD_LIBRARY_PATH=.:", cfish_lib, + = chaz_Util_join("", "LD_LIBRARY_PATH=.:", cfish_lib_dir, ":$$LD_LIBRARY_PATH ", test_lucy_exe, NULL); } else { @@ -7429,7 +7437,7 @@ S_write_makefile(struct chaz_CLIArgs *chaz_args, free(autogen_inc_dir); free(autogen_target); free(snowstem_inc_dir); - free(cfish_lib); + free(cfish_lib_dir); free(lib_filename); free(test_command); } http://git-wip-us.apache.org/repos/asf/lucy/blob/a509f697/common/charmonizer.main ---------------------------------------------------------------------- diff --git a/common/charmonizer.main b/common/charmonizer.main index fd3d0f3..23415a5 100644 --- a/common/charmonizer.main +++ b/common/charmonizer.main @@ -182,10 +182,11 @@ S_write_makefile(struct chaz_CLIArgs *chaz_args, chaz_SharedLib *lib; - char *cfish_lib = NULL; - char *lib_filename; - char *test_command; - char *scratch; + const char *cfish_lib_name = NULL; + char *cfish_lib_dir = NULL; + char *lib_filename = NULL; + char *test_command = NULL; + char *scratch = NULL; printf("Creating Makefile...\n"); @@ -299,18 +300,25 @@ S_write_makefile(struct chaz_CLIArgs *chaz_args, free(scratch); if (cfish_prefix) { - cfish_lib = chaz_Util_join(dir_sep, cfish_prefix, "lib", NULL); + cfish_lib_dir = chaz_Util_join(dir_sep, cfish_prefix, "lib", NULL); + } + + if (strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0) { + cfish_lib_name = "cfish-0.3"; + } + else { + cfish_lib_name = "cfish"; } link_flags = chaz_CC_new_cflags(); chaz_CFlags_enable_debugging(link_flags); - if (cfish_lib) { - chaz_CFlags_add_library_path(link_flags, cfish_lib); + if (cfish_lib_dir) { + chaz_CFlags_add_library_path(link_flags, cfish_lib_dir); } if (math_lib) { chaz_CFlags_add_external_library(link_flags, math_lib); } - chaz_CFlags_add_external_library(link_flags, "cfish"); + chaz_CFlags_add_external_library(link_flags, cfish_lib_name); if (chaz_HeadCheck_check_header("pcre.h")) { chaz_CFlags_add_external_library(link_flags, "pcre"); } @@ -325,10 +333,10 @@ S_write_makefile(struct chaz_CLIArgs *chaz_args, chaz_CFlags_enable_optimization(test_cflags); chaz_CFlags_add_include_dir(test_cflags, autogen_inc_dir); chaz_CFlags_add_library(test_cflags, lib); - if (cfish_lib) { - chaz_CFlags_add_library_path(link_flags, cfish_lib); + if (cfish_lib_dir) { + chaz_CFlags_add_library_path(link_flags, cfish_lib_dir); } - chaz_CFlags_add_external_library(test_cflags, "cfish"); + chaz_CFlags_add_external_library(test_cflags, cfish_lib_name); scratch = chaz_Util_join(dir_sep, "t", "test_lucy.c", NULL); rule = chaz_MakeFile_add_compiled_exe(makefile, test_lucy_exe, scratch, test_cflags); @@ -338,9 +346,9 @@ S_write_makefile(struct chaz_CLIArgs *chaz_args, rule = chaz_MakeFile_add_rule(makefile, "test", test_lucy_exe); if (strcmp(chaz_OS_shared_lib_ext(), ".so") == 0) { - if (cfish_lib) { + if (cfish_lib_dir) { test_command - = chaz_Util_join("", "LD_LIBRARY_PATH=.:", cfish_lib, + = chaz_Util_join("", "LD_LIBRARY_PATH=.:", cfish_lib_dir, ":$$LD_LIBRARY_PATH ", test_lucy_exe, NULL); } else { @@ -417,7 +425,7 @@ S_write_makefile(struct chaz_CLIArgs *chaz_args, free(autogen_inc_dir); free(autogen_target); free(snowstem_inc_dir); - free(cfish_lib); + free(cfish_lib_dir); free(lib_filename); free(test_command); }
