Author: bdelacretaz
Date: Tue Jun 3 04:22:55 2008
New Revision: 662743
URL: http://svn.apache.org/viewvc?rev=662743&view=rev
Log:
SLING-493 - include local module.notice.txt in NOTICE if provided
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=662743&r1=662742&r2=662743&view=diff
==============================================================================
--- incubator/sling/trunk/etc/notice/mknotice (original)
+++ incubator/sling/trunk/etc/notice/mknotice Tue Jun 3 04:22:55 2008
@@ -26,6 +26,7 @@
GLOBAL_PREFIX=$NOTICES/prefix.txt
PROJECT_NAME=""
MVN_OPT="-o"
+LOCAL_NOTICE="module.notice.txt"
fatal() {
echo ""
@@ -88,22 +89,25 @@
[[ -n "$PROJECT_NAME" ]] || fatal "Project name not found"
echo $PROJECT_NAME
cat $GLOBAL_PREFIX || fatal "prefix output failed"
- collect_deps | map_deps | sort -u | while read notice
- do
- if [[ "$notice" = NO_NOTICE ]]
- then
- continue
- fi
- notice=$NOTICES/$notice
- [[ -f $notice ]] || fatal "Notice file $notice not found"
- if [[ "$MKNOTICE_DEBUG" -eq 1 ]]
- then
- echo "[DEBUG] $ME: including notice file $notice"
- fi
- cat $notice
- echo ""
- echo ""
- done | cat -s
+ (
+ collect_deps | map_deps | sort -u | while read notice
+ do
+ if [[ "$notice" = NO_NOTICE ]]
+ then
+ continue
+ fi
+ notice=$NOTICES/$notice
+ [[ -f $notice ]] || fatal "Notice file $notice not found"
+ if [[ "$MKNOTICE_DEBUG" -eq 1 ]]
+ then
+ echo "[DEBUG] $ME: including notice file $notice"
+ fi
+ cat $notice
+ echo ""
+ echo ""
+ done
+ [[ -f $LOCAL_NOTICE ]] && cat $LOCAL_NOTICE
+ ) | cat -s
}
generate_notice
\ No newline at end of file
