This is an automated email from the ASF dual-hosted git repository. bneradt pushed a commit to branch dev-1-0-11 in repository https://gitbox.apache.org/repos/asf/trafficserver-libswoc.git
commit b195f7151b731442c94a890be8a7363ead48773d Author: Alan M. Carroll <[email protected]> AuthorDate: Wed Feb 5 13:20:15 2020 -0600 Update for better scons/parts support. --- .gitignore | 11 ++++++++++- swoc++/libswoc++.pc.in | 11 +++++++++++ swoc++/swoc++.part | 11 +++++++++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 663935b..0911214 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ *.lo *.o *.obj +*.swp # Precompiled Headers *.gch @@ -28,8 +29,8 @@ *.out *.app -cmake-build-debug .idea +cmake-build-debug doc/_build doc/doxygen doc/reference @@ -38,3 +39,11 @@ doc/ext/__* CMakeFiles/ cmake-build-release/ venv/ +.parts.cache +.sconsign.dblite +_build +_install +_sdk +_unit_tests + + diff --git a/swoc++/libswoc++.pc.in b/swoc++/libswoc++.pc.in new file mode 100644 index 0000000..9a78d45 --- /dev/null +++ b/swoc++/libswoc++.pc.in @@ -0,0 +1,11 @@ +prefix=pkg_prefix +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib + +Name: LibSWOC++ +Description: A collection of solid C++ utilities and classes. +Version: pkg_version +Requires: +Libs: -L${libdir} -lswoc++ +Cflags: -I${includedir} diff --git a/swoc++/swoc++.part b/swoc++/swoc++.part index 1520a6e..70e3d53 100644 --- a/swoc++/swoc++.part +++ b/swoc++/swoc++.part @@ -1,6 +1,7 @@ +import os Import("*") +PartName("libswoc") PartVersion("1.0.11") -PartName("swoc++") files = [ "src/ArenaWriter.cc", @@ -20,9 +21,15 @@ env.AppendUnique( ) # build the library -out = env.StaticLibrary("${PART_NAME}",files) +out = env.StaticLibrary("libswoc++",files) env.InstallLib(out) # export the include directory env.InstallInclude( Pattern(src_dir="include/",includes=["*.h"]), ) +pc_file = env.Substfile("libswoc++.pc", "libswoc++.pc.in" + , SUBST_DICT = { + "pkg_prefix": env.Dir("$INSTALL_ROOT").abspath + , "pkg_version": "$PART_VERSION" + }) +env.InstallPkgConfig(pc_file)
