From b111d69f38b4378fc059904ccf8d8d1a7b01a4d3 Mon Sep 17 00:00:00 2001
From: Pekka Riikonen <priikone@silcnet.org>
Date: Sat, 23 Apr 2005 14:20:49 +0000
Subject: [PATCH] 	Fixed 'noprocess' sed script.

---
 apps/autodist/CHANGES           |  6 ++++++
 apps/autodist/TODO              |  3 +++
 apps/autodist/autodist.in       |  9 ++++++---
 apps/autodist/doc/autodist.texi | 15 +++++++++------
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/apps/autodist/CHANGES b/apps/autodist/CHANGES
index b1b482a..7f9bf01 100644
--- a/apps/autodist/CHANGES
+++ b/apps/autodist/CHANGES
@@ -1,3 +1,9 @@
+Sat Apr 23 12:49:09 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
+
+	* Autodist 1.2.1.
+
+	* Fixed 'noprocess' sed script.
+
 Fri Apr 22 20:23:06 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
 
 	* Autodist 1.2.
diff --git a/apps/autodist/TODO b/apps/autodist/TODO
index e3ffa33..e3e00ea 100644
--- a/apps/autodist/TODO
+++ b/apps/autodist/TODO
@@ -10,4 +10,7 @@ o Better 'license-header' implementation.
 o Perhaps ability to partially re-license the source tree.  Now all files
   will be processed if 'license-header' is used.
 
+o Better 'noprocess' so that it would work with directories recursively,
+  such as noprocess foo/bar, would not process anything under foo/bar.
+
 o Perhaps output autodist.log when processing the source tree.
diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index 0b3638f..2e8a361 100755
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -702,7 +702,7 @@ ad_process_tree()
 
   # Take away noprocess list
   if test -f autodist.noprocess; then
-    files=`echo $files | sh autodist.noprocess` || exit 1
+    files=`echo $files" " | sh autodist.noprocess` || exit 1
   fi
 
   for ff in $files
@@ -746,7 +746,7 @@ ad_process_source_tree()
 
   # Take away noprocess list
   if test -f autodist.noprocess; then
-    files=`echo $files | sh autodist.noprocess` || exit 1
+    files=`echo $files" " | sh autodist.noprocess` || exit 1
   fi
 
   for ff in $files
@@ -1234,14 +1234,17 @@ ad_process_noprocess()
 
   ad_debug ">ad_process_noprocess"
 
+  cur=`pwd`
+  cd $am_distdir || exit 1
   for i in $noprocess
   do
     # Escape
     ie=`echo $i | sed 's/\\//\\\\\//g'` || exit 1
 
-    n="$n -e 's/$am_distdir\\/$ie//'"
+    n="$n -e 's/$am_distdir\\/$ie //'"
     np=true
   done
+  cd $cur || exit 1
 
   rm -f autodist.noprocess
   if test x$np = xtrue; then
diff --git a/apps/autodist/doc/autodist.texi b/apps/autodist/doc/autodist.texi
index c146c52..928432e 100644
--- a/apps/autodist/doc/autodist.texi
+++ b/apps/autodist/doc/autodist.texi
@@ -774,19 +774,22 @@ process a file.  The Autodist will not process the file during
 preparation or during distribution packaging.  This directive is optional.
 One or more file can be specified in the 'noprocess' directive.  Zero or
 more 'noprocess' directives can be used in distribution.  The <filename>
-can be a single file, a single directory or a regular expression that
-will match several files and/or directories.  If directory is specified
-then all files inside the directory will not be processed.
+can be a single file or a regular expression that will match several files.
+Note that, in current Autodist version 'noprocess' cannot be used to
+specify directories.
 
 Example:
 @example
 noprocess autodist.texi
+noprocess apps/foo/*
 @end example
 
-Autodist will not process 'autodist.texi' file.
+Autodist will not process 'autodist.texi' file, and any file that match
+'apps/foo/*'.  Note that, any subdirectory under 'apps/foo/' will not
+match, and will be processed.
 
-Note that, 'noprocess' directive cannot be used to disallow processing
-of any file with '.ad' suffix.
+Also note that, 'noprocess' directive cannot be used to disallow 
+processing of any file with '.ad' suffix.
 
 
 @section Directive: pre-hook <filename> [...]
-- 
2.24.0