The name of the libraries found under /lib/ and /usr/lib are, for the most part, self descriptive. It is desirable to do the same for the opencsd library, hence changing the name to something automatically recognisable.
Signed-off-by: Mathieu Poirier mathieu.poirier@linaro.org --- HOWTO.md | 2 +- decoder/build/linux/makefile | 2 +- decoder/build/win-vs2015/opencsd.props | 6 +++--- decoder/docs/build_libs.md | 18 +++++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/HOWTO.md b/HOWTO.md index dd4fe2057548..1ebc2c8796b2 100644 --- a/HOWTO.md +++ b/HOWTO.md @@ -271,7 +271,7 @@ the host's (which has nothing to do with the target) architecture: ...
linaro@t430:~/linaro/coresight/my-opencsd/decoder/build/linux$ ls ../../lib/linux64/dbg/ - libcstraced.a libcstraced_c_api.a libcstraced_c_api.so libcstraced.so + libopencsd.a libopencsd_c_api.a libopencsd_c_api.so libopencsd.so
Off Target Perf Tools Compilation diff --git a/decoder/build/linux/makefile b/decoder/build/linux/makefile index c9724bbfb371..47ac4f52b49d 100644 --- a/decoder/build/linux/makefile +++ b/decoder/build/linux/makefile @@ -40,7 +40,7 @@ export OCSD_ROOT endif
# library names -LIB_BASE_NAME=cstraced +LIB_BASE_NAME=opencsd export LIB_BASE_NAME LIB_CAPI_NAME=$(LIB_BASE_NAME)_c_api export LIB_CAPI_NAME diff --git a/decoder/build/win-vs2015/opencsd.props b/decoder/build/win-vs2015/opencsd.props index 3b33ee9c3590..6c8c7b339f77 100644 --- a/decoder/build/win-vs2015/opencsd.props +++ b/decoder/build/win-vs2015/opencsd.props @@ -2,8 +2,8 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ImportGroup Label="PropertySheets" /> <PropertyGroup Label="UserMacros"> - <LIB_BASE_NAME>cstraced</LIB_BASE_NAME> - <LIB_CAPI_NAME>cstraced_c_api</LIB_CAPI_NAME> + <LIB_BASE_NAME>opencsd</LIB_BASE_NAME> + <LIB_CAPI_NAME>opencsd_c_api</LIB_CAPI_NAME> </PropertyGroup> <PropertyGroup /> <ItemDefinitionGroup /> @@ -17,4 +17,4 @@ <EnvironmentVariable>true</EnvironmentVariable> </BuildMacro> </ItemGroup> -</Project> \ No newline at end of file +</Project> diff --git a/decoder/docs/build_libs.md b/decoder/docs/build_libs.md index b7c8536ca5f0..6d23917ec73c 100644 --- a/decoder/docs/build_libs.md +++ b/decoder/docs/build_libs.md @@ -32,16 +32,16 @@ Libraries are delivered to the `./lib/linux<bitsize>/<dbg\rel>` directories. e.g. `./lib/linux64/rel` will contain the linux 64 bit release libraries.
The following libraries are built:- -- `libcstraced.so` : shared library containing the main C++ based decoder library -- `libcstraced_c_api.so` : shared library containing the C-API wrapper library. Dependent on `libcstraced.so` -- `libcstraced.a` : static library containing the main C++ based decoder library. -- `libcstraced_c_api.a` : static library containing the C-API wrapper library. +- `libopencsd.so` : shared library containing the main C++ based decoder library +- `libopencsd_c_api.so` : shared library containing the C-API wrapper library. Dependent on `libopencsd.so` +- `libopencsd.a` : static library containing the main C++ based decoder library. +- `libopencsd_c_api.a` : static library containing the C-API wrapper library.
Test programs are delivered to the `./tests/bin/linux<bitsize>/<dgb\rel>` directories.
The test programs are built to used the .so versions of the libraries. -- `trc_pkt_lister` - dependent on `libcstraced.so`. -- `simple_pkt_print_c_api` - dependent on `libcstraced_c_api.so` & hence `libcstraced.so`. +- `trc_pkt_lister` - dependent on `libopencsd.so`. +- `simple_pkt_print_c_api` - dependent on `libopencsd_c_api.so` & hence `libopencsd.so`.
The test program build for `trc_pkt_lister` also builds an auxiliary library used by this program for test purposes only. This is the `libsnapshot_parser.a` library, delivered to the `./tests/lib/linux<bitsize>/<dgb\rel>` directories. @@ -65,9 +65,9 @@ _Note_: Currently there is no Windows DLL version of the main C++ library. This the project is nearer completion with further decode protocols, and the classes requiring export are established..
Libraries built are:- -- `libcstraced.lib` : static main C++ decoder library. -- `cstraced_c_api.dll` : C-API DLL library. Statically linked against `libcstraced.lib` at .DLL build time. -- `libcstraced_c_api.lib` : C-API static library. +- `libopencsd.lib` : static main C++ decoder library. +- `opencsd_c_api.dll` : C-API DLL library. Statically linked against `libopencsd.lib` at .DLL build time. +- `libopencsd_c_api.lib` : C-API static library.
There is also a project file to build an auxiliary library used `trc_pkt_lister` for test purposes only. This is the `snapshot_parser_lib.lib` library, delivered to the `./tests/lib/win<bitsize>/<dgb\rel>` directories.