Rename libcfish to libclownfish Fixes CLOWNFISH-103.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/26c70a36 Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/26c70a36 Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/26c70a36 Branch: refs/heads/master Commit: 26c70a36f95d29668f3a2bc8c32bcf6720f75f7c Parents: 3fcd428 Author: Nick Wellnhofer <wellnho...@aevum.de> Authored: Sat Aug 6 17:23:24 2016 +0200 Committer: Nick Wellnhofer <wellnho...@aevum.de> Committed: Sat Aug 6 17:30:59 2016 +0200 ---------------------------------------------------------------------- runtime/c/install.bat | 8 +++---- runtime/c/install.sh | 22 ++++++++++---------- runtime/common/charmonizer.c | 17 ++++++++------- runtime/common/charmonizer.main | 17 ++++++++------- runtime/core/Clownfish/Docs/BuildingProjects.md | 2 +- 5 files changed, 34 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/26c70a36/runtime/c/install.bat ---------------------------------------------------------------------- diff --git a/runtime/c/install.bat b/runtime/c/install.bat index 58f06e6..25f3208 100644 --- a/runtime/c/install.bat +++ b/runtime/c/install.bat @@ -33,10 +33,10 @@ mkdir "%prefix%\bin" 2>nul mkdir "%prefix%\lib" 2>nul rem Install libraries. -copy cfish-%major_version%.dll "%prefix%\bin" >nul -copy libcfish-%major_version%.dll "%prefix%\bin" >nul -copy cfish-%major_version%.lib "%prefix%\lib" >nul -copy libcfish-%major_version%.dll.a "%prefix%\lib" >nul +copy clownfish-%major_version%.dll "%prefix%\bin" >nul +copy libclownfish-%major_version%.dll "%prefix%\bin" >nul +copy clownfish-%major_version%.lib "%prefix%\lib" >nul +copy libclownfish-%major_version%.dll.a "%prefix%\lib" >nul rem Install executables. copy ..\..\compiler\c\cfc.exe "%prefix%\bin" >nul http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/26c70a36/runtime/c/install.sh ---------------------------------------------------------------------- diff --git a/runtime/c/install.sh b/runtime/c/install.sh index 237e0dd..67f2adf 100755 --- a/runtime/c/install.sh +++ b/runtime/c/install.sh @@ -63,20 +63,20 @@ prefix=`cd "$prefix" && pwd` # Install libraries. case `uname` in Darwin*) - lib_file=libcfish.$version.dylib + lib_file=libclownfish.$version.dylib if [ ! -f $lib_file ]; then echo "$lib_file not found. Did you run make?" exit 1 fi mkdir -p "$prefix/lib" cp $lib_file "$prefix/lib" - install_name=$prefix/lib/libcfish.$major_version.dylib + install_name=$prefix/lib/libclownfish.$major_version.dylib ln -sf $lib_file "$install_name" - ln -sf $lib_file "$prefix/lib/libcfish.dylib" + ln -sf $lib_file "$prefix/lib/libclownfish.dylib" install_name_tool -id "$install_name" "$prefix/lib/$lib_file" ;; MINGW*|MSYS*) - lib_file=libcfish-$major_version.dll + lib_file=libclownfish-$major_version.dll if [ ! -f $lib_file ]; then echo "$lib_file not found. Did you run make?" exit 1 @@ -84,10 +84,10 @@ case `uname` in mkdir -p "$prefix/bin" cp $lib_file "$prefix/bin" mkdir -p "$prefix/lib" - cp libcfish-$major_version.dll.a "$prefix/lib" + cp libclownfish-$major_version.dll.a "$prefix/lib" ;; CYGWIN*) - lib_file=cygcfish-$major_version.dll + lib_file=cygclownfish-$major_version.dll if [ ! -f $lib_file ]; then echo "$lib_file not found. Did you run make?" exit 1 @@ -95,19 +95,19 @@ case `uname` in mkdir -p "$prefix/bin" cp $lib_file "$prefix/bin" mkdir -p "$prefix/lib" - cp libcfish-$major_version.dll.a "$prefix/lib" + cp libclownfish-$major_version.dll.a "$prefix/lib" ;; *) - lib_file=libcfish.so.$version + lib_file=libclownfish.so.$version if [ ! -f $lib_file ]; then echo "$lib_file not found. Did you run make?" exit 1 fi mkdir -p "$prefix/lib" cp $lib_file "$prefix/lib" - soname=libcfish.so.$major_version + soname=libclownfish.so.$major_version ln -sf $lib_file "$prefix/lib/$soname" - ln -sf $soname "$prefix/lib/libcfish.so" + ln -sf $soname "$prefix/lib/libclownfish.so" ;; esac @@ -130,6 +130,6 @@ Name: Clownfish Description: Symbiotic object system Version: $version URL: http://lucy.apache.org/ -Libs: -L$prefix/lib -lcfish +Libs: -L$prefix/lib -lclownfish EOF http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/26c70a36/runtime/common/charmonizer.c ---------------------------------------------------------------------- diff --git a/runtime/common/charmonizer.c b/runtime/common/charmonizer.c index 9b3e99e..558befa 100644 --- a/runtime/common/charmonizer.c +++ b/runtime/common/charmonizer.c @@ -8945,12 +8945,13 @@ cfish_MakeFile_write(cfish_MakeFile *self, chaz_CFlags *extra_link_flags) { if (strcmp(host, "c") == 0 || strcmp(host, "perl") == 0) { /* Shared library for C and Perl. */ - chaz_MakeFile_add_rule(self->makefile, "all", "$(CFISH_SHARED_LIB)"); + chaz_MakeFile_add_rule(self->makefile, "all", + "$(CLOWNFISH_SHARED_LIB)"); self->lib - = chaz_MakeFile_add_shared_lib(self->makefile, NULL, "cfish", + = chaz_MakeFile_add_shared_lib(self->makefile, NULL, "clownfish", cfish_version, cfish_major_version); - lib_objs = "$(CFISH_SHARED_LIB_OBJS)"; + lib_objs = "$(CLOWNFISH_SHARED_LIB_OBJS)"; compile_flags = chaz_MakeBinary_get_compile_flags(self->lib); chaz_CFlags_add_define(compile_flags, "CFP_CFISH", NULL); @@ -9005,10 +9006,10 @@ cfish_MakeFile_write(cfish_MakeFile *self, chaz_CFlags *extra_link_flags) { chaz_CFlags_enable_debugging(link_flags); chaz_CFlags_append(link_flags, chaz_CFlags_get_string(extra_link_flags)); - chaz_CFlags_add_shared_lib(link_flags, NULL, "cfish", + chaz_CFlags_add_shared_lib(link_flags, NULL, "clownfish", cfish_major_version); - chaz_MakeBinary_add_prereq(self->test_lib, "$(CFISH_SHARED_LIB)"); + chaz_MakeBinary_add_prereq(self->test_lib, "$(CLOWNFISH_SHARED_LIB)"); } else { /* Static library for Go and Python. */ @@ -9048,7 +9049,7 @@ cfish_MakeFile_write(cfish_MakeFile *self, chaz_CFlags *extra_link_flags) { char *objects; chaz_MakeFile_add_rule(self->makefile, "core_objects", - "$(CFISH_SHARED_LIB_OBJS)"); + "$(CLOWNFISH_SHARED_LIB_OBJS)"); objects = chaz_MakeBinary_obj_string(self->lib); chaz_ConfWriter_add_def("CORE_OBJECTS", objects); free(objects); @@ -9135,11 +9136,11 @@ cfish_MakeFile_write_c_test_rules(cfish_MakeFile *self) { chaz_CFlags_add_rpath(link_flags, "\"$$PWD\""); chaz_CFlags_add_shared_lib(link_flags, NULL, "testcfish", cfish_major_version); - chaz_CFlags_add_shared_lib(link_flags, NULL, "cfish", + chaz_CFlags_add_shared_lib(link_flags, NULL, "clownfish", cfish_major_version); chaz_MakeBinary_add_prereq(exe, "$(TESTCFISH_SHARED_LIB)"); - chaz_MakeBinary_add_prereq(exe, "$(CFISH_SHARED_LIB)"); + chaz_MakeBinary_add_prereq(exe, "$(CLOWNFISH_SHARED_LIB)"); chaz_MakeFile_add_rule(self->makefile, "$(TEST_CFISH_EXE_OBJS)", self->autogen_target); http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/26c70a36/runtime/common/charmonizer.main ---------------------------------------------------------------------- diff --git a/runtime/common/charmonizer.main b/runtime/common/charmonizer.main index 681d263..cfe8c21 100644 --- a/runtime/common/charmonizer.main +++ b/runtime/common/charmonizer.main @@ -366,12 +366,13 @@ cfish_MakeFile_write(cfish_MakeFile *self, chaz_CFlags *extra_link_flags) { if (strcmp(host, "c") == 0 || strcmp(host, "perl") == 0) { /* Shared library for C and Perl. */ - chaz_MakeFile_add_rule(self->makefile, "all", "$(CFISH_SHARED_LIB)"); + chaz_MakeFile_add_rule(self->makefile, "all", + "$(CLOWNFISH_SHARED_LIB)"); self->lib - = chaz_MakeFile_add_shared_lib(self->makefile, NULL, "cfish", + = chaz_MakeFile_add_shared_lib(self->makefile, NULL, "clownfish", cfish_version, cfish_major_version); - lib_objs = "$(CFISH_SHARED_LIB_OBJS)"; + lib_objs = "$(CLOWNFISH_SHARED_LIB_OBJS)"; compile_flags = chaz_MakeBinary_get_compile_flags(self->lib); chaz_CFlags_add_define(compile_flags, "CFP_CFISH", NULL); @@ -426,10 +427,10 @@ cfish_MakeFile_write(cfish_MakeFile *self, chaz_CFlags *extra_link_flags) { chaz_CFlags_enable_debugging(link_flags); chaz_CFlags_append(link_flags, chaz_CFlags_get_string(extra_link_flags)); - chaz_CFlags_add_shared_lib(link_flags, NULL, "cfish", + chaz_CFlags_add_shared_lib(link_flags, NULL, "clownfish", cfish_major_version); - chaz_MakeBinary_add_prereq(self->test_lib, "$(CFISH_SHARED_LIB)"); + chaz_MakeBinary_add_prereq(self->test_lib, "$(CLOWNFISH_SHARED_LIB)"); } else { /* Static library for Go and Python. */ @@ -469,7 +470,7 @@ cfish_MakeFile_write(cfish_MakeFile *self, chaz_CFlags *extra_link_flags) { char *objects; chaz_MakeFile_add_rule(self->makefile, "core_objects", - "$(CFISH_SHARED_LIB_OBJS)"); + "$(CLOWNFISH_SHARED_LIB_OBJS)"); objects = chaz_MakeBinary_obj_string(self->lib); chaz_ConfWriter_add_def("CORE_OBJECTS", objects); free(objects); @@ -556,11 +557,11 @@ cfish_MakeFile_write_c_test_rules(cfish_MakeFile *self) { chaz_CFlags_add_rpath(link_flags, "\"$$PWD\""); chaz_CFlags_add_shared_lib(link_flags, NULL, "testcfish", cfish_major_version); - chaz_CFlags_add_shared_lib(link_flags, NULL, "cfish", + chaz_CFlags_add_shared_lib(link_flags, NULL, "clownfish", cfish_major_version); chaz_MakeBinary_add_prereq(exe, "$(TESTCFISH_SHARED_LIB)"); - chaz_MakeBinary_add_prereq(exe, "$(CFISH_SHARED_LIB)"); + chaz_MakeBinary_add_prereq(exe, "$(CLOWNFISH_SHARED_LIB)"); chaz_MakeFile_add_rule(self->makefile, "$(TEST_CFISH_EXE_OBJS)", self->autogen_target); http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/26c70a36/runtime/core/Clownfish/Docs/BuildingProjects.md ---------------------------------------------------------------------- diff --git a/runtime/core/Clownfish/Docs/BuildingProjects.md b/runtime/core/Clownfish/Docs/BuildingProjects.md index 9b9606b..e1d5a4b 100644 --- a/runtime/core/Clownfish/Docs/BuildingProjects.md +++ b/runtime/core/Clownfish/Docs/BuildingProjects.md @@ -108,5 +108,5 @@ compiled with `autogen/include` added to the header search path. When linking, add the object files of the CFC-generated code created in the previous step. You must also link the shared library of the -Clownfish runtime (`-lcfish` under GCC). +Clownfish runtime (`-lclownfish` under GCC).