Return-Path: X-Original-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2EAABD88F for ; Thu, 23 Aug 2012 07:59:12 +0000 (UTC) Received: (qmail 62653 invoked by uid 500); 23 Aug 2012 07:59:11 -0000 Delivered-To: apmail-incubator-cloudstack-dev-archive@incubator.apache.org Received: (qmail 62588 invoked by uid 500); 23 Aug 2012 07:59:11 -0000 Mailing-List: contact cloudstack-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-dev@incubator.apache.org Received: (qmail 62569 invoked by uid 99); 23 Aug 2012 07:59:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Aug 2012 07:59:11 +0000 X-ASF-Spam-Status: No, hits=0.7 required=5.0 tests=RCVD_IN_DNSWL_NONE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [109.72.87.138] (HELO smtp02.mail.pcextreme.nl) (109.72.87.138) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Aug 2012 07:59:05 +0000 Received: from [IPv6:2a00:f10:113:0:542c:8cdf:1723:8cf9] (unknown [IPv6:2a00:f10:113:0:542c:8cdf:1723:8cf9]) by smtp02.mail.pcextreme.nl (Postfix) with ESMTPSA id 56749403FD for ; Thu, 23 Aug 2012 09:58:45 +0200 (CEST) Message-ID: <5035E2B4.7040607@widodh.nl> Date: Thu, 23 Aug 2012 09:58:44 +0200 From: Wido den Hollander User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: cloudstack-dev@incubator.apache.org Subject: Re: patch for `ant build-apidocs` target on OSX References: <9D5EF69890624AA896F0656A3A6F1795@basho.com> <5034EF03.3080601@widodh.nl> <921F1C2779534B399BF26F9A7E6B059B@basho.com> In-Reply-To: <921F1C2779534B399BF26F9A7E6B059B@basho.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 08/22/2012 05:44 PM, Greg Burd wrote: > Wildo, I've signed and filed the Apache ICLA (http://www.apache.org/licenses/icla.txt) not the Citrix one. > I've checked, but for submitting small patches like these the Apache ICLA isn't mandatory. I thought you found the old Citrix agreement somewhere and signed that one by accident. No harm through if you signed the ICLA! Wido > @gregburd, Basho Technologies | http://basho.com | @basho > > > On Wednesday, August 22, 2012 at 10:38 AM, Wido den Hollander wrote: > >> On 08/22/2012 04:27 PM, Greg Burd wrote: >>> Hello, >>> >>> I develop on OSX and I found a few small issues in the build-apidoc.sh (http://build-apidoc.sh) script. `readlink -f` isn't supported and a `find` was missing the directory argument. >>> >>> How do these get tested/reviewed and into master? I've signed and filed my contributor agreement already. >> >> Which contributor agreement are you talking about? I'm thinking about >> the agreement while the project was still under Citrix? >> >> Wido >> >>> best, >>> >>> @gregburd, Basho Technologies | http://basho.com | @basho >>> >>> >>> 13:51:02:cloudstack(gsb*+) $ git diff ./setup/apidoc/build-apidoc.sh (http://build-apidoc.sh) >>> diff --git a/setup/apidoc/build-apidoc.sh (http://build-apidoc.sh) b/setup/apidoc/build-apidoc.sh (http://build-apidoc.sh) >>> index 618273f..14d6459 100644 >>> --- a/setup/apidoc/build-apidoc.sh (http://build-apidoc.sh) >>> +++ b/setup/apidoc/build-apidoc.sh (http://build-apidoc.sh) >>> @@ -27,8 +27,18 @@ shift >>> DISTDIR="$1" >>> shift >>> >>> -thisdir=$(readlink -f $(dirname "$0")) >>> +canonical_readlink () >>> +{ >>> + cd `dirname $1`; >>> + __filename=`basename $1`; >>> + if [ -h "$__filename" ]; then >>> + canonical_readlink `readlink $__filename`; >>> + else >>> + echo "`pwd -P`"; >>> + fi >>> +} >>> >>> +thisdir=$(canonical_readlink $0) >>> >>> PATHSEP=':' >>> if [[ $OSTYPE == "cygwin" ]] ; then >>> @@ -61,7 +71,7 @@ set -e >>> sed -e 's,%API_HEADER%,Root Admin API,g' "$thisdir/generatetoc_header.xsl" >generatetocforadmin.xsl >>> sed -e 's,%API_HEADER%,Domain Admin API,g' "$thisdir/generatetoc_header.xsl" >generatetocfordomainadmin.xsl >>> >>> - python "$thisdir/gen_toc.py" $(find -type f) >>> + python "$thisdir/gen_toc.py" $(find . -type f) >>> >>> cat generatetocforuser_include.xsl >>generatetocforuser.xsl >>> cat generatetocforadmin_include.xsl >>generatetocforadmin.xsl >> > > >