You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2016/10/26 17:23:14 UTC
[trafficserver] branch master updated (d5c81c1 -> 79a2f8f)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a change to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git.
from d5c81c1 TS-5000: Moves experimental plugins to the new include mechanism
new eb3aa29 TS-5000: Move sslheaders into the non-recursive plugins build.
new 79a2f8f TS-5000: Move mysql_remap into the non-recursive plugins build.
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:
configure.ac | 3 --
plugins/Makefile.am | 9 +++-
plugins/experimental/Makefile.am | 27 ----------
plugins/experimental/mysql_remap/Makefile.am | 37 --------------
.../{inliner => mysql_remap}/Makefile.inc | 20 ++++----
plugins/experimental/sslheaders/Makefile.am | 45 -----------------
plugins/experimental/sslheaders/Makefile.inc | 59 ++++++++++++++++++++++
7 files changed, 77 insertions(+), 123 deletions(-)
delete mode 100644 plugins/experimental/Makefile.am
delete mode 100644 plugins/experimental/mysql_remap/Makefile.am
copy plugins/experimental/{inliner => mysql_remap}/Makefile.inc (63%)
delete mode 100644 plugins/experimental/sslheaders/Makefile.am
create mode 100644 plugins/experimental/sslheaders/Makefile.inc
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].
[trafficserver] 01/02: TS-5000: Move sslheaders into the
non-recursive plugins build.
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit eb3aa29fb9d0c27ca5c36bec196c167f9cca862c
Author: James Peach <jp...@apache.org>
AuthorDate: Wed Oct 26 09:43:39 2016 -0700
TS-5000: Move sslheaders into the non-recursive plugins build.
---
configure.ac | 1 -
plugins/Makefile.am | 4 ++
plugins/experimental/Makefile.am | 3 +-
plugins/experimental/sslheaders/Makefile.am | 45 ---------------------
plugins/experimental/sslheaders/Makefile.inc | 59 ++++++++++++++++++++++++++++
5 files changed, 64 insertions(+), 48 deletions(-)
diff --git a/configure.ac b/configure.ac
index 369818c..e60854d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1880,7 +1880,6 @@ AC_CONFIG_FILES([
plugins/Makefile
plugins/experimental/Makefile
plugins/experimental/mysql_remap/Makefile
- plugins/experimental/sslheaders/Makefile
proxy/Makefile
proxy/api/ts/Makefile
proxy/config/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 38c3147..0fe336b 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -44,6 +44,7 @@ include tcpinfo/Makefile.inc
include xdebug/Makefile.inc
if BUILD_EXPERIMENTAL_PLUGINS
+
include experimental/acme/Makefile.inc
include experimental/balancer/Makefile.inc
include experimental/buffer_upload/Makefile.inc
@@ -67,6 +68,7 @@ include experimental/mp4/Makefile.inc
include experimental/multiplexer/Makefile.inc
include experimental/remap_purge/Makefile.inc
include experimental/ssl_cert_loader/Makefile.inc
+include experimental/sslheaders/Makefile.inc
include experimental/stale_while_revalidate/Makefile.inc
include experimental/stream_editor/Makefile.inc
include experimental/ts_lua/Makefile.inc
@@ -91,6 +93,8 @@ endif
SUBDIRS += experimental
endif
+TESTS_ENVIRONMENT = LSAN_OPTIONS=suppressions=suppression.txt
+
TESTS = $(check_PROGRAMS)
tidy-local: $(DIST_SOURCES)
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am
index f81af00..fb53a83 100644
--- a/plugins/experimental/Makefile.am
+++ b/plugins/experimental/Makefile.am
@@ -14,8 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = \
- sslheaders
+SUBDIRS =
if HAS_MYSQL
SUBDIRS += mysql_remap
diff --git a/plugins/experimental/sslheaders/Makefile.am b/plugins/experimental/sslheaders/Makefile.am
deleted file mode 100644
index 7fa88ee..0000000
--- a/plugins/experimental/sslheaders/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-include $(top_srcdir)/build/plugins.mk
-
-AM_CPPFLAGS += @OPENSSL_INCLUDES@ -I$(top_srcdir)/lib
-
-noinst_LTLIBRARIES = libsslhdr.la
-pkglib_LTLIBRARIES = sslheaders.la
-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_LD_FLAGS)
-sslheaders_la_LIBADD = libsslhdr.la
-
-test_sslheaders_SOURCES = test_sslheaders.cc sslheaders.h
-test_sslheaders_LDFLAGS = @OPENSSL_LDFLAGS@
-test_sslheaders_LDADD = \
- @LIBTOOL_LINK_FLAGS@ \
- libsslhdr.la \
- $(top_builddir)/lib/ts/libtsutil.la \
- @OPENSSL_LIBS@
-
-TESTS_ENVIRONMENT = LSAN_OPTIONS=suppressions=suppression.txt
-TESTS = $(check_PROGRAMS)
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
diff --git a/plugins/experimental/sslheaders/Makefile.inc b/plugins/experimental/sslheaders/Makefile.inc
new file mode 100644
index 0000000..1b5ea5a
--- /dev/null
+++ b/plugins/experimental/sslheaders/Makefile.inc
@@ -0,0 +1,59 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+sslheaders_CPP_FLAGS = \
+ $(AM_CPPFLAGS) \
+ @OPENSSL_INCLUDES@ \
+ -I$(top_srcdir)/lib
+
+noinst_LTLIBRARIES += experimental/sslheaders/libsslhdr.la
+pkglib_LTLIBRARIES += experimental/sslheaders/sslheaders.la
+check_PROGRAMS += experimental/sslheaders/test_sslheaders
+
+experimental_sslheaders_libsslhdr_la_SOURCES = \
+ experimental/sslheaders/sslheaders.h \
+ experimental/sslheaders/expand.cc \
+ experimental/sslheaders/util.cc
+experimental_sslheaders_libsslhdr_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ @OPENSSL_INCLUDES@
+
+experimental_sslheaders_sslheaders_la_SOURCES = \
+ experimental/sslheaders/sslheaders.cc \
+ experimental/sslheaders/sslheaders.h
+experimental_sslheaders_sslheaders_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ @OPENSSL_INCLUDES@
+experimental_sslheaders_sslheaders_la_LDFLAGS = \
+ $(TS_PLUGIN_LD_FLAGS)
+experimental_sslheaders_sslheaders_la_LIBADD = \
+ experimental/sslheaders/libsslhdr.la
+
+experimental_sslheaders_test_sslheaders_SOURCES = \
+ experimental/sslheaders/test_sslheaders.cc \
+ experimental/sslheaders/sslheaders.h
+experimental_sslheaders_test_sslheaders_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ @OPENSSL_INCLUDES@ \
+ -I$(top_srcdir)/lib
+experimental_sslheaders_test_sslheaders_LDFLAGS = @OPENSSL_LDFLAGS@
+experimental_sslheaders_test_sslheaders_LDADD = \
+ @LIBTOOL_LINK_FLAGS@ \
+ experimental/sslheaders/libsslhdr.la \
+ $(top_builddir)/lib/ts/libtsutil.la \
+ @OPENSSL_LIBS@
+
+# vim: ft=make ts=8 sw=8 et:
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 02/02: TS-5000: Move mysql_remap into the
non-recursive plugins build.
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 79a2f8f8a0ac51ea37e998303a5241f4fd3225eb
Author: James Peach <jp...@apache.org>
AuthorDate: Wed Oct 26 10:01:21 2016 -0700
TS-5000: Move mysql_remap into the non-recursive plugins build.
---
configure.ac | 2 --
plugins/Makefile.am | 5 ++-
plugins/experimental/mysql_remap/Makefile.am | 37 ----------------------
.../{Makefile.am => mysql_remap/Makefile.inc} | 17 ++++++----
4 files changed, 14 insertions(+), 47 deletions(-)
diff --git a/configure.ac b/configure.ac
index e60854d..df7925b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1878,8 +1878,6 @@ AC_CONFIG_FILES([
mgmt/cluster/Makefile
mgmt/utils/Makefile
plugins/Makefile
- plugins/experimental/Makefile
- plugins/experimental/mysql_remap/Makefile
proxy/Makefile
proxy/api/ts/Makefile
proxy/config/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 0fe336b..b8a24d5 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -90,7 +90,10 @@ if BUILD_WEBP_TRANSFORM_PLUGIN
include experimental/webp_transform/Makefile.inc
endif
-SUBDIRS += experimental
+if HAS_MYSQL
+include experimental/mysql_remap/Makefile.inc
+endif
+
endif
TESTS_ENVIRONMENT = LSAN_OPTIONS=suppressions=suppression.txt
diff --git a/plugins/experimental/mysql_remap/Makefile.am b/plugins/experimental/mysql_remap/Makefile.am
deleted file mode 100644
index af178f9..0000000
--- a/plugins/experimental/mysql_remap/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-include $(top_srcdir)/build/plugins.mk
-
-pkglib_LTLIBRARIES = mysql_remap.la
-noinst_LTLIBRARIES = libmysql_remap.la
-
-AM_CPPFLAGS += \
- -I$(srcdir)/lib
-
-mysql_remap_la_SOURCES = mysql_remap.cc
-
-libmysql_remap_la_SOURCES = \
- lib/dictionary.c \
- lib/iniparser.c
-
-mysql_remap_la_LDFLAGS = $(TS_PLUGIN_LD_FLAGS) $(LIB_MYSQLCLIENT)
-mysql_remap_la_LIBADD = libmysql_remap.la
-
-include $(top_srcdir)/build/tidy.mk
-
-tidy-local: $(DIST_SOURCES)
- $(CC_Clang_Tidy)
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/mysql_remap/Makefile.inc
similarity index 63%
rename from plugins/experimental/Makefile.am
rename to plugins/experimental/mysql_remap/Makefile.inc
index fb53a83..9be3440 100644
--- a/plugins/experimental/Makefile.am
+++ b/plugins/experimental/mysql_remap/Makefile.inc
@@ -14,13 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS =
+pkglib_LTLIBRARIES += experimental/mysql_remap/mysql_remap.la
-if HAS_MYSQL
- SUBDIRS += mysql_remap
-endif
+experimental_mysql_remap_mysql_remap_la_SOURCES = \
+ experimental/mysql_remap/mysql_remap.cc \
+ experimental/mysql_remap/lib/dictionary.c \
+ experimental/mysql_remap/lib/dictionary.h \
+ experimental/mysql_remap/lib/iniparser.c \
+ experimental/mysql_remap/lib/iniparser.h
-include $(top_srcdir)/build/tidy.mk
+experimental_mysql_remap_mysql_remap_la_LDFLAGS = \
+ $(TS_PLUGIN_LD_FLAGS) $(LIB_MYSQLCLIENT)
-tidy-local: $(DIST_SOURCES)
- $(CXX_Clang_Tidy)
+# vim: ft=make ts=8 sw=8 et:
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.