Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 55262 invoked from network); 4 Jun 2008 07:18:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jun 2008 07:18:23 -0000 Received: (qmail 20641 invoked by uid 500); 4 Jun 2008 07:18:26 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 20599 invoked by uid 500); 4 Jun 2008 07:18:25 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 20590 invoked by uid 99); 4 Jun 2008 07:18:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jun 2008 00:18:25 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jun 2008 07:17:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 16FC72388A41; Wed, 4 Jun 2008 00:18:02 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r663014 - /incubator/sling/trunk/etc/notice/mknotice Date: Wed, 04 Jun 2008 07:18:02 -0000 To: sling-commits@incubator.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080604071802.16FC72388A41@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Wed Jun 4 00:18:01 2008 New Revision: 663014 URL: http://svn.apache.org/viewvc?rev=663014&view=rev Log: SLING-493 - ignore #comments in notice fragment files Modified: incubator/sling/trunk/etc/notice/mknotice Modified: incubator/sling/trunk/etc/notice/mknotice URL: http://svn.apache.org/viewvc/incubator/sling/trunk/etc/notice/mknotice?rev=663014&r1=663013&r2=663014&view=diff ============================================================================== --- incubator/sling/trunk/etc/notice/mknotice (original) +++ incubator/sling/trunk/etc/notice/mknotice Wed Jun 4 00:18:01 2008 @@ -87,7 +87,8 @@ generate_notice() { set_project_name [[ -n "$PROJECT_NAME" ]] || fatal "Project name not found" - echo $PROJECT_NAME + echo $PROJECT_NAME + echo "" cat $GLOBAL_PREFIX || fatal "prefix output failed" ( collect_deps | map_deps | sort -u | while read notice @@ -106,8 +107,8 @@ echo "" echo "" done - [[ -f $LOCAL_NOTICE ]] && egrep '^($|[^#])' $LOCAL_NOTICE - ) | cat -s + [[ -f $LOCAL_NOTICE ]] && cat $LOCAL_NOTICE + ) | egrep '^($|[^#])' | cat -s } generate_notice