You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@trafficserver.apache.org by James Peach <ja...@me.com> on 2013/03/04 23:41:34 UTC
Re: [2/2] git commit: TS-1733 Minor fixes.
.C is traditionally a c++ source file
On Mar 4, 2013, at 1:30 PM, sorber@apache.org wrote:
> Updated Branches:
> refs/heads/master f0b3b864a -> 7016ec958
>
>
> TS-1733 Minor fixes.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
> Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7016ec95
> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7016ec95
> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7016ec95
>
> Branch: refs/heads/master
> Commit: 7016ec95807cdef0e1d3feac38038f533a581624
> Parents: 1944efa
> Author: Phil Sorber <so...@apache.org>
> Authored: Mon Mar 4 15:18:16 2013 -0500
> Committer: Phil Sorber <so...@apache.org>
> Committed: Mon Mar 4 16:24:57 2013 -0500
>
> ----------------------------------------------------------------------
> plugins/experimental/channel_stats/Makefile.tsxs | 2 +-
> tools/tsxs.in | 14 +++++++++++---
> 2 files changed, 12 insertions(+), 4 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7016ec95/plugins/experimental/channel_stats/Makefile.tsxs
> ----------------------------------------------------------------------
> diff --git a/plugins/experimental/channel_stats/Makefile.tsxs b/plugins/experimental/channel_stats/Makefile.tsxs
> index 405affc..20217a1 100644
> --- a/plugins/experimental/channel_stats/Makefile.tsxs
> +++ b/plugins/experimental/channel_stats/Makefile.tsxs
> @@ -17,7 +17,7 @@
> TSXS?=tsxs
>
> %.so: %.cc
> - $(TSXS) -o $@ %<
> + $(TSXS) -o $@ $<
>
> all: channel_stats.so
>
>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7016ec95/tools/tsxs.in
> ----------------------------------------------------------------------
> diff --git a/tools/tsxs.in b/tools/tsxs.in
> index b0b1534..d4165e0 100755
> --- a/tools/tsxs.in
> +++ b/tools/tsxs.in
> @@ -69,11 +69,11 @@ compile() {
> SRC=$1
> extension=`echo $SRC | sed -e 's/^.*\.//g'`
> case $extension in
> - c)
> + c|C)
> MY_CFLAGS="$CPPFLAGS $CFLAGS"
> MY_CC=$CC
> ;;
> - cpp|cxx|CPP|CXX|CC|C)
> + cpp|cxx|cc|CPP|CXX|CC)
> MY_CFLAGS="$CPPFLAGS $CXXFLAGS"
> MY_CC=$CXX
> ;;
> @@ -138,6 +138,8 @@ case $host in
> ;;
> esac
>
> +files=()
> +
> LD=$MODULELD
> while getopts "hivl:L:I:c:C:o:" OPTION
> do
> @@ -164,11 +166,17 @@ do
> i)
> INSTALL=1
> ;;
> + c)
> + files[${#files[@]}]="$OPTARG"
> + ;;
> + C)
> + files[${#files[@]}]="$OPTARG"
> + ;;
> esac
> done
> shift $(( OPTIND - 1))
>
> -for file in "$@"; do
> +for file in "${files[@]}" "$@"; do
> compile $file
> done
>
>
Re: [2/2] git commit: TS-1733 Minor fixes.
Posted by Phil Sorber <so...@apache.org>.
On Tue, Mar 5, 2013 at 1:26 PM, James Peach <ja...@me.com> wrote:
> On 05/03/2013, at 10:21 AM, Phil Sorber <so...@apache.org> wrote:
>
> > Greedy C++. Wants all the extensions to itself. What about the case
> > insensitive case?
>
> *shrug*
>
>
Ok, will fix.
> > On Mon, Mar 4, 2013 at 5:41 PM, James Peach <ja...@me.com> wrote:
> >
> >> .C is traditionally a c++ source file
> >>
> >> On Mar 4, 2013, at 1:30 PM, sorber@apache.org wrote:
> >>
> >>> Updated Branches:
> >>> refs/heads/master f0b3b864a -> 7016ec958
> >>>
> >>>
> >>> TS-1733 Minor fixes.
> >>>
> >>>
> >>> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
> >>> Commit:
> >> http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7016ec95
> >>> Tree:
> http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7016ec95
> >>> Diff:
> http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7016ec95
> >>>
> >>> Branch: refs/heads/master
> >>> Commit: 7016ec95807cdef0e1d3feac38038f533a581624
> >>> Parents: 1944efa
> >>> Author: Phil Sorber <so...@apache.org>
> >>> Authored: Mon Mar 4 15:18:16 2013 -0500
> >>> Committer: Phil Sorber <so...@apache.org>
> >>> Committed: Mon Mar 4 16:24:57 2013 -0500
> >>>
> >>> ----------------------------------------------------------------------
> >>> plugins/experimental/channel_stats/Makefile.tsxs | 2 +-
> >>> tools/tsxs.in | 14 +++++++++++---
> >>> 2 files changed, 12 insertions(+), 4 deletions(-)
> >>> ----------------------------------------------------------------------
> >>>
> >>>
> >>>
> >>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7016ec95/plugins/experimental/channel_stats/Makefile.tsxs
> >>> ----------------------------------------------------------------------
> >>> diff --git a/plugins/experimental/channel_stats/Makefile.tsxs
> >> b/plugins/experimental/channel_stats/Makefile.tsxs
> >>> index 405affc..20217a1 100644
> >>> --- a/plugins/experimental/channel_stats/Makefile.tsxs
> >>> +++ b/plugins/experimental/channel_stats/Makefile.tsxs
> >>> @@ -17,7 +17,7 @@
> >>> TSXS?=tsxs
> >>>
> >>> %.so: %.cc
> >>> - $(TSXS) -o $@ %<
> >>> + $(TSXS) -o $@ $<
> >>>
> >>> all: channel_stats.so
> >>>
> >>>
> >>>
> >>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7016ec95/tools/tsxs.in
> >>> ----------------------------------------------------------------------
> >>> diff --git a/tools/tsxs.in b/tools/tsxs.in
> >>> index b0b1534..d4165e0 100755
> >>> --- a/tools/tsxs.in
> >>> +++ b/tools/tsxs.in
> >>> @@ -69,11 +69,11 @@ compile() {
> >>> SRC=$1
> >>> extension=`echo $SRC | sed -e 's/^.*\.//g'`
> >>> case $extension in
> >>> - c)
> >>> + c|C)
> >>> MY_CFLAGS="$CPPFLAGS $CFLAGS"
> >>> MY_CC=$CC
> >>> ;;
> >>> - cpp|cxx|CPP|CXX|CC|C)
> >>> + cpp|cxx|cc|CPP|CXX|CC)
> >>> MY_CFLAGS="$CPPFLAGS $CXXFLAGS"
> >>> MY_CC=$CXX
> >>> ;;
> >>> @@ -138,6 +138,8 @@ case $host in
> >>> ;;
> >>> esac
> >>>
> >>> +files=()
> >>> +
> >>> LD=$MODULELD
> >>> while getopts "hivl:L:I:c:C:o:" OPTION
> >>> do
> >>> @@ -164,11 +166,17 @@ do
> >>> i)
> >>> INSTALL=1
> >>> ;;
> >>> + c)
> >>> + files[${#files[@]}]="$OPTARG"
> >>> + ;;
> >>> + C)
> >>> + files[${#files[@]}]="$OPTARG"
> >>> + ;;
> >>> esac
> >>> done
> >>> shift $(( OPTIND - 1))
> >>>
> >>> -for file in "$@"; do
> >>> +for file in "${files[@]}" "$@"; do
> >>> compile $file
> >>> done
> >>>
> >>>
> >>
>
>
Re: [2/2] git commit: TS-1733 Minor fixes.
Posted by Igor Galić <i....@brainsware.org>.
----- Original Message -----
> On 05/03/2013, at 10:21 AM, Phil Sorber <so...@apache.org> wrote:
>
> > Greedy C++. Wants all the extensions to itself. What about the case
> > insensitive case?
>
> *shrug*
trying to remember ye good olde Borland Turbo C++ times…
-- i
Igor Galić
Tel: +43 (0) 664 886 22 883
Mail: i.galic@brainsware.org
URL: http://brainsware.org/
GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE
Re: [2/2] git commit: TS-1733 Minor fixes.
Posted by James Peach <ja...@me.com>.
On 05/03/2013, at 10:21 AM, Phil Sorber <so...@apache.org> wrote:
> Greedy C++. Wants all the extensions to itself. What about the case
> insensitive case?
*shrug*
> On Mon, Mar 4, 2013 at 5:41 PM, James Peach <ja...@me.com> wrote:
>
>> .C is traditionally a c++ source file
>>
>> On Mar 4, 2013, at 1:30 PM, sorber@apache.org wrote:
>>
>>> Updated Branches:
>>> refs/heads/master f0b3b864a -> 7016ec958
>>>
>>>
>>> TS-1733 Minor fixes.
>>>
>>>
>>> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
>>> Commit:
>> http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7016ec95
>>> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7016ec95
>>> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7016ec95
>>>
>>> Branch: refs/heads/master
>>> Commit: 7016ec95807cdef0e1d3feac38038f533a581624
>>> Parents: 1944efa
>>> Author: Phil Sorber <so...@apache.org>
>>> Authored: Mon Mar 4 15:18:16 2013 -0500
>>> Committer: Phil Sorber <so...@apache.org>
>>> Committed: Mon Mar 4 16:24:57 2013 -0500
>>>
>>> ----------------------------------------------------------------------
>>> plugins/experimental/channel_stats/Makefile.tsxs | 2 +-
>>> tools/tsxs.in | 14 +++++++++++---
>>> 2 files changed, 12 insertions(+), 4 deletions(-)
>>> ----------------------------------------------------------------------
>>>
>>>
>>>
>> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7016ec95/plugins/experimental/channel_stats/Makefile.tsxs
>>> ----------------------------------------------------------------------
>>> diff --git a/plugins/experimental/channel_stats/Makefile.tsxs
>> b/plugins/experimental/channel_stats/Makefile.tsxs
>>> index 405affc..20217a1 100644
>>> --- a/plugins/experimental/channel_stats/Makefile.tsxs
>>> +++ b/plugins/experimental/channel_stats/Makefile.tsxs
>>> @@ -17,7 +17,7 @@
>>> TSXS?=tsxs
>>>
>>> %.so: %.cc
>>> - $(TSXS) -o $@ %<
>>> + $(TSXS) -o $@ $<
>>>
>>> all: channel_stats.so
>>>
>>>
>>>
>> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7016ec95/tools/tsxs.in
>>> ----------------------------------------------------------------------
>>> diff --git a/tools/tsxs.in b/tools/tsxs.in
>>> index b0b1534..d4165e0 100755
>>> --- a/tools/tsxs.in
>>> +++ b/tools/tsxs.in
>>> @@ -69,11 +69,11 @@ compile() {
>>> SRC=$1
>>> extension=`echo $SRC | sed -e 's/^.*\.//g'`
>>> case $extension in
>>> - c)
>>> + c|C)
>>> MY_CFLAGS="$CPPFLAGS $CFLAGS"
>>> MY_CC=$CC
>>> ;;
>>> - cpp|cxx|CPP|CXX|CC|C)
>>> + cpp|cxx|cc|CPP|CXX|CC)
>>> MY_CFLAGS="$CPPFLAGS $CXXFLAGS"
>>> MY_CC=$CXX
>>> ;;
>>> @@ -138,6 +138,8 @@ case $host in
>>> ;;
>>> esac
>>>
>>> +files=()
>>> +
>>> LD=$MODULELD
>>> while getopts "hivl:L:I:c:C:o:" OPTION
>>> do
>>> @@ -164,11 +166,17 @@ do
>>> i)
>>> INSTALL=1
>>> ;;
>>> + c)
>>> + files[${#files[@]}]="$OPTARG"
>>> + ;;
>>> + C)
>>> + files[${#files[@]}]="$OPTARG"
>>> + ;;
>>> esac
>>> done
>>> shift $(( OPTIND - 1))
>>>
>>> -for file in "$@"; do
>>> +for file in "${files[@]}" "$@"; do
>>> compile $file
>>> done
>>>
>>>
>>
Re: [2/2] git commit: TS-1733 Minor fixes.
Posted by Phil Sorber <so...@apache.org>.
Greedy C++. Wants all the extensions to itself. What about the case
insensitive case?
On Mon, Mar 4, 2013 at 5:41 PM, James Peach <ja...@me.com> wrote:
> .C is traditionally a c++ source file
>
> On Mar 4, 2013, at 1:30 PM, sorber@apache.org wrote:
>
> > Updated Branches:
> > refs/heads/master f0b3b864a -> 7016ec958
> >
> >
> > TS-1733 Minor fixes.
> >
> >
> > Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
> > Commit:
> http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7016ec95
> > Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7016ec95
> > Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7016ec95
> >
> > Branch: refs/heads/master
> > Commit: 7016ec95807cdef0e1d3feac38038f533a581624
> > Parents: 1944efa
> > Author: Phil Sorber <so...@apache.org>
> > Authored: Mon Mar 4 15:18:16 2013 -0500
> > Committer: Phil Sorber <so...@apache.org>
> > Committed: Mon Mar 4 16:24:57 2013 -0500
> >
> > ----------------------------------------------------------------------
> > plugins/experimental/channel_stats/Makefile.tsxs | 2 +-
> > tools/tsxs.in | 14 +++++++++++---
> > 2 files changed, 12 insertions(+), 4 deletions(-)
> > ----------------------------------------------------------------------
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7016ec95/plugins/experimental/channel_stats/Makefile.tsxs
> > ----------------------------------------------------------------------
> > diff --git a/plugins/experimental/channel_stats/Makefile.tsxs
> b/plugins/experimental/channel_stats/Makefile.tsxs
> > index 405affc..20217a1 100644
> > --- a/plugins/experimental/channel_stats/Makefile.tsxs
> > +++ b/plugins/experimental/channel_stats/Makefile.tsxs
> > @@ -17,7 +17,7 @@
> > TSXS?=tsxs
> >
> > %.so: %.cc
> > - $(TSXS) -o $@ %<
> > + $(TSXS) -o $@ $<
> >
> > all: channel_stats.so
> >
> >
> >
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7016ec95/tools/tsxs.in
> > ----------------------------------------------------------------------
> > diff --git a/tools/tsxs.in b/tools/tsxs.in
> > index b0b1534..d4165e0 100755
> > --- a/tools/tsxs.in
> > +++ b/tools/tsxs.in
> > @@ -69,11 +69,11 @@ compile() {
> > SRC=$1
> > extension=`echo $SRC | sed -e 's/^.*\.//g'`
> > case $extension in
> > - c)
> > + c|C)
> > MY_CFLAGS="$CPPFLAGS $CFLAGS"
> > MY_CC=$CC
> > ;;
> > - cpp|cxx|CPP|CXX|CC|C)
> > + cpp|cxx|cc|CPP|CXX|CC)
> > MY_CFLAGS="$CPPFLAGS $CXXFLAGS"
> > MY_CC=$CXX
> > ;;
> > @@ -138,6 +138,8 @@ case $host in
> > ;;
> > esac
> >
> > +files=()
> > +
> > LD=$MODULELD
> > while getopts "hivl:L:I:c:C:o:" OPTION
> > do
> > @@ -164,11 +166,17 @@ do
> > i)
> > INSTALL=1
> > ;;
> > + c)
> > + files[${#files[@]}]="$OPTARG"
> > + ;;
> > + C)
> > + files[${#files[@]}]="$OPTARG"
> > + ;;
> > esac
> > done
> > shift $(( OPTIND - 1))
> >
> > -for file in "$@"; do
> > +for file in "${files[@]}" "$@"; do
> > compile $file
> > done
> >
> >
>