You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bn...@apache.org on 2024/01/30 16:23:44 UTC
(trafficserver-libswoc) 01/04: Update to version 1.0.14.
This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch dev-1-1-0
in repository https://gitbox.apache.org/repos/asf/trafficserver-libswoc.git
commit 100c55db73f8f890ab6633d71fdaa209e5ba2336
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Fri Feb 28 10:09:03 2020 -0600
Update to version 1.0.14.
---
doc/Doxyfile | 2 +-
doc/code/IPSpace.en.rst | 2 +-
doc/code/TextView.en.rst | 6 +++---
doc/conf.py | 2 +-
swoc++/CMakeLists.txt | 2 +-
swoc++/include/swoc/swoc_version.h | 2 +-
swoc++/libswoc++-static.pc.in | 11 +++++++++++
swoc++/swoc++-shared.part | 22 ++++++++++++++++++++++
swoc++/swoc++-static.part | 30 +++++++++---------------------
swoc++/swoc++.part | 25 +++++++++----------------
unit_tests/unit_tests.part | 2 +-
11 files changed, 60 insertions(+), 46 deletions(-)
diff --git a/doc/Doxyfile b/doc/Doxyfile
index a2ad52d..4653e34 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME = "LibSWOC++"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = "1.0.13"
+PROJECT_NUMBER = "1.0.14"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/doc/code/IPSpace.en.rst b/doc/code/IPSpace.en.rst
index 3f78f2f..c3c9419 100644
--- a/doc/code/IPSpace.en.rst
+++ b/doc/code/IPSpace.en.rst
@@ -170,7 +170,7 @@ Blending Bitsets
Some details are omitted for brevity and because they aren't directly relevant. The full
implementation, which is run as a unit test to verify its correctness,
- `is available here <https://github.com/SolidWallOfCode/libswoc/blob/1.0.13/unit_tests/ex_ipspace_properties.cc>`__.
+ `is available here <https://github.com/SolidWallOfCode/libswoc/blob/1.0.14/unit_tests/ex_ipspace_properties.cc>`__.
You can compile and step through the code to see how it works in more detail, or experiment
with changing some of the example data.
diff --git a/doc/code/TextView.en.rst b/doc/code/TextView.en.rst
index 9273d9b..3c2e1fc 100644
--- a/doc/code/TextView.en.rst
+++ b/doc/code/TextView.en.rst
@@ -275,7 +275,7 @@ separated by commas.
.. sidebar:: Verification
- `Test code for example <https://github.com/SolidWallOfCode/libswoc/blob/1.0.13/unit_tests/ex_TextView.cc#L67>`__.
+ `Test code for example <https://github.com/SolidWallOfCode/libswoc/blob/1.0.14/unit_tests/ex_TextView.cc#L67>`__.
If :arg:`value` was :literal:`bob ,dave, sam` then :arg:`token` would be successively
:literal:`bob`, :literal:`dave`, :literal:`sam`. After :literal:`sam` was extracted :arg:`value`
@@ -297,7 +297,7 @@ for values that are boolean.
.. sidebar:: Verification
- `Test code for example <https://github.com/SolidWallOfCode/libswoc/blob/1.0.13/unit_tests/ex_TextView.cc#L74>`__.
+ `Test code for example <https://github.com/SolidWallOfCode/libswoc/blob/1.0.14/unit_tests/ex_TextView.cc#L74>`__.
The basic list processing is the same as the previous example, with each element being treated as
a "list" with ``=`` as the separator. Note if there is no ``=`` character then all of the list
@@ -348,7 +348,7 @@ do not, so a flag to strip quotes from the resulting elements is needed. The fin
.. sidebar:: Verification
- `Test code for example <https://github.com/SolidWallOfCode/libswoc/blob/1.0.13/unit_tests/ex_TextView.cc#L90>`__.
+ `Test code for example <https://github.com/SolidWallOfCode/libswoc/blob/1.0.14/unit_tests/ex_TextView.cc#L90>`__.
This takes a :code:`TextView&` which is the source view which will be updated as tokens are removed
(therefore the caller must do the empty view check). The other arguments are the separator character
diff --git a/doc/conf.py b/doc/conf.py
index f5a2257..b468f53 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -80,7 +80,7 @@ project = u'Solid Wall Of C++'
copyright = u'{}, amc@apache.org'.format(date.today().year)
# The full version, including alpha/beta/rc tags.
-release = "1.0.13"
+release = "1.0.14"
# The short X.Y version.
version = '.'.join(release.split('.', 2)[:2])
diff --git a/swoc++/CMakeLists.txt b/swoc++/CMakeLists.txt
index f4947d5..cbe96df 100644
--- a/swoc++/CMakeLists.txt
+++ b/swoc++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.12)
project(lib-swoc++ CXX)
-set(LIBSWOC_VERSION "1.0.13")
+set(LIBSWOC_VERSION "1.0.14")
set(CMAKE_CXX_STANDARD 17)
include(GNUInstallDirs)
diff --git a/swoc++/include/swoc/swoc_version.h b/swoc++/include/swoc/swoc_version.h
index 4f7cb85..b6bc3c1 100644
--- a/swoc++/include/swoc/swoc_version.h
+++ b/swoc++/include/swoc/swoc_version.h
@@ -39,5 +39,5 @@ namespace swoc
{
static constexpr unsigned MAJOR_VERSION = 1;
static constexpr unsigned MINOR_VERSION = 0;
-static constexpr unsigned POINT_VERSION = 13;
+static constexpr unsigned POINT_VERSION = 14;
} // namespace swoc
diff --git a/swoc++/libswoc++-static.pc.in b/swoc++/libswoc++-static.pc.in
new file mode 100644
index 0000000..9a78d45
--- /dev/null
+++ b/swoc++/libswoc++-static.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++-shared.part b/swoc++/swoc++-shared.part
new file mode 100644
index 0000000..df0b7d3
--- /dev/null
+++ b/swoc++/swoc++-shared.part
@@ -0,0 +1,22 @@
+Import("*")
+PartName("shared")
+
+src_files = env.get("src_files")
+
+env.AppendUnique(
+ CCFLAGS=['-std=c++17' ],
+ CPPPATH=['include'],
+)
+
+# build the library
+out = env.SharedLibrary("libswoc++", src_files)
+env.InstallLib(out)
+
+# Export the package config.
+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)
diff --git a/swoc++/swoc++-static.part b/swoc++/swoc++-static.part
index b737458..e7defe3 100644
--- a/swoc++/swoc++-static.part
+++ b/swoc++/swoc++-static.part
@@ -1,35 +1,23 @@
-import os
Import("*")
-PartName("libswoc")
-PartVersion("1.0.13")
+PartName("static")
-files = [
- "src/ArenaWriter.cc",
- "src/bw_format.cc",
- "src/bw_ip_format.cc",
- "src/Errata.cc",
- "src/MemArena.cc",
- "src/RBTree.cc",
- "src/swoc_file.cc",
- "src/swoc_ip.cc",
- "src/TextView.cc",
-]
+src_files = env.get("src_files")
env.AppendUnique(
CCFLAGS=['-std=c++17' ],
- CPPPATH=["include"],
+ CPPPATH=['include'],
)
# build the library
-out = env.StaticLibrary("libswoc++",files)
+out = env.StaticLibrary("libswoc++", src_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"
+
+# Export the package config.
+pc_file = env.Substfile("libswoc++-static.pc", "libswoc++-static.pc.in"
, SUBST_DICT = {
"pkg_prefix": env.Dir("$INSTALL_ROOT").abspath
, "pkg_version": "$PART_VERSION"
})
+
+
env.InstallPkgConfig(pc_file)
diff --git a/swoc++/swoc++.part b/swoc++/swoc++.part
index 9b766bd..4c4df61 100644
--- a/swoc++/swoc++.part
+++ b/swoc++/swoc++.part
@@ -1,9 +1,8 @@
-import os
Import("*")
PartName("libswoc")
-PartVersion("1.0.13")
+PartVersion("1.0.14")
-files = [
+src_files = [
"src/ArenaWriter.cc",
"src/bw_format.cc",
"src/bw_ip_format.cc",
@@ -15,21 +14,15 @@ files = [
"src/TextView.cc",
]
+# export the include directory
+inc_files = Pattern(src_dir="include/swoc", includes=["*.h"])
+#env.InstallInclude(env.get("inc_files"))
+env.InstallInclude(inc_files)
+
env.AppendUnique(
CCFLAGS=['-std=c++17' ],
CPPPATH=["include"],
)
-# build the library
-out = env.Library("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)
+env.Part("swoc++-static.part", package_group="libswoc", src_files=src_files, inc_files=inc_files)
+env.Part("swoc++-shared.part", package_group="libswoc", src_files=src_files, inc_files=inc_files)
diff --git a/unit_tests/unit_tests.part b/unit_tests/unit_tests.part
index fd2115e..a5338fe 100644
--- a/unit_tests/unit_tests.part
+++ b/unit_tests/unit_tests.part
@@ -3,7 +3,7 @@ Import("*")
PartName("tests")
DependsOn([
- Component("swoc++",requires=REQ.DEFAULT(internal=False))
+ Component("libswoc.static", requires=REQ.DEFAULT(internal=False))
])
env.AppendUnique(