Search and replace "SharedLib" with "Lib".
Project: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/commit/c5a33b63 Tree: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/tree/c5a33b63 Diff: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/diff/c5a33b63 Branch: refs/heads/master Commit: c5a33b632c01ade2d7d001403790bed74f2fa154 Parents: 56b5edd Author: Marvin Humphrey <[email protected]> Authored: Thu Sep 18 17:31:13 2014 -0700 Committer: Marvin Humphrey <[email protected]> Committed: Thu Sep 18 17:31:13 2014 -0700 ---------------------------------------------------------------------- src/Charmonizer/Core/CFlags.c | 15 +++++++-------- src/Charmonizer/Core/CFlags.h | 5 ++--- src/Charmonizer/Core/Library.c | 30 +++++++++++++++--------------- src/Charmonizer/Core/Library.h | 30 +++++++++++++++--------------- src/Charmonizer/Core/Make.c | 14 +++++++------- src/Charmonizer/Core/Make.h | 2 +- 6 files changed, 47 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/c5a33b63/src/Charmonizer/Core/CFlags.c ---------------------------------------------------------------------- diff --git a/src/Charmonizer/Core/CFlags.c b/src/Charmonizer/Core/CFlags.c index 4426166..99c6668 100644 --- a/src/Charmonizer/Core/CFlags.c +++ b/src/Charmonizer/Core/CFlags.c @@ -272,20 +272,19 @@ chaz_CFlags_link_shared_library(chaz_CFlags *flags) { } void -chaz_CFlags_set_shared_library_version(chaz_CFlags *flags, - chaz_SharedLib *lib) { +chaz_CFlags_set_shared_library_version(chaz_CFlags *flags, chaz_Lib *lib) { if (flags->style == CHAZ_CFLAGS_STYLE_GNU) { const char *shlib_ext = chaz_OS_shared_lib_ext(); if (strcmp(shlib_ext, ".dylib") == 0) { - const char *version = chaz_SharedLib_get_version(lib); + const char *version = chaz_Lib_get_version(lib); char *string = chaz_Util_join(" ", "-current_version", version, NULL); chaz_CFlags_append(flags, string); free(string); } else if (strcmp(shlib_ext, ".so") == 0) { - char *soname = chaz_SharedLib_major_version_filename(lib); + char *soname = chaz_Lib_major_version_filename(lib); char *string = chaz_Util_join("", "-Wl,-soname,", soname, NULL); chaz_CFlags_append(flags, string); free(string); @@ -293,7 +292,7 @@ chaz_CFlags_set_shared_library_version(chaz_CFlags *flags, } } else if (flags->style == CHAZ_CFLAGS_STYLE_SUN_C) { - char *soname = chaz_SharedLib_major_version_filename(lib); + char *soname = chaz_Lib_major_version_filename(lib); char *string = chaz_Util_join(" ", "-h", soname, NULL); chaz_CFlags_append(flags, string); free(string); @@ -338,13 +337,13 @@ chaz_CFlags_add_library_path(chaz_CFlags *flags, const char *directory) { } void -chaz_CFlags_add_library(chaz_CFlags *flags, chaz_SharedLib *lib) { +chaz_CFlags_add_library(chaz_CFlags *flags, chaz_Lib *lib) { char *filename; if (flags->style == CHAZ_CFLAGS_STYLE_MSVC) { - filename = chaz_SharedLib_implib_filename(lib); + filename = chaz_Lib_implib_filename(lib); } else { - filename = chaz_SharedLib_filename(lib); + filename = chaz_Lib_filename(lib); } chaz_CFlags_append(flags, filename); free(filename); http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/c5a33b63/src/Charmonizer/Core/CFlags.h ---------------------------------------------------------------------- diff --git a/src/Charmonizer/Core/CFlags.h b/src/Charmonizer/Core/CFlags.h index 5093910..901eb45 100644 --- a/src/Charmonizer/Core/CFlags.h +++ b/src/Charmonizer/Core/CFlags.h @@ -80,8 +80,7 @@ void chaz_CFlags_link_shared_library(chaz_CFlags *flags); void -chaz_CFlags_set_shared_library_version(chaz_CFlags *flags, - chaz_SharedLib *lib); +chaz_CFlags_set_shared_library_version(chaz_CFlags *flags, chaz_Lib *lib); void chaz_CFlags_set_link_output(chaz_CFlags *flags, const char *filename); @@ -90,7 +89,7 @@ void chaz_CFlags_add_library_path(chaz_CFlags *flags, const char *directory); void -chaz_CFlags_add_library(chaz_CFlags *flags, chaz_SharedLib *lib); +chaz_CFlags_add_library(chaz_CFlags *flags, chaz_Lib *lib); void chaz_CFlags_add_external_library(chaz_CFlags *flags, const char *library); http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/c5a33b63/src/Charmonizer/Core/Library.c ---------------------------------------------------------------------- diff --git a/src/Charmonizer/Core/Library.c b/src/Charmonizer/Core/Library.c index ef14787..243f0b2 100644 --- a/src/Charmonizer/Core/Library.c +++ b/src/Charmonizer/Core/Library.c @@ -21,22 +21,22 @@ #include "Charmonizer/Core/Util.h" #include "Charmonizer/Core/OperatingSystem.h" -struct chaz_SharedLib { +struct chaz_Lib { char *name; char *version; char *major_version; }; static char* -S_build_filename(chaz_SharedLib *lib, const char *version, const char *ext); +S_build_filename(chaz_Lib *lib, const char *version, const char *ext); static const char* S_get_prefix(void); -chaz_SharedLib* -chaz_SharedLib_new(const char *name, const char *version, +chaz_Lib* +chaz_Lib_new(const char *name, const char *version, const char *major_version) { - chaz_SharedLib *lib = (chaz_SharedLib*)malloc(sizeof(chaz_SharedLib)); + chaz_Lib *lib = (chaz_Lib*)malloc(sizeof(chaz_Lib)); lib->name = chaz_Util_strdup(name); lib->version = chaz_Util_strdup(version); lib->major_version = chaz_Util_strdup(major_version); @@ -44,7 +44,7 @@ chaz_SharedLib_new(const char *name, const char *version, } void -chaz_SharedLib_destroy(chaz_SharedLib *lib) { +chaz_Lib_destroy(chaz_Lib *lib) { free(lib->name); free(lib->version); free(lib->major_version); @@ -52,22 +52,22 @@ chaz_SharedLib_destroy(chaz_SharedLib *lib) { } const char* -chaz_SharedLib_get_name(chaz_SharedLib *lib) { +chaz_Lib_get_name(chaz_Lib *lib) { return lib->name; } const char* -chaz_SharedLib_get_version(chaz_SharedLib *lib) { +chaz_Lib_get_version(chaz_Lib *lib) { return lib->version; } const char* -chaz_SharedLib_get_major_version(chaz_SharedLib *lib) { +chaz_Lib_get_major_version(chaz_Lib *lib) { return lib->major_version; } char* -chaz_SharedLib_filename(chaz_SharedLib *lib) { +chaz_Lib_filename(chaz_Lib *lib) { const char *shlib_ext = chaz_OS_shared_lib_ext(); if (strcmp(shlib_ext, ".dll") == 0) { @@ -79,14 +79,14 @@ chaz_SharedLib_filename(chaz_SharedLib *lib) { } char* -chaz_SharedLib_major_version_filename(chaz_SharedLib *lib) { +chaz_Lib_major_version_filename(chaz_Lib *lib) { const char *shlib_ext = chaz_OS_shared_lib_ext(); return S_build_filename(lib, lib->major_version, shlib_ext); } char* -chaz_SharedLib_no_version_filename(chaz_SharedLib *lib) { +chaz_Lib_no_version_filename(chaz_Lib *lib) { const char *prefix = S_get_prefix(); const char *shlib_ext = chaz_OS_shared_lib_ext(); @@ -94,17 +94,17 @@ chaz_SharedLib_no_version_filename(chaz_SharedLib *lib) { } char* -chaz_SharedLib_implib_filename(chaz_SharedLib *lib) { +chaz_Lib_implib_filename(chaz_Lib *lib) { return S_build_filename(lib, lib->major_version, ".lib"); } char* -chaz_SharedLib_export_filename(chaz_SharedLib *lib) { +chaz_Lib_export_filename(chaz_Lib *lib) { return S_build_filename(lib, lib->major_version, ".exp"); } static char* -S_build_filename(chaz_SharedLib *lib, const char *version, const char *ext) { +S_build_filename(chaz_Lib *lib, const char *version, const char *ext) { const char *prefix = S_get_prefix(); const char *shlib_ext = chaz_OS_shared_lib_ext(); http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/c5a33b63/src/Charmonizer/Core/Library.h ---------------------------------------------------------------------- diff --git a/src/Charmonizer/Core/Library.h b/src/Charmonizer/Core/Library.h index f05e0f9..d78c63d 100644 --- a/src/Charmonizer/Core/Library.h +++ b/src/Charmonizer/Core/Library.h @@ -17,50 +17,50 @@ /* Charmonizer/Core/Library.h */ -#ifndef H_CHAZ_SHARED_LIB -#define H_CHAZ_SHARED_LIB +#ifndef H_CHAZ_LIB +#define H_CHAZ_LIB #ifdef __cplusplus extern "C" { #endif -typedef struct chaz_SharedLib chaz_SharedLib; +typedef struct chaz_Lib chaz_Lib; -chaz_SharedLib* -chaz_SharedLib_new(const char *name, const char *version, +chaz_Lib* +chaz_Lib_new(const char *name, const char *version, const char *major_version); void -chaz_SharedLib_destroy(chaz_SharedLib *flags); +chaz_Lib_destroy(chaz_Lib *flags); const char* -chaz_SharedLib_get_name(chaz_SharedLib *lib); +chaz_Lib_get_name(chaz_Lib *lib); const char* -chaz_SharedLib_get_version(chaz_SharedLib *lib); +chaz_Lib_get_version(chaz_Lib *lib); const char* -chaz_SharedLib_get_major_version(chaz_SharedLib *lib); +chaz_Lib_get_major_version(chaz_Lib *lib); char* -chaz_SharedLib_filename(chaz_SharedLib *lib); +chaz_Lib_filename(chaz_Lib *lib); char* -chaz_SharedLib_major_version_filename(chaz_SharedLib *lib); +chaz_Lib_major_version_filename(chaz_Lib *lib); char* -chaz_SharedLib_no_version_filename(chaz_SharedLib *lib); +chaz_Lib_no_version_filename(chaz_Lib *lib); char* -chaz_SharedLib_implib_filename(chaz_SharedLib *lib); +chaz_Lib_implib_filename(chaz_Lib *lib); char* -chaz_SharedLib_export_filename(chaz_SharedLib *lib); +chaz_Lib_export_filename(chaz_Lib *lib); #ifdef __cplusplus } #endif -#endif /* H_CHAZ_SHARED_LIB */ +#endif /* H_CHAZ_LIB */ http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/c5a33b63/src/Charmonizer/Core/Make.c ---------------------------------------------------------------------- diff --git a/src/Charmonizer/Core/Make.c b/src/Charmonizer/Core/Make.c index a5bd648..34911c8 100644 --- a/src/Charmonizer/Core/Make.c +++ b/src/Charmonizer/Core/Make.c @@ -321,7 +321,7 @@ chaz_MakeFile_add_compiled_exe(chaz_MakeFile *makefile, const char *exe, } chaz_MakeRule* -chaz_MakeFile_add_shared_lib(chaz_MakeFile *makefile, chaz_SharedLib *lib, +chaz_MakeFile_add_shared_lib(chaz_MakeFile *makefile, chaz_Lib *lib, const char *sources, chaz_CFlags *link_flags) { chaz_CFlags *local_flags = chaz_CC_new_cflags(); const char *link = chaz_CC_link_command(); @@ -332,7 +332,7 @@ chaz_MakeFile_add_shared_lib(chaz_MakeFile *makefile, chaz_SharedLib *lib, char *filename; char *command; - filename = chaz_SharedLib_filename(lib); + filename = chaz_Lib_filename(lib); rule = chaz_MakeFile_add_rule(makefile, filename, sources); if (link_flags) { @@ -346,7 +346,7 @@ chaz_MakeFile_add_shared_lib(chaz_MakeFile *makefile, chaz_SharedLib *lib, if (strcmp(shlib_ext, ".dylib") == 0) { /* Set temporary install name with full path on Darwin. */ const char *dir_sep = chaz_OS_dir_sep(); - char *major_v_name = chaz_SharedLib_major_version_filename(lib); + char *major_v_name = chaz_Lib_major_version_filename(lib); char *install_name = chaz_Util_join("", "-install_name $(CURDIR)", dir_sep, major_v_name, NULL); chaz_CFlags_append(local_flags, install_name); @@ -366,8 +366,8 @@ chaz_MakeFile_add_shared_lib(chaz_MakeFile *makefile, chaz_SharedLib *lib, /* Add symlinks. */ if (strcmp(shlib_ext, ".dll") != 0) { - char *major_v_name = chaz_SharedLib_major_version_filename(lib); - char *no_v_name = chaz_SharedLib_no_version_filename(lib); + char *major_v_name = chaz_Lib_major_version_filename(lib); + char *no_v_name = chaz_Lib_no_version_filename(lib); command = chaz_Util_join(" ", "ln -sf", filename, major_v_name, NULL); chaz_MakeRule_add_command(rule, command); @@ -393,8 +393,8 @@ chaz_MakeFile_add_shared_lib(chaz_MakeFile *makefile, chaz_SharedLib *lib, if (chaz_CC_msvc_version_num()) { /* Remove import library and export file under MSVC. */ - char *lib_filename = chaz_SharedLib_implib_filename(lib); - char *exp_filename = chaz_SharedLib_export_filename(lib); + char *lib_filename = chaz_Lib_implib_filename(lib); + char *exp_filename = chaz_Lib_export_filename(lib); chaz_MakeRule_add_rm_command(makefile->clean, lib_filename); chaz_MakeRule_add_rm_command(makefile->clean, exp_filename); free(lib_filename); http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/c5a33b63/src/Charmonizer/Core/Make.h ---------------------------------------------------------------------- diff --git a/src/Charmonizer/Core/Make.h b/src/Charmonizer/Core/Make.h index 297c18c..ce8b3e5 100644 --- a/src/Charmonizer/Core/Make.h +++ b/src/Charmonizer/Core/Make.h @@ -148,7 +148,7 @@ chaz_MakeFile_add_compiled_exe(chaz_MakeFile *makefile, const char *exe, * @param link_flags Additional link flags. */ chaz_MakeRule* -chaz_MakeFile_add_shared_lib(chaz_MakeFile *makefile, chaz_SharedLib *lib, +chaz_MakeFile_add_shared_lib(chaz_MakeFile *makefile, chaz_Lib *lib, const char *sources, chaz_CFlags *link_flags); /** Add a rule to build the lemon parser generator.
