You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2016/10/25 18:44:00 UTC
[trafficserver] branch master updated (7046476 -> 32d2ee6)
This is an automated email from the ASF dual-hosted git repository.
jpeach pushed a change to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git.
from 7046476 TS-4998: Move plugins into a common non-recursive build.
new dd54c93 TS-4997: Rename TS_PLUGIN_LDFLAGS to TS_PLUGIN_LD_FLAGS.
new 32d2ee6 TS-4997: Move the C++ API to lib/cppapi.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile.am | 2 +-
NOTICE | 2 +-
README | 2 +-
build/plugins.mk | 8 +-
configure.ac | 3 +-
doc/Doxyfile | 2 +-
example/Makefile.am | 4 +-
lib/Makefile.am | 2 +-
lib/{atscppapi/src => cppapi}/AsyncHttpFetch.cc | 0
lib/{atscppapi/src => cppapi}/AsyncTimer.cc | 0
.../CaseInsensitiveStringComparator.cc | 0
lib/{atscppapi/src => cppapi}/ClientRequest.cc | 0
lib/{atscppapi/src => cppapi}/GlobalPlugin.cc | 0
.../src => cppapi}/GzipDeflateTransformation.cc | 0
.../src => cppapi}/GzipInflateTransformation.cc | 0
lib/{atscppapi/src => cppapi}/Headers.cc | 0
lib/{atscppapi/src => cppapi}/HttpMethod.cc | 0
lib/{atscppapi/src => cppapi}/HttpVersion.cc | 0
lib/{atscppapi/src => cppapi}/InterceptPlugin.cc | 0
lib/{atscppapi/src => cppapi}/Logger.cc | 0
lib/{atscppapi/src => cppapi}/Makefile.am | 96 ++++++++++------------
lib/{atscppapi/src => cppapi}/Mutex.cc | 0
lib/{atscppapi/src => cppapi}/Plugin.cc | 0
lib/{atscppapi/src => cppapi}/RemapPlugin.cc | 0
lib/{atscppapi/src => cppapi}/Request.cc | 0
lib/{atscppapi/src => cppapi}/Response.cc | 0
lib/{atscppapi/src => cppapi}/Stat.cc | 0
lib/{atscppapi/src => cppapi}/Transaction.cc | 0
lib/{atscppapi/src => cppapi}/TransactionPlugin.cc | 0
.../src => cppapi}/TransformationPlugin.cc | 0
lib/{atscppapi/src => cppapi}/Url.cc | 0
.../src => cppapi}/include/atscppapi/Async.h | 0
.../include/atscppapi/AsyncHttpFetch.h | 0
.../src => cppapi}/include/atscppapi/AsyncTimer.h | 0
.../atscppapi/CaseInsensitiveStringComparator.h | 0
.../include/atscppapi/ClientRequest.h | 0
.../include/atscppapi/GlobalPlugin.h | 0
.../include/atscppapi/GzipDeflateTransformation.h | 0
.../include/atscppapi/GzipInflateTransformation.h | 0
.../src => cppapi}/include/atscppapi/Headers.h | 0
.../src => cppapi}/include/atscppapi/HttpMethod.h | 0
.../src => cppapi}/include/atscppapi/HttpStatus.h | 0
.../src => cppapi}/include/atscppapi/HttpVersion.h | 0
.../include/atscppapi/InterceptPlugin.h | 0
.../src => cppapi}/include/atscppapi/Logger.h | 0
.../src => cppapi}/include/atscppapi/Mutex.h | 0
.../src => cppapi}/include/atscppapi/Plugin.h | 0
.../src => cppapi}/include/atscppapi/PluginInit.h | 0
.../src => cppapi}/include/atscppapi/RemapPlugin.h | 0
.../src => cppapi}/include/atscppapi/Request.h | 0
.../src => cppapi}/include/atscppapi/Response.h | 0
.../src => cppapi}/include/atscppapi/Stat.h | 0
.../src => cppapi}/include/atscppapi/Transaction.h | 0
.../include/atscppapi/TransactionPlugin.h | 0
.../include/atscppapi/TransformationPlugin.h | 0
.../src => cppapi}/include/atscppapi/Url.h | 0
.../src => cppapi}/include/atscppapi/noncopyable.h | 0
.../src => cppapi}/include/atscppapi/utils.h | 0
.../src => cppapi}/include/logging_internal.h | 0
.../src => cppapi}/include/utils_internal.h | 0
lib/{atscppapi/src => cppapi}/utils.cc | 0
lib/{atscppapi/src => cppapi}/utils_internal.cc | 0
plugins/Makefile.am | 2 +-
plugins/esi/Makefile.inc | 4 +-
plugins/experimental/acme/Makefile.am | 2 +-
plugins/experimental/balancer/Makefile.am | 2 +-
plugins/experimental/buffer_upload/Makefile.am | 2 +-
plugins/experimental/cache_key_genid/Makefile.am | 2 +-
plugins/experimental/cache_promote/Makefile.am | 2 +-
.../experimental/cache_range_requests/Makefile.am | 2 +-
plugins/experimental/cachekey/Makefile.am | 2 +-
.../experimental/collapsed_connection/Makefile.am | 2 +-
.../experimental/collapsed_forwarding/Makefile.am | 2 +-
plugins/experimental/custom_redirect/Makefile.am | 2 +-
plugins/experimental/epic/Makefile.am | 2 +-
plugins/experimental/escalate/Makefile.am | 2 +-
plugins/experimental/geoip_acl/Makefile.am | 2 +-
plugins/experimental/header_freq/Makefile.am | 2 +-
plugins/experimental/header_normalize/Makefile.am | 2 +-
plugins/experimental/hipes/Makefile.am | 2 +-
plugins/experimental/hook-trace/Makefile.am | 2 +-
plugins/experimental/inliner/Makefile.am | 2 +-
plugins/experimental/memcache/Makefile.am | 2 +-
plugins/experimental/memcached_remap/Makefile.am | 2 +-
plugins/experimental/metalink/Makefile.am | 2 +-
plugins/experimental/mp4/Makefile.am | 2 +-
plugins/experimental/multiplexer/Makefile.am | 2 +-
plugins/experimental/mysql_remap/Makefile.am | 2 +-
plugins/experimental/remap_purge/Makefile.am | 2 +-
plugins/experimental/remap_stats/Makefile.am | 2 +-
plugins/experimental/ssl_cert_loader/Makefile.am | 2 +-
plugins/experimental/sslheaders/Makefile.am | 2 +-
.../stale_while_revalidate/Makefile.am | 2 +-
plugins/experimental/stream_editor/Makefile.am | 2 +-
plugins/experimental/ts_lua/Makefile.am | 2 +-
plugins/experimental/url_sig/Makefile.am | 2 +-
plugins/experimental/webp_transform/Makefile.am | 2 +-
97 files changed, 94 insertions(+), 99 deletions(-)
rename lib/{atscppapi/src => cppapi}/AsyncHttpFetch.cc (100%)
rename lib/{atscppapi/src => cppapi}/AsyncTimer.cc (100%)
rename lib/{atscppapi/src => cppapi}/CaseInsensitiveStringComparator.cc (100%)
rename lib/{atscppapi/src => cppapi}/ClientRequest.cc (100%)
rename lib/{atscppapi/src => cppapi}/GlobalPlugin.cc (100%)
rename lib/{atscppapi/src => cppapi}/GzipDeflateTransformation.cc (100%)
rename lib/{atscppapi/src => cppapi}/GzipInflateTransformation.cc (100%)
rename lib/{atscppapi/src => cppapi}/Headers.cc (100%)
rename lib/{atscppapi/src => cppapi}/HttpMethod.cc (100%)
rename lib/{atscppapi/src => cppapi}/HttpVersion.cc (100%)
rename lib/{atscppapi/src => cppapi}/InterceptPlugin.cc (100%)
rename lib/{atscppapi/src => cppapi}/Logger.cc (100%)
rename lib/{atscppapi/src => cppapi}/Makefile.am (71%)
rename lib/{atscppapi/src => cppapi}/Mutex.cc (100%)
rename lib/{atscppapi/src => cppapi}/Plugin.cc (100%)
rename lib/{atscppapi/src => cppapi}/RemapPlugin.cc (100%)
rename lib/{atscppapi/src => cppapi}/Request.cc (100%)
rename lib/{atscppapi/src => cppapi}/Response.cc (100%)
rename lib/{atscppapi/src => cppapi}/Stat.cc (100%)
rename lib/{atscppapi/src => cppapi}/Transaction.cc (100%)
rename lib/{atscppapi/src => cppapi}/TransactionPlugin.cc (100%)
rename lib/{atscppapi/src => cppapi}/TransformationPlugin.cc (100%)
rename lib/{atscppapi/src => cppapi}/Url.cc (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/Async.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/AsyncHttpFetch.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/AsyncTimer.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/CaseInsensitiveStringComparator.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/ClientRequest.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/GlobalPlugin.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/GzipDeflateTransformation.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/GzipInflateTransformation.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/Headers.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/HttpMethod.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/HttpStatus.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/HttpVersion.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/InterceptPlugin.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/Logger.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/Mutex.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/Plugin.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/PluginInit.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/RemapPlugin.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/Request.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/Response.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/Stat.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/Transaction.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/TransactionPlugin.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/TransformationPlugin.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/Url.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/noncopyable.h (100%)
rename lib/{atscppapi/src => cppapi}/include/atscppapi/utils.h (100%)
rename lib/{atscppapi/src => cppapi}/include/logging_internal.h (100%)
rename lib/{atscppapi/src => cppapi}/include/utils_internal.h (100%)
rename lib/{atscppapi/src => cppapi}/utils.cc (100%)
rename lib/{atscppapi/src => cppapi}/utils_internal.cc (100%)
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].
[trafficserver] 01/02: TS-4997: Rename TS_PLUGIN_LDFLAGS to
TS_PLUGIN_LD_FLAGS.
Posted by jp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jpeach pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit dd54c93038c1612b330373d18382fb0c89541bdb
Author: James Peach <jp...@apache.org>
AuthorDate: Mon Oct 24 20:51:24 2016 -0700
TS-4997: Rename TS_PLUGIN_LDFLAGS to TS_PLUGIN_LD_FLAGS.
TS_PLUGIN_LDFLAGS is an automake canonical name so it expects a
root target "TS_PLUGIN". This generates an automake warning if you
don't end up using TS_PLUGIN_LDFLAGS.
---
build/plugins.mk | 4 +++-
example/Makefile.am | 2 +-
plugins/Makefile.am | 2 +-
plugins/esi/Makefile.inc | 4 ++--
plugins/experimental/acme/Makefile.am | 2 +-
plugins/experimental/balancer/Makefile.am | 2 +-
plugins/experimental/buffer_upload/Makefile.am | 2 +-
plugins/experimental/cache_key_genid/Makefile.am | 2 +-
plugins/experimental/cache_promote/Makefile.am | 2 +-
plugins/experimental/cache_range_requests/Makefile.am | 2 +-
plugins/experimental/cachekey/Makefile.am | 2 +-
plugins/experimental/collapsed_connection/Makefile.am | 2 +-
plugins/experimental/collapsed_forwarding/Makefile.am | 2 +-
plugins/experimental/custom_redirect/Makefile.am | 2 +-
plugins/experimental/epic/Makefile.am | 2 +-
plugins/experimental/escalate/Makefile.am | 2 +-
plugins/experimental/geoip_acl/Makefile.am | 2 +-
plugins/experimental/header_freq/Makefile.am | 2 +-
plugins/experimental/header_normalize/Makefile.am | 2 +-
plugins/experimental/hipes/Makefile.am | 2 +-
plugins/experimental/hook-trace/Makefile.am | 2 +-
plugins/experimental/inliner/Makefile.am | 2 +-
plugins/experimental/memcache/Makefile.am | 2 +-
plugins/experimental/memcached_remap/Makefile.am | 2 +-
plugins/experimental/metalink/Makefile.am | 2 +-
plugins/experimental/mp4/Makefile.am | 2 +-
plugins/experimental/multiplexer/Makefile.am | 2 +-
plugins/experimental/mysql_remap/Makefile.am | 2 +-
plugins/experimental/remap_purge/Makefile.am | 2 +-
plugins/experimental/remap_stats/Makefile.am | 2 +-
plugins/experimental/ssl_cert_loader/Makefile.am | 2 +-
plugins/experimental/sslheaders/Makefile.am | 2 +-
plugins/experimental/stale_while_revalidate/Makefile.am | 2 +-
plugins/experimental/stream_editor/Makefile.am | 2 +-
plugins/experimental/ts_lua/Makefile.am | 2 +-
plugins/experimental/url_sig/Makefile.am | 2 +-
plugins/experimental/webp_transform/Makefile.am | 2 +-
37 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/build/plugins.mk b/build/plugins.mk
index 61465a7..69da581 100644
--- a/build/plugins.mk
+++ b/build/plugins.mk
@@ -16,7 +16,9 @@
# plugins.mk: Common automake build variables for Traffic Server plugins.
-TS_PLUGIN_LDFLAGS = \
+# Default plugin LDFLAGS. We don't use TS_PLUGIN_LDFLAGS because
+# that is an automake canonical variable name.
+TS_PLUGIN_LD_FLAGS = \
-module \
-shared \
-avoid-version \
diff --git a/example/Makefile.am b/example/Makefile.am
index c12e0b9..cc7c38d 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
include $(top_srcdir)/build/tidy.mk
AM_CXXFLAGS += -Wno-unused-variable
-AM_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+AM_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
libatscppai = $(top_builddir)/lib/atscppapi/src/libatscppapi.la
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 1ac1b8f..bc9fdfd 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -25,7 +25,7 @@ pkglib_LTLIBRARIES =
SUBDIRS =
-AM_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+AM_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
if BUILD_EXPERIMENTAL_PLUGINS
SUBDIRS += experimental
diff --git a/plugins/esi/Makefile.inc b/plugins/esi/Makefile.inc
index 113f3b1..00a27a5 100644
--- a/plugins/esi/Makefile.inc
+++ b/plugins/esi/Makefile.inc
@@ -99,7 +99,7 @@ esi_esi_la_SOURCES = \
esi_esi_la_CPPFLAGS = $(ESI_CPPFLAGS)
esi_esi_la_CXXFLAGS = $(ESI_CXXFLAGS)
-esi_esi_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+esi_esi_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
esi_esi_la_LIBADD = esi/libesicore.la
esi_combo_handler_la_SOURCES = \
@@ -109,7 +109,7 @@ esi_combo_handler_la_SOURCES = \
esi_combo_handler_la_CPPFLAGS = $(ESI_CPPFLAGS)
esi_combo_handler_la_CXXFLAGS = $(ESI_CXXFLAGS)
-esi_combo_handler_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+esi_combo_handler_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
esi_combo_handler_la_LIBADD = esi/libesicore.la
esi_docnode_test_CPPFLAGS = $(ESI_CPPFLAGS)
diff --git a/plugins/experimental/acme/Makefile.am b/plugins/experimental/acme/Makefile.am
index c1c29bf..2003dff 100644
--- a/plugins/experimental/acme/Makefile.am
+++ b/plugins/experimental/acme/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = acme.la
acme_la_SOURCES = acme.c
-acme_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+acme_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/balancer/Makefile.am b/plugins/experimental/balancer/Makefile.am
index 29d2389..1f6bdd3 100644
--- a/plugins/experimental/balancer/Makefile.am
+++ b/plugins/experimental/balancer/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = balancer.la
balancer_la_SOURCES = balancer.cc roundrobin.cc hash.cc balancer.h
-balancer_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+balancer_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/buffer_upload/Makefile.am b/plugins/experimental/buffer_upload/Makefile.am
index 40cfbcf..e5b4d69 100644
--- a/plugins/experimental/buffer_upload/Makefile.am
+++ b/plugins/experimental/buffer_upload/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = buffer_upload.la
buffer_upload_la_SOURCES = buffer_upload.cc
-buffer_upload_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+buffer_upload_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/cache_key_genid/Makefile.am b/plugins/experimental/cache_key_genid/Makefile.am
index 39601ce..e473f5b 100644
--- a/plugins/experimental/cache_key_genid/Makefile.am
+++ b/plugins/experimental/cache_key_genid/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = cache_key_genid.la
cache_key_genid_la_SOURCES = cache_key_genid.c
-cache_key_genid_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS) $(LIB_KYOTOCABINET)
+cache_key_genid_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS) $(LIB_KYOTOCABINET)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/cache_promote/Makefile.am b/plugins/experimental/cache_promote/Makefile.am
index 0fe88ca..fede4c7 100644
--- a/plugins/experimental/cache_promote/Makefile.am
+++ b/plugins/experimental/cache_promote/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = cache_promote.la
cache_promote_la_SOURCES = cache_promote.cc
-cache_promote_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+cache_promote_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/cache_range_requests/Makefile.am b/plugins/experimental/cache_range_requests/Makefile.am
index 0e6da6c..f5ced31 100644
--- a/plugins/experimental/cache_range_requests/Makefile.am
+++ b/plugins/experimental/cache_range_requests/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = cache_range_requests.la
cache_range_requests_la_SOURCES = cache_range_requests.cc
-cache_range_requests_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+cache_range_requests_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/cachekey/Makefile.am b/plugins/experimental/cachekey/Makefile.am
index 33204f2..7bfda04 100644
--- a/plugins/experimental/cachekey/Makefile.am
+++ b/plugins/experimental/cachekey/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = cachekey.la
cachekey_la_SOURCES = cachekey.cc common.cc configs.cc pattern.cc plugin.cc
-cachekey_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+cachekey_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
VIRTUALENV_DIR = ../../../ci/tsqa/virtualenv
tsqa: $(VIRTUALENV_DIR)
diff --git a/plugins/experimental/collapsed_connection/Makefile.am b/plugins/experimental/collapsed_connection/Makefile.am
index b607075..32b6b32 100644
--- a/plugins/experimental/collapsed_connection/Makefile.am
+++ b/plugins/experimental/collapsed_connection/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = collapsed_connection.la
collapsed_connection_la_SOURCES = collapsed_connection.cc MurmurHash3.cc
-collapsed_connection_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+collapsed_connection_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/collapsed_forwarding/Makefile.am b/plugins/experimental/collapsed_forwarding/Makefile.am
index 4bab549..9561fb7 100644
--- a/plugins/experimental/collapsed_forwarding/Makefile.am
+++ b/plugins/experimental/collapsed_forwarding/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = collapsed_forwarding.la
collapsed_forwarding_la_SOURCES = collapsed_forwarding.cc
-collapsed_forwarding_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+collapsed_forwarding_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/custom_redirect/Makefile.am b/plugins/experimental/custom_redirect/Makefile.am
index 04ad2ef..dfa3e10 100644
--- a/plugins/experimental/custom_redirect/Makefile.am
+++ b/plugins/experimental/custom_redirect/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = custom_redirect.la
custom_redirect_la_SOURCES = custom_redirect.cc
-custom_redirect_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+custom_redirect_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/epic/Makefile.am b/plugins/experimental/epic/Makefile.am
index f172554..2ae65d8 100644
--- a/plugins/experimental/epic/Makefile.am
+++ b/plugins/experimental/epic/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = epic.la
epic_la_SOURCES = epic.cc
-epic_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+epic_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/escalate/Makefile.am b/plugins/experimental/escalate/Makefile.am
index a81c52c..aa608d6 100644
--- a/plugins/experimental/escalate/Makefile.am
+++ b/plugins/experimental/escalate/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = escalate.la
escalate_la_SOURCES = escalate.cc
-escalate_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+escalate_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/geoip_acl/Makefile.am b/plugins/experimental/geoip_acl/Makefile.am
index a5f79c3..b81b4e1 100644
--- a/plugins/experimental/geoip_acl/Makefile.am
+++ b/plugins/experimental/geoip_acl/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = geoip_acl.la
geoip_acl_la_SOURCES = acl.cc geoip_acl.cc
-geoip_acl_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+geoip_acl_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
geoip_acl_la_LIBADD = $(GEO_LIBS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/header_freq/Makefile.am b/plugins/experimental/header_freq/Makefile.am
index 585e570..b83eccd 100644
--- a/plugins/experimental/header_freq/Makefile.am
+++ b/plugins/experimental/header_freq/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = header_freq.la
header_freq_la_SOURCES = header_freq.cc
-header_freq_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+header_freq_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/header_normalize/Makefile.am b/plugins/experimental/header_normalize/Makefile.am
index 3d2999d..31bae14 100644
--- a/plugins/experimental/header_normalize/Makefile.am
+++ b/plugins/experimental/header_normalize/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = header_normalize.la
header_normalize_la_SOURCES = header_normalize.cc
-header_normalize_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+header_normalize_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/hipes/Makefile.am b/plugins/experimental/hipes/Makefile.am
index 2c76a03..075baf1 100644
--- a/plugins/experimental/hipes/Makefile.am
+++ b/plugins/experimental/hipes/Makefile.am
@@ -19,7 +19,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = hipes.la
hipes_la_SOURCES = hipes.cc
-hipes_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+hipes_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/hook-trace/Makefile.am b/plugins/experimental/hook-trace/Makefile.am
index 1622aff..192cd72 100644
--- a/plugins/experimental/hook-trace/Makefile.am
+++ b/plugins/experimental/hook-trace/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = hook-trace.la
hook_trace_la_SOURCES = hook-trace.cc
-hook_trace_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+hook_trace_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/inliner/Makefile.am b/plugins/experimental/inliner/Makefile.am
index 7f2e84c..84dc55a 100644
--- a/plugins/experimental/inliner/Makefile.am
+++ b/plugins/experimental/inliner/Makefile.am
@@ -29,7 +29,7 @@ inliner_la_SOURCES = \
inliner-handler.cc \
ts.cc
-inliner_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+inliner_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/memcache/Makefile.am b/plugins/experimental/memcache/Makefile.am
index 7d5c64c..ae82d77 100644
--- a/plugins/experimental/memcache/Makefile.am
+++ b/plugins/experimental/memcache/Makefile.am
@@ -32,7 +32,7 @@ pkglib_LTLIBRARIES = tsmemcache.la
tsmemcache_la_SOURCES = \
tsmemcache.cc
-tsmemcache_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+tsmemcache_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/memcached_remap/Makefile.am b/plugins/experimental/memcached_remap/Makefile.am
index 9284ac5..92e299e 100644
--- a/plugins/experimental/memcached_remap/Makefile.am
+++ b/plugins/experimental/memcached_remap/Makefile.am
@@ -22,7 +22,7 @@ AM_CXXFLAGS += $(LIBMEMCACHED_CFLAGS)
pkglib_LTLIBRARIES = memcached_remap.la
memcached_remap_la_SOURCES = memcached_remap.cc
-memcached_remap_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+memcached_remap_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
memcached_remap_la_LIBADD = $(LIBMEMCACHED_LIBS)
endif
diff --git a/plugins/experimental/metalink/Makefile.am b/plugins/experimental/metalink/Makefile.am
index 0938ca3..e42bb55 100644
--- a/plugins/experimental/metalink/Makefile.am
+++ b/plugins/experimental/metalink/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = metalink.la
metalink_la_SOURCES = metalink.cc
-metalink_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+metalink_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/mp4/Makefile.am b/plugins/experimental/mp4/Makefile.am
index 28410ca..cc7117e 100644
--- a/plugins/experimental/mp4/Makefile.am
+++ b/plugins/experimental/mp4/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = mp4.la
mp4_la_SOURCES = mp4.cc mp4_common.h mp4_meta.cc mp4_meta.h
-mp4_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+mp4_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/multiplexer/Makefile.am b/plugins/experimental/multiplexer/Makefile.am
index 0ec912a..f0535dc 100644
--- a/plugins/experimental/multiplexer/Makefile.am
+++ b/plugins/experimental/multiplexer/Makefile.am
@@ -29,7 +29,7 @@ multiplexer_la_SOURCES = \
post.cc \
ts.cc
-multiplexer_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+multiplexer_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/mysql_remap/Makefile.am b/plugins/experimental/mysql_remap/Makefile.am
index 1ac484c..af178f9 100644
--- a/plugins/experimental/mysql_remap/Makefile.am
+++ b/plugins/experimental/mysql_remap/Makefile.am
@@ -28,7 +28,7 @@ libmysql_remap_la_SOURCES = \
lib/dictionary.c \
lib/iniparser.c
-mysql_remap_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS) $(LIB_MYSQLCLIENT)
+mysql_remap_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS) $(LIB_MYSQLCLIENT)
mysql_remap_la_LIBADD = libmysql_remap.la
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/remap_purge/Makefile.am b/plugins/experimental/remap_purge/Makefile.am
index 5b03bfb..9ffcb1a 100644
--- a/plugins/experimental/remap_purge/Makefile.am
+++ b/plugins/experimental/remap_purge/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = remap_purge.la
remap_purge_la_SOURCES = remap_purge.c
-remap_purge_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+remap_purge_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
tidy-local: $(DIST_SOURCES)
$(CC_Clang_Tidy)
diff --git a/plugins/experimental/remap_stats/Makefile.am b/plugins/experimental/remap_stats/Makefile.am
index ba54f5b..3bd00ac 100644
--- a/plugins/experimental/remap_stats/Makefile.am
+++ b/plugins/experimental/remap_stats/Makefile.am
@@ -20,7 +20,7 @@ if BUILD_REMAP_STATS_PLUGIN
pkglib_LTLIBRARIES = remap_stats.la
remap_stats_la_SOURCES = remap_stats.c
-remap_stats_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+remap_stats_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
endif
diff --git a/plugins/experimental/ssl_cert_loader/Makefile.am b/plugins/experimental/ssl_cert_loader/Makefile.am
index f1b89e2..5a652db 100644
--- a/plugins/experimental/ssl_cert_loader/Makefile.am
+++ b/plugins/experimental/ssl_cert_loader/Makefile.am
@@ -21,7 +21,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_srcdir)/lib/ts
pkglib_LTLIBRARIES = ssl_cert_loader.la
ssl_cert_loader_la_SOURCES = ssl-cert-loader.cc domain-tree.cc
-ssl_cert_loader_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+ssl_cert_loader_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
ssl_cert_loader_la_LIBADD = $(top_builddir)/lib/tsconfig/libtsconfig.la
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/sslheaders/Makefile.am b/plugins/experimental/sslheaders/Makefile.am
index 90f5d32..7fa88ee 100644
--- a/plugins/experimental/sslheaders/Makefile.am
+++ b/plugins/experimental/sslheaders/Makefile.am
@@ -25,7 +25,7 @@ check_PROGRAMS = test_sslheaders
libsslhdr_la_SOURCES = sslheaders.h expand.cc util.cc
sslheaders_la_SOURCES = sslheaders.cc sslheaders.h
-sslheaders_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+sslheaders_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
sslheaders_la_LIBADD = libsslhdr.la
test_sslheaders_SOURCES = test_sslheaders.cc sslheaders.h
diff --git a/plugins/experimental/stale_while_revalidate/Makefile.am b/plugins/experimental/stale_while_revalidate/Makefile.am
index 10e1835..68651c7 100644
--- a/plugins/experimental/stale_while_revalidate/Makefile.am
+++ b/plugins/experimental/stale_while_revalidate/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = stale_while_revalidate.la
stale_while_revalidate_la_SOURCES = stale_while_revalidate.c
-stale_while_revalidate_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+stale_while_revalidate_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/stream_editor/Makefile.am b/plugins/experimental/stream_editor/Makefile.am
index 597a96f..20d4bc2 100644
--- a/plugins/experimental/stream_editor/Makefile.am
+++ b/plugins/experimental/stream_editor/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = stream_editor.la
stream_editor_la_SOURCES = stream_editor.cc
-stream_editor_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+stream_editor_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/ts_lua/Makefile.am b/plugins/experimental/ts_lua/Makefile.am
index 0ad2245..6c4270c 100644
--- a/plugins/experimental/ts_lua/Makefile.am
+++ b/plugins/experimental/ts_lua/Makefile.am
@@ -51,7 +51,7 @@ tslua_la_SOURCES = \
ts_lua_fetch.c \
ts_lua_constant.c
-tslua_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+tslua_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/url_sig/Makefile.am b/plugins/experimental/url_sig/Makefile.am
index fb0e011..f2734dd 100644
--- a/plugins/experimental/url_sig/Makefile.am
+++ b/plugins/experimental/url_sig/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/build/plugins.mk
pkglib_LTLIBRARIES = url_sig.la
url_sig_la_SOURCES = url_sig.c
-url_sig_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS)
+url_sig_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
include $(top_srcdir)/build/tidy.mk
diff --git a/plugins/experimental/webp_transform/Makefile.am b/plugins/experimental/webp_transform/Makefile.am
index 9805f08..c89b216 100644
--- a/plugins/experimental/webp_transform/Makefile.am
+++ b/plugins/experimental/webp_transform/Makefile.am
@@ -26,7 +26,7 @@ pkglib_LTLIBRARIES = WebpTransform.la
WebpTransform_la_SOURCES = ImageTransform.cc
WebpTransform_la_LDFLAGS = \
- $(TS_PLUGIN_LDFLAGS) \
+ $(TS_PLUGIN_LD_FLAGS) \
-L$(top_builddir)/lib/atscppapi/src
WebpTransform_la_LIBADD = \
-latscppapi \
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 02/02: TS-4997: Move the C++ API to lib/cppapi.
Posted by jp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jpeach pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 32d2ee6d338fdb3c8ff7fbbe00fa977382dbd111
Author: James Peach <jp...@apache.org>
AuthorDate: Mon Oct 24 20:39:26 2016 -0700
TS-4997: Move the C++ API to lib/cppapi.
---
Makefile.am | 2 +-
NOTICE | 2 +-
README | 2 +-
build/plugins.mk | 4 +-
configure.ac | 3 +-
doc/Doxyfile | 2 +-
example/Makefile.am | 2 +-
lib/Makefile.am | 2 +-
lib/{atscppapi/src => cppapi}/AsyncHttpFetch.cc | 0
lib/{atscppapi/src => cppapi}/AsyncTimer.cc | 0
.../CaseInsensitiveStringComparator.cc | 0
lib/{atscppapi/src => cppapi}/ClientRequest.cc | 0
lib/{atscppapi/src => cppapi}/GlobalPlugin.cc | 0
.../src => cppapi}/GzipDeflateTransformation.cc | 0
.../src => cppapi}/GzipInflateTransformation.cc | 0
lib/{atscppapi/src => cppapi}/Headers.cc | 0
lib/{atscppapi/src => cppapi}/HttpMethod.cc | 0
lib/{atscppapi/src => cppapi}/HttpVersion.cc | 0
lib/{atscppapi/src => cppapi}/InterceptPlugin.cc | 0
lib/{atscppapi/src => cppapi}/Logger.cc | 0
lib/{atscppapi/src => cppapi}/Makefile.am | 96 ++++++++++------------
lib/{atscppapi/src => cppapi}/Mutex.cc | 0
lib/{atscppapi/src => cppapi}/Plugin.cc | 0
lib/{atscppapi/src => cppapi}/RemapPlugin.cc | 0
lib/{atscppapi/src => cppapi}/Request.cc | 0
lib/{atscppapi/src => cppapi}/Response.cc | 0
lib/{atscppapi/src => cppapi}/Stat.cc | 0
lib/{atscppapi/src => cppapi}/Transaction.cc | 0
lib/{atscppapi/src => cppapi}/TransactionPlugin.cc | 0
.../src => cppapi}/TransformationPlugin.cc | 0
lib/{atscppapi/src => cppapi}/Url.cc | 0
.../src => cppapi}/include/atscppapi/Async.h | 0
.../include/atscppapi/AsyncHttpFetch.h | 0
.../src => cppapi}/include/atscppapi/AsyncTimer.h | 0
.../atscppapi/CaseInsensitiveStringComparator.h | 0
.../include/atscppapi/ClientRequest.h | 0
.../include/atscppapi/GlobalPlugin.h | 0
.../include/atscppapi/GzipDeflateTransformation.h | 0
.../include/atscppapi/GzipInflateTransformation.h | 0
.../src => cppapi}/include/atscppapi/Headers.h | 0
.../src => cppapi}/include/atscppapi/HttpMethod.h | 0
.../src => cppapi}/include/atscppapi/HttpStatus.h | 0
.../src => cppapi}/include/atscppapi/HttpVersion.h | 0
.../include/atscppapi/InterceptPlugin.h | 0
.../src => cppapi}/include/atscppapi/Logger.h | 0
.../src => cppapi}/include/atscppapi/Mutex.h | 0
.../src => cppapi}/include/atscppapi/Plugin.h | 0
.../src => cppapi}/include/atscppapi/PluginInit.h | 0
.../src => cppapi}/include/atscppapi/RemapPlugin.h | 0
.../src => cppapi}/include/atscppapi/Request.h | 0
.../src => cppapi}/include/atscppapi/Response.h | 0
.../src => cppapi}/include/atscppapi/Stat.h | 0
.../src => cppapi}/include/atscppapi/Transaction.h | 0
.../include/atscppapi/TransactionPlugin.h | 0
.../include/atscppapi/TransformationPlugin.h | 0
.../src => cppapi}/include/atscppapi/Url.h | 0
.../src => cppapi}/include/atscppapi/noncopyable.h | 0
.../src => cppapi}/include/atscppapi/utils.h | 0
.../src => cppapi}/include/logging_internal.h | 0
.../src => cppapi}/include/utils_internal.h | 0
lib/{atscppapi/src => cppapi}/utils.cc | 0
lib/{atscppapi/src => cppapi}/utils_internal.cc | 0
62 files changed, 54 insertions(+), 61 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8ad3069..12de2d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,7 +121,7 @@ clang-format-iocore:
@$(top_srcdir)/tools/clang-format.sh $(top_srcdir)/iocore
clang-format-lib:
- @$(top_srcdir)/tools/clang-format.sh $(top_srcdir)/lib/atscppapi
+ @$(top_srcdir)/tools/clang-format.sh $(top_srcdir)/lib/cppapi
@$(top_srcdir)/tools/clang-format.sh $(top_srcdir)/lib/bindings
@$(top_srcdir)/tools/clang-format.sh $(top_srcdir)/lib/raft
@$(top_srcdir)/tools/clang-format.sh $(top_srcdir)/lib/records
diff --git a/NOTICE b/NOTICE
index 3e8ae3d..5feedac 100644
--- a/NOTICE
+++ b/NOTICE
@@ -45,7 +45,7 @@ Copyright (C) 2013 GoDaddy Operating Company, LLC
~~~
-lib/atscppapi developed by LinkedIn
+lib/cppapi developed by LinkedIn
Copyright (c) 2013 LinkedIn
~~~
diff --git a/README b/README
index 630b8d3..34ea77e 100644
--- a/README
+++ b/README
@@ -34,7 +34,7 @@ plugins to build large scale web applications.
|-- hostdb/ ........ Internal DNS cache
|-- net/ ........... Network
|-- lib/ ...............
- |-- atscppapi/ ....... C++ api wrapper for plugin developers
+ |-- cppapi/ ........ C++ api wrapper for plugin developers
|-- records/ ....... library for config files
|-- perl/ .......... Perl libraries for e.g. mgmt access and configurations
|-- ts/ ............ Base / core library
diff --git a/build/plugins.mk b/build/plugins.mk
index 69da581..b466f77 100644
--- a/build/plugins.mk
+++ b/build/plugins.mk
@@ -27,8 +27,8 @@ TS_PLUGIN_LD_FLAGS = \
TS_PLUGIN_CPPFLAGS = \
-I$(top_builddir)/proxy/api \
-I$(top_srcdir)/proxy/api \
- -I$(top_srcdir)/lib/atscppapi/src/include \
- -I$(top_builddir)/lib/atscppapi/src/include \
+ -I$(top_srcdir)/lib/cppapi/include \
+ -I$(top_builddir)/lib/cppapi/include \
-I$(top_srcdir)/lib
# Provide a default AM_CPPFLAGS. Automake handles this correctly, but libtool
diff --git a/configure.ac b/configure.ac
index 890d4a7..9d62b4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1862,8 +1862,7 @@ AC_CONFIG_FILES([
iocore/net/Makefile
iocore/utils/Makefile
lib/Makefile
- lib/atscppapi/Makefile
- lib/atscppapi/src/Makefile
+ lib/cppapi/Makefile
lib/bindings/Makefile
lib/perl/Makefile
lib/perl/lib/Apache/TS.pm
diff --git a/doc/Doxyfile b/doc/Doxyfile
index e1d87d0..5eb7b83 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -753,7 +753,7 @@ WARN_LOGFILE =
INPUT = mainpage.doc \
../iocore \
- ../lib/atscppapi/src/include/atscppapi \
+ ../lib/cppapi/include/atscppapi \
../lib/records \
../lib/ts \
../lib/tsconfig \
diff --git a/example/Makefile.am b/example/Makefile.am
index cc7c38d..ec414b0 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/build/tidy.mk
AM_CXXFLAGS += -Wno-unused-variable
AM_LDFLAGS = $(TS_PLUGIN_LD_FLAGS)
-libatscppai = $(top_builddir)/lib/atscppapi/src/libatscppapi.la
+libatscppai = $(top_builddir)/lib/cppapi/libatscppapi.la
example_Plugins = \
add-header.la \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c0a6389..aa11fc0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = ts records tsconfig bindings atscppapi
+SUBDIRS = ts records tsconfig bindings cppapi
if BUILD_PERL_LIB
SUBDIRS += perl
diff --git a/lib/atscppapi/src/AsyncHttpFetch.cc b/lib/cppapi/AsyncHttpFetch.cc
similarity index 100%
rename from lib/atscppapi/src/AsyncHttpFetch.cc
rename to lib/cppapi/AsyncHttpFetch.cc
diff --git a/lib/atscppapi/src/AsyncTimer.cc b/lib/cppapi/AsyncTimer.cc
similarity index 100%
rename from lib/atscppapi/src/AsyncTimer.cc
rename to lib/cppapi/AsyncTimer.cc
diff --git a/lib/atscppapi/src/CaseInsensitiveStringComparator.cc b/lib/cppapi/CaseInsensitiveStringComparator.cc
similarity index 100%
rename from lib/atscppapi/src/CaseInsensitiveStringComparator.cc
rename to lib/cppapi/CaseInsensitiveStringComparator.cc
diff --git a/lib/atscppapi/src/ClientRequest.cc b/lib/cppapi/ClientRequest.cc
similarity index 100%
rename from lib/atscppapi/src/ClientRequest.cc
rename to lib/cppapi/ClientRequest.cc
diff --git a/lib/atscppapi/src/GlobalPlugin.cc b/lib/cppapi/GlobalPlugin.cc
similarity index 100%
rename from lib/atscppapi/src/GlobalPlugin.cc
rename to lib/cppapi/GlobalPlugin.cc
diff --git a/lib/atscppapi/src/GzipDeflateTransformation.cc b/lib/cppapi/GzipDeflateTransformation.cc
similarity index 100%
rename from lib/atscppapi/src/GzipDeflateTransformation.cc
rename to lib/cppapi/GzipDeflateTransformation.cc
diff --git a/lib/atscppapi/src/GzipInflateTransformation.cc b/lib/cppapi/GzipInflateTransformation.cc
similarity index 100%
rename from lib/atscppapi/src/GzipInflateTransformation.cc
rename to lib/cppapi/GzipInflateTransformation.cc
diff --git a/lib/atscppapi/src/Headers.cc b/lib/cppapi/Headers.cc
similarity index 100%
rename from lib/atscppapi/src/Headers.cc
rename to lib/cppapi/Headers.cc
diff --git a/lib/atscppapi/src/HttpMethod.cc b/lib/cppapi/HttpMethod.cc
similarity index 100%
rename from lib/atscppapi/src/HttpMethod.cc
rename to lib/cppapi/HttpMethod.cc
diff --git a/lib/atscppapi/src/HttpVersion.cc b/lib/cppapi/HttpVersion.cc
similarity index 100%
rename from lib/atscppapi/src/HttpVersion.cc
rename to lib/cppapi/HttpVersion.cc
diff --git a/lib/atscppapi/src/InterceptPlugin.cc b/lib/cppapi/InterceptPlugin.cc
similarity index 100%
rename from lib/atscppapi/src/InterceptPlugin.cc
rename to lib/cppapi/InterceptPlugin.cc
diff --git a/lib/atscppapi/src/Logger.cc b/lib/cppapi/Logger.cc
similarity index 100%
rename from lib/atscppapi/src/Logger.cc
rename to lib/cppapi/Logger.cc
diff --git a/lib/atscppapi/src/Makefile.am b/lib/cppapi/Makefile.am
similarity index 71%
rename from lib/atscppapi/src/Makefile.am
rename to lib/cppapi/Makefile.am
index 8e6c118..988fef3 100644
--- a/lib/atscppapi/src/Makefile.am
+++ b/lib/cppapi/Makefile.am
@@ -15,74 +15,68 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AM_CPPFLAGS = \
- -I$(top_srcdir)/$(subdir)/include \
- -I$(top_builddir)/$(subdir)/include \
- -I$(top_builddir)/proxy/api \
- -I$(top_srcdir)/proxy/api \
- -I$(top_srcdir)/lib
+include $(top_srcdir)/build/plugins.mk
-
-# build the library
lib_LTLIBRARIES = libatscppapi.la
libatscppapi_la_LDFLAGS=-lz -lpthread -version-info @TS_LIBTOOL_VERSION@
-libatscppapi_la_SOURCES = GlobalPlugin.cc \
- Plugin.cc \
- utils.cc \
- utils_internal.cc \
- Transaction.cc \
- TransactionPlugin.cc \
- Headers.cc \
- Request.cc \
- CaseInsensitiveStringComparator.cc \
- ClientRequest.cc \
- Url.cc \
- HttpVersion.cc \
- HttpMethod.cc \
- Response.cc \
- TransformationPlugin.cc \
- Logger.cc \
- Stat.cc \
- AsyncHttpFetch.cc \
- RemapPlugin.cc \
- GzipDeflateTransformation.cc \
- GzipInflateTransformation.cc \
- AsyncTimer.cc \
- InterceptPlugin.cc \
- Mutex.cc
+libatscppapi_la_SOURCES = \
+ AsyncHttpFetch.cc \
+ AsyncTimer.cc \
+ CaseInsensitiveStringComparator.cc \
+ ClientRequest.cc \
+ GlobalPlugin.cc \
+ GzipDeflateTransformation.cc \
+ GzipInflateTransformation.cc \
+ Headers.cc \
+ HttpMethod.cc \
+ HttpVersion.cc \
+ InterceptPlugin.cc \
+ Logger.cc \
+ Mutex.cc \
+ Plugin.cc \
+ RemapPlugin.cc \
+ Request.cc \
+ Response.cc \
+ Stat.cc \
+ Transaction.cc \
+ TransactionPlugin.cc \
+ TransformationPlugin.cc \
+ Url.cc \
+ utils.cc \
+ utils_internal.cc
library_includedir=$(includedir)/atscppapi
base_include_folder = $(top_srcdir)/$(subdir)/include/atscppapi
library_include_HEADERS = \
+ $(base_include_folder)/Async.h \
+ $(base_include_folder)/AsyncHttpFetch.h \
+ $(base_include_folder)/AsyncTimer.h \
+ $(base_include_folder)/CaseInsensitiveStringComparator.h \
+ $(base_include_folder)/ClientRequest.h \
$(base_include_folder)/GlobalPlugin.h \
- $(base_include_folder)/Plugin.h \
- $(base_include_folder)/PluginInit.h \
- $(base_include_folder)/Transaction.h \
- $(base_include_folder)/TransactionPlugin.h \
+ $(base_include_folder)/GzipDeflateTransformation.h \
+ $(base_include_folder)/GzipInflateTransformation.h \
+ $(base_include_folder)/Headers.h \
$(base_include_folder)/HttpMethod.h \
$(base_include_folder)/HttpStatus.h \
$(base_include_folder)/HttpVersion.h \
- $(base_include_folder)/Headers.h \
+ $(base_include_folder)/InterceptPlugin.h \
+ $(base_include_folder)/Logger.h \
+ $(base_include_folder)/Mutex.h \
+ $(base_include_folder)/Plugin.h \
+ $(base_include_folder)/PluginInit.h \
+ $(base_include_folder)/RemapPlugin.h \
$(base_include_folder)/Request.h \
- $(base_include_folder)/CaseInsensitiveStringComparator.h \
- $(base_include_folder)/ClientRequest.h \
- $(base_include_folder)/Url.h \
$(base_include_folder)/Response.h \
- $(base_include_folder)/utils.h \
+ $(base_include_folder)/Stat.h \
+ $(base_include_folder)/Transaction.h \
+ $(base_include_folder)/TransactionPlugin.h \
$(base_include_folder)/TransformationPlugin.h \
- $(base_include_folder)/Logger.h \
+ $(base_include_folder)/Url.h \
$(base_include_folder)/noncopyable.h \
- $(base_include_folder)/Stat.h \
- $(base_include_folder)/Mutex.h \
- $(base_include_folder)/RemapPlugin.h \
- $(base_include_folder)/Async.h \
- $(base_include_folder)/AsyncHttpFetch.h \
- $(base_include_folder)/GzipDeflateTransformation.h \
- $(base_include_folder)/GzipInflateTransformation.h \
- $(base_include_folder)/AsyncTimer.h \
- $(base_include_folder)/InterceptPlugin.h
+ $(base_include_folder)/utils.h
include $(top_srcdir)/build/tidy.mk
diff --git a/lib/atscppapi/src/Mutex.cc b/lib/cppapi/Mutex.cc
similarity index 100%
rename from lib/atscppapi/src/Mutex.cc
rename to lib/cppapi/Mutex.cc
diff --git a/lib/atscppapi/src/Plugin.cc b/lib/cppapi/Plugin.cc
similarity index 100%
rename from lib/atscppapi/src/Plugin.cc
rename to lib/cppapi/Plugin.cc
diff --git a/lib/atscppapi/src/RemapPlugin.cc b/lib/cppapi/RemapPlugin.cc
similarity index 100%
rename from lib/atscppapi/src/RemapPlugin.cc
rename to lib/cppapi/RemapPlugin.cc
diff --git a/lib/atscppapi/src/Request.cc b/lib/cppapi/Request.cc
similarity index 100%
rename from lib/atscppapi/src/Request.cc
rename to lib/cppapi/Request.cc
diff --git a/lib/atscppapi/src/Response.cc b/lib/cppapi/Response.cc
similarity index 100%
rename from lib/atscppapi/src/Response.cc
rename to lib/cppapi/Response.cc
diff --git a/lib/atscppapi/src/Stat.cc b/lib/cppapi/Stat.cc
similarity index 100%
rename from lib/atscppapi/src/Stat.cc
rename to lib/cppapi/Stat.cc
diff --git a/lib/atscppapi/src/Transaction.cc b/lib/cppapi/Transaction.cc
similarity index 100%
rename from lib/atscppapi/src/Transaction.cc
rename to lib/cppapi/Transaction.cc
diff --git a/lib/atscppapi/src/TransactionPlugin.cc b/lib/cppapi/TransactionPlugin.cc
similarity index 100%
rename from lib/atscppapi/src/TransactionPlugin.cc
rename to lib/cppapi/TransactionPlugin.cc
diff --git a/lib/atscppapi/src/TransformationPlugin.cc b/lib/cppapi/TransformationPlugin.cc
similarity index 100%
rename from lib/atscppapi/src/TransformationPlugin.cc
rename to lib/cppapi/TransformationPlugin.cc
diff --git a/lib/atscppapi/src/Url.cc b/lib/cppapi/Url.cc
similarity index 100%
rename from lib/atscppapi/src/Url.cc
rename to lib/cppapi/Url.cc
diff --git a/lib/atscppapi/src/include/atscppapi/Async.h b/lib/cppapi/include/atscppapi/Async.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/Async.h
rename to lib/cppapi/include/atscppapi/Async.h
diff --git a/lib/atscppapi/src/include/atscppapi/AsyncHttpFetch.h b/lib/cppapi/include/atscppapi/AsyncHttpFetch.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/AsyncHttpFetch.h
rename to lib/cppapi/include/atscppapi/AsyncHttpFetch.h
diff --git a/lib/atscppapi/src/include/atscppapi/AsyncTimer.h b/lib/cppapi/include/atscppapi/AsyncTimer.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/AsyncTimer.h
rename to lib/cppapi/include/atscppapi/AsyncTimer.h
diff --git a/lib/atscppapi/src/include/atscppapi/CaseInsensitiveStringComparator.h b/lib/cppapi/include/atscppapi/CaseInsensitiveStringComparator.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/CaseInsensitiveStringComparator.h
rename to lib/cppapi/include/atscppapi/CaseInsensitiveStringComparator.h
diff --git a/lib/atscppapi/src/include/atscppapi/ClientRequest.h b/lib/cppapi/include/atscppapi/ClientRequest.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/ClientRequest.h
rename to lib/cppapi/include/atscppapi/ClientRequest.h
diff --git a/lib/atscppapi/src/include/atscppapi/GlobalPlugin.h b/lib/cppapi/include/atscppapi/GlobalPlugin.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/GlobalPlugin.h
rename to lib/cppapi/include/atscppapi/GlobalPlugin.h
diff --git a/lib/atscppapi/src/include/atscppapi/GzipDeflateTransformation.h b/lib/cppapi/include/atscppapi/GzipDeflateTransformation.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/GzipDeflateTransformation.h
rename to lib/cppapi/include/atscppapi/GzipDeflateTransformation.h
diff --git a/lib/atscppapi/src/include/atscppapi/GzipInflateTransformation.h b/lib/cppapi/include/atscppapi/GzipInflateTransformation.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/GzipInflateTransformation.h
rename to lib/cppapi/include/atscppapi/GzipInflateTransformation.h
diff --git a/lib/atscppapi/src/include/atscppapi/Headers.h b/lib/cppapi/include/atscppapi/Headers.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/Headers.h
rename to lib/cppapi/include/atscppapi/Headers.h
diff --git a/lib/atscppapi/src/include/atscppapi/HttpMethod.h b/lib/cppapi/include/atscppapi/HttpMethod.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/HttpMethod.h
rename to lib/cppapi/include/atscppapi/HttpMethod.h
diff --git a/lib/atscppapi/src/include/atscppapi/HttpStatus.h b/lib/cppapi/include/atscppapi/HttpStatus.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/HttpStatus.h
rename to lib/cppapi/include/atscppapi/HttpStatus.h
diff --git a/lib/atscppapi/src/include/atscppapi/HttpVersion.h b/lib/cppapi/include/atscppapi/HttpVersion.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/HttpVersion.h
rename to lib/cppapi/include/atscppapi/HttpVersion.h
diff --git a/lib/atscppapi/src/include/atscppapi/InterceptPlugin.h b/lib/cppapi/include/atscppapi/InterceptPlugin.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/InterceptPlugin.h
rename to lib/cppapi/include/atscppapi/InterceptPlugin.h
diff --git a/lib/atscppapi/src/include/atscppapi/Logger.h b/lib/cppapi/include/atscppapi/Logger.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/Logger.h
rename to lib/cppapi/include/atscppapi/Logger.h
diff --git a/lib/atscppapi/src/include/atscppapi/Mutex.h b/lib/cppapi/include/atscppapi/Mutex.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/Mutex.h
rename to lib/cppapi/include/atscppapi/Mutex.h
diff --git a/lib/atscppapi/src/include/atscppapi/Plugin.h b/lib/cppapi/include/atscppapi/Plugin.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/Plugin.h
rename to lib/cppapi/include/atscppapi/Plugin.h
diff --git a/lib/atscppapi/src/include/atscppapi/PluginInit.h b/lib/cppapi/include/atscppapi/PluginInit.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/PluginInit.h
rename to lib/cppapi/include/atscppapi/PluginInit.h
diff --git a/lib/atscppapi/src/include/atscppapi/RemapPlugin.h b/lib/cppapi/include/atscppapi/RemapPlugin.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/RemapPlugin.h
rename to lib/cppapi/include/atscppapi/RemapPlugin.h
diff --git a/lib/atscppapi/src/include/atscppapi/Request.h b/lib/cppapi/include/atscppapi/Request.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/Request.h
rename to lib/cppapi/include/atscppapi/Request.h
diff --git a/lib/atscppapi/src/include/atscppapi/Response.h b/lib/cppapi/include/atscppapi/Response.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/Response.h
rename to lib/cppapi/include/atscppapi/Response.h
diff --git a/lib/atscppapi/src/include/atscppapi/Stat.h b/lib/cppapi/include/atscppapi/Stat.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/Stat.h
rename to lib/cppapi/include/atscppapi/Stat.h
diff --git a/lib/atscppapi/src/include/atscppapi/Transaction.h b/lib/cppapi/include/atscppapi/Transaction.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/Transaction.h
rename to lib/cppapi/include/atscppapi/Transaction.h
diff --git a/lib/atscppapi/src/include/atscppapi/TransactionPlugin.h b/lib/cppapi/include/atscppapi/TransactionPlugin.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/TransactionPlugin.h
rename to lib/cppapi/include/atscppapi/TransactionPlugin.h
diff --git a/lib/atscppapi/src/include/atscppapi/TransformationPlugin.h b/lib/cppapi/include/atscppapi/TransformationPlugin.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/TransformationPlugin.h
rename to lib/cppapi/include/atscppapi/TransformationPlugin.h
diff --git a/lib/atscppapi/src/include/atscppapi/Url.h b/lib/cppapi/include/atscppapi/Url.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/Url.h
rename to lib/cppapi/include/atscppapi/Url.h
diff --git a/lib/atscppapi/src/include/atscppapi/noncopyable.h b/lib/cppapi/include/atscppapi/noncopyable.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/noncopyable.h
rename to lib/cppapi/include/atscppapi/noncopyable.h
diff --git a/lib/atscppapi/src/include/atscppapi/utils.h b/lib/cppapi/include/atscppapi/utils.h
similarity index 100%
rename from lib/atscppapi/src/include/atscppapi/utils.h
rename to lib/cppapi/include/atscppapi/utils.h
diff --git a/lib/atscppapi/src/include/logging_internal.h b/lib/cppapi/include/logging_internal.h
similarity index 100%
rename from lib/atscppapi/src/include/logging_internal.h
rename to lib/cppapi/include/logging_internal.h
diff --git a/lib/atscppapi/src/include/utils_internal.h b/lib/cppapi/include/utils_internal.h
similarity index 100%
rename from lib/atscppapi/src/include/utils_internal.h
rename to lib/cppapi/include/utils_internal.h
diff --git a/lib/atscppapi/src/utils.cc b/lib/cppapi/utils.cc
similarity index 100%
rename from lib/atscppapi/src/utils.cc
rename to lib/cppapi/utils.cc
diff --git a/lib/atscppapi/src/utils_internal.cc b/lib/cppapi/utils_internal.cc
similarity index 100%
rename from lib/atscppapi/src/utils_internal.cc
rename to lib/cppapi/utils_internal.cc
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.