You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2012/02/01 00:29:10 UTC

git commit: Backport TS-1046 r1212075/bd44912a30f0d89b0dca63a54158797dc67a3a98 *) Build: Add possibility to extend tsxs command line for -Iincludes.

Updated Branches:
  refs/heads/3.0.x bcbb47ca0 -> 3778bdc48


Backport TS-1046 r1212075/bd44912a30f0d89b0dca63a54158797dc67a3a98
*) Build: Add possibility to extend tsxs command line for -Iincludes.

Review: igalic, zwoop, zym
Backport: igalic


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3778bdc4
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3778bdc4
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3778bdc4

Branch: refs/heads/3.0.x
Commit: 3778bdc48839d148c0b417f101ce1dae8a60b2c2
Parents: bcbb47c
Author: Igor Galić <i....@brainsware.org>
Authored: Wed Feb 1 00:26:44 2012 +0100
Committer: Igor Galić <i....@brainsware.org>
Committed: Wed Feb 1 00:26:44 2012 +0100

----------------------------------------------------------------------
 CHANGES       |    2 ++
 STATUS        |    5 -----
 tools/tsxs.in |    5 +++++
 3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3778bdc4/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index a599283..3ae9cb3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.0.3
+  *) [TS-1046] Add possibility to extend tsxs command line for -Iincludes.
+
   *) [TS-1047] fix lots of spelling mistakes
    Author: Arno Töll
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3778bdc4/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index 39c556c..dab9c6f 100644
--- a/STATUS
+++ b/STATUS
@@ -40,11 +40,6 @@ A list of all bugs open for the next v3.0.2 release can be found at
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
 
-  *) Build: Add possibility to extend tsxs command line for -Iincludes.
-   Trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1212075
-   Jira: https://issues.apache.org/jira/browse/TS-1046
-   +1: igalic, zwoop, zym
-
   *) Management: traffic_line -r returns "Variable Not Found", even if it's a permission issue
    Trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1181096
    Jira: https://issues.apache.org/jira/browse/TS-830

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3778bdc4/tools/tsxs.in
----------------------------------------------------------------------
diff --git a/tools/tsxs.in b/tools/tsxs.in
index a244ee4..7281339 100755
--- a/tools/tsxs.in
+++ b/tools/tsxs.in
@@ -107,6 +107,7 @@ $0 : a tool to compile, link and install trafficserver plugins.
 	-c [ file1.c [ file2.c [ ... ] ] ]      ## compiles C files
 	-C [ file1.cc [ file2.C [ ... ] ] ]     ## compiles C++ files
 	-o modulename.so                        ## the name of the module
+	-I include                              ## add -Iinclude to the compile
 	-l lib                                  ## add -llib to the link
 
  installing:
@@ -116,6 +117,10 @@ $0 : a tool to compile, link and install trafficserver plugins.
 EOF
 		exit
 		;;
+	-I)
+		CPPFLAGS="$CPPFLAGS -I$2"
+		shift 2
+		;;
 	-l)
 		LIBS="$LIBS -l$2"
 		shift 2