TS-3739 Enable build, and change default lib path such that we do not…

… look in lib/ts by default
apache · Jul 9, 2015 · c8c5ba8 · c8c5ba8
1 parent f426e63
commit c8c5ba8
Show file tree

Hide file tree

Showing 52 changed files with 67 additions and 79 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,11 +56,14 @@ cmd/traffic_layout/traffic_layout
 cmd/traffic_via/traffic_via
 cmd/traffic_wccp/traffic_wccp
 
+lib/stamp-h1
+lib/ink_autoconf.h
+lib/ink_autoconf.h.in
+lib/ts/stamp-h1
 lib/ts/ink_autoconf.h
 lib/ts/ink_autoconf.h.in
 lib/ts/ink_config.h
 lib/ts/apidefs.h
-lib/ts/stamp-h1
 lib/ts/CompileParseRules
 lib/ts/ParseRulesCType
 lib/ts/ParseRulesCTypeToLower

diff --git a/build/plugins.mk b/build/plugins.mk
@@ -25,8 +25,7 @@ TS_PLUGIN_LDFLAGS = \
 TS_PLUGIN_CPPFLAGS = \
   -I$(top_builddir)/proxy/api \
   -I$(top_srcdir)/proxy/api \
-  -I$(top_builddir)/lib/ts \
-  -I$(top_srcdir)/lib/ts \
+  -I$(top_builddir)/lib \
   -I$(top_srcdir)/lib
 
 # Provide a default AM_CPPFLAGS. Automake handles this correctly, but libtool

diff --git a/configure.ac b/configure.ac
@@ -41,7 +41,7 @@ AC_CONFIG_AUX_DIR([build/aux])
 AC_CONFIG_SRCDIR([proxy/Main.cc])
 AC_CONFIG_MACRO_DIR([build])
 AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar foreign no-installinfo no-installman subdir-objects 1.9.2])
-AC_CONFIG_HEADERS([lib/ts/ink_autoconf.h])
+AC_CONFIG_HEADERS([lib/ink_autoconf.h])
 
 # Configure with --disable-silent-rules to get verbose output. For more info, see
 # http://www.gnu.org/software/automake/manual/html_node/Automake-silent_002drules-Option.html

diff --git a/example/add-header/add-header.c b/example/add-header/add-header.c
@@ -37,7 +37,7 @@
 #include <string.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 static TSMBuffer hdr_bufp;
 static TSMLoc hdr_loc;

diff --git a/example/append-transform/append-transform.c b/example/append-transform/append-transform.c
@@ -41,7 +41,7 @@
 #include <string.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define ASSERT_SUCCESS(_x) TSAssert((_x) == TS_SUCCESS)
 

diff --git a/example/basic-auth/basic-auth.c b/example/basic-auth/basic-auth.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 
 static char base64_codes[256];

diff --git a/example/blacklist-1/blacklist-1.c b/example/blacklist-1/blacklist-1.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define MAX_NSITES 500
 #define RETRY_TIME 10

diff --git a/example/bnull-transform/bnull-transform.c b/example/bnull-transform/bnull-transform.c
@@ -37,7 +37,7 @@
 #include <stdio.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define TS_NULL_MUTEX NULL
 #define STATE_BUFFER_DATA 0

diff --git a/example/cache-scan/cache-scan.cc b/example/cache-scan/cache-scan.cc
@@ -32,7 +32,7 @@
 
 #include "ts/ts.h"
 #include "ts/experimental.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 static TSCont global_contp;
 

diff --git a/example/hello/hello.c b/example/hello/hello.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 void
 TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)

diff --git a/example/null-transform/null-transform.c b/example/null-transform/null-transform.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 typedef struct {
   TSVIO output_vio;

diff --git a/example/output-header/output-header.c b/example/output-header/output-header.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define DEBUG_TAG "output-header"
 

diff --git a/example/protocol/Protocol.c b/example/protocol/Protocol.c
@@ -23,7 +23,7 @@
 
 #include "Protocol.h"
 #include "TxnSM.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 #include <math.h>
 
 /* global variable */

diff --git a/example/protocol/TxnSM.c b/example/protocol/TxnSM.c
@@ -23,7 +23,7 @@
 
 #include <sys/types.h>
 #include <netinet/in.h>
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #include "TxnSM.h"
 

diff --git a/example/query-remap/query-remap.c b/example/query-remap/query-remap.c
@@ -27,7 +27,7 @@
 
 #include "ts/ts.h"
 #include "ts/remap.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define PLUGIN_NAME "query_remap"
 

diff --git a/example/remap/remap.cc b/example/remap/remap.cc
@@ -44,7 +44,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 #include "ts/ts.h"
 #include "ts/remap.h"
 

diff --git a/example/replace-header/replace-header.c b/example/replace-header/replace-header.c
@@ -37,7 +37,7 @@
 #include <ctype.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 static void
 replace_header(TSHttpTxn txnp)

diff --git a/example/response-header-1/response-header-1.c b/example/response-header-1/response-header-1.c
@@ -53,7 +53,7 @@
 #include <ctype.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 static int init_buffer_status;
 

diff --git a/example/server-transform/server-transform.c b/example/server-transform/server-transform.c
@@ -57,7 +57,7 @@
 #include <netinet/in.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define STATE_BUFFER 1
 #define STATE_CONNECT 2

diff --git a/example/ssl-sni-whitelist/ssl-sni-whitelist.cc b/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
@@ -27,7 +27,7 @@
 #include <memory.h>
 #include <inttypes.h>
 #include <ts/ts.h>
-#include <ink_config.h>
+#include "ts/ink_config.h"
 #include <tsconfig/TsValue.h>
 #include <openssl/ssl.h>
 #include <getopt.h>

diff --git a/example/ssl-sni/ssl-sni.cc b/example/ssl-sni/ssl-sni.cc
@@ -30,7 +30,7 @@
 #include <memory.h>
 #include <inttypes.h>
 #include <ts/ts.h>
-#include <ink_config.h>
+#include "ts/ink_config.h"
 #include <tsconfig/TsValue.h>
 #include <openssl/ssl.h>
 #include <getopt.h>

diff --git a/example/thread-1/thread-1.c b/example/thread-1/thread-1.c
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 static void *
 reenable_txn(void *data)

diff --git a/example/thread-pool/psi.c b/example/thread-pool/psi.c
@@ -52,7 +52,7 @@
 
 #include "ts/ts.h"
 #include "thread.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define DBG_TAG "xpsi"
 

diff --git a/example/thread-pool/thread.c b/example/thread-pool/thread.c
@@ -27,7 +27,7 @@
 #include "ts/ts.h"
 
 #include "thread.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #define DBGTAG "xthread"
 

diff --git a/example/version/version.c b/example/version/version.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include "ts/ts.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 void
 TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)

diff --git a/plugins/cacheurl/cacheurl.cc b/plugins/cacheurl/cacheurl.cc
@@ -27,8 +27,9 @@
 
 #include "ts/ts.h"
 #include "ts/remap.h"
-#include "ink_defs.h"
-#include "ink_memory.h"
+
+#include "ts/ink_defs.h"
+#include "ts/ink_memory.h"
 
 #include <string>
 #include <vector>

diff --git a/plugins/conf_remap/conf_remap.cc b/plugins/conf_remap/conf_remap.cc
@@ -18,7 +18,7 @@
 
 #include "ts/ts.h"
 #include "ts/remap.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -334,19 +334,3 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo * /* rri ATS_UNUSED */
 
   return TSREMAP_NO_REMAP; // This plugin never rewrites anything.
 }
-
-
-/*
-  local variables:
-  mode: C++
-  indent-tabs-mode: nil
-  c-basic-offset: 2
-  c-comment-only-line-offset: 0
-  c-file-offsets: ((statement-block-intro . +)
-  (label . 0)
-  (statement-cont . +)
-  (innamespace . 0))
-  end:
-
-  Indent with: /usr/bin/indent -ncs -nut -npcs -l 120 logstats.cc
-*/
diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am
@@ -40,10 +40,8 @@ SUBDIRS = \
  stale_while_revalidate \
  url_sig \
  xdebug \
- mp4
-
-# Commented out for now, since it breaks on OSX
-# stream_editor
+ mp4 \
+ stream_editor
 
 if HAS_MYSQL
   SUBDIRS += mysql_remap

diff --git a/plugins/experimental/authproxy/authproxy.cc b/plugins/experimental/authproxy/authproxy.cc
@@ -37,7 +37,8 @@
 #include <arpa/inet.h>
 #include <sys/param.h>
 #include <ts/remap.h>
-#include <ink_config.h>
+
+#include "ts/ink_config.h"
 
 using std::strlen;
 

diff --git a/plugins/experimental/background_fetch/configs.h b/plugins/experimental/background_fetch/configs.h
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 
 #include "rules.h"
-#include "ink_atomic.h"
+#include "ts/ink_atomic.h"
 
 // Constants
 const char PLUGIN_NAME[] = "background_fetch";

diff --git a/plugins/experimental/balancer/balancer.cc b/plugins/experimental/balancer/balancer.cc
@@ -30,7 +30,7 @@
 #include <iterator>
 
 // Using ink_inet API is cheating, but I was too lazy to write new IPv6 address parsing routines ;)
-#include "ink_inet.h"
+#include "ts/ink_inet.h"
 
 // The policy type is the first comma-separated token.
 static BalancerInstance *

diff --git a/plugins/experimental/cache_promote/cache_promote.cc b/plugins/experimental/cache_promote/cache_promote.cc
@@ -30,7 +30,7 @@
 
 #include "ts/ts.h"
 #include "ts/remap.h"
-#include "ink_config.h"
+#include "ts/ink_config.h"
 
 
 static const char *PLUGIN_NAME = "cache_promote";

diff --git a/plugins/experimental/epic/epic.cc b/plugins/experimental/epic/epic.cc
@@ -29,7 +29,8 @@
 #include <inttypes.h>
 #include <set>
 #include <string>
-#include "ink_defs.h"
+
+#include "ts/ink_defs.h"
 
 #define debug_tag(tag, fmt, ...)          \
   do {                                    \

diff --git a/plugins/experimental/esi/combo_handler.cc b/plugins/experimental/esi/combo_handler.cc
@@ -33,7 +33,7 @@
 #include "ts/ts.h"
 #include "ts/experimental.h"
 #include "ts/remap.h"
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #include "HttpDataFetcherImpl.h"
 #include "gzip.h"

diff --git a/plugins/experimental/esi/esi.cc b/plugins/experimental/esi/esi.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/plugins/experimental/esi/serverIntercept.cc b/plugins/experimental/esi/serverIntercept.cc
@@ -21,7 +21,7 @@
   limitations under the License.
  */
 
-#include "ink_defs.h"
+#include "ts/ink_defs.h"
 #include "serverIntercept.h"
 
 #include <string>

diff --git a/plugins/experimental/regex_revalidate/regex_revalidate.c b/plugins/experimental/regex_revalidate/regex_revalidate.c
@@ -19,8 +19,8 @@
   limitations under the License.
  */
 
-#include "ink_defs.h"
-#include "ink_platform.h"
+#include "ts/ink_defs.h"
+#include "ts/ink_platform.h"
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/plugins/experimental/sslheaders/expand.cc b/plugins/experimental/sslheaders/expand.cc
@@ -17,7 +17,7 @@
  */
 
 #include "sslheaders.h"
-#include <ink_defs.h>
+#include "ts/ink_defs.h"
 
 #include <openssl/x509.h>
 #include <openssl/pem.h>

diff --git a/plugins/experimental/sslheaders/sslheaders.cc b/plugins/experimental/sslheaders/sslheaders.cc
@@ -17,7 +17,7 @@
  */
 
 #include "sslheaders.h"
-#include "ink_memory.h"
+#include "ts/ink_memory.h"
 
 #include <getopt.h>
 #include <openssl/ssl.h>

diff --git a/plugins/experimental/sslheaders/util.cc b/plugins/experimental/sslheaders/util.cc
@@ -18,7 +18,7 @@
 
 #include "sslheaders.h"
 #include <memory>
-#include <ink_defs.h>
+#include "ts/ink_defs.h"
 
 // Count of fields (not including SSL_HEADERS_FIELD_NONE).
 #define NUMFIELDS (SSL_HEADERS_FIELD_MAX - 1)