From ea981e1d1921ee55bba049f502312280a2c58b92 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Wed, 30 Mar 2011 19:50:46 +0200
Subject: [PATCH] small release script improvements

---
 src/VERSION                  |  2 +-
 src/doc/user/usermanual.sgml |  9 ++++++---
 src/makesrcdist.sh           | 35 ++++++++++++++++++++++++++++++-----
 src/mk/manifest.txt          |  1 +
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/VERSION b/src/VERSION
index dda688a7..f161df1c 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-1.15.8pre
+1.15.9pre
diff --git a/src/doc/user/usermanual.sgml b/src/doc/user/usermanual.sgml
index d35c828d..918f25d5 100644
--- a/src/doc/user/usermanual.sgml
+++ b/src/doc/user/usermanual.sgml
@@ -1075,9 +1075,12 @@ fvwm
 
         <listitem>
           <para>The bottom part allows restricting the search results to a
-            sub-tree of the indexed area. If you need to do this often, 
-            you may think of setting up multiple indexes instead, as the
-            performance will be much better.</para>
+            sub-tree of the indexed area. You can use the
+            <guilabel>Invert</guilabel> checkbox to search for files not in
+            the sub-tree instead. If you use directory filtering often and on
+            big subsets of the file system, you may think of setting up
+            multiple indexes instead, as the performance may be
+            better. </para>
         </listitem>
 
       </itemizedlist>
diff --git a/src/makesrcdist.sh b/src/makesrcdist.sh
index 3ca5c4c2..41e8910f 100644
--- a/src/makesrcdist.sh
+++ b/src/makesrcdist.sh
@@ -7,7 +7,10 @@ fatal() {
     exit 1
 }
 usage() {
-    echo 'Usage: [dotag=no] makescrdist.sh do_it'
+    echo 'Usage: makescrdist.sh -t -s do_it'
+    echo ' -t : no tagging'
+    echo ' -s : snapshot release: use date instead of VERSION'
+    echo ' -s implies -t'
     exit 1
 }
 tagtopsvn() {
@@ -25,7 +28,6 @@ tagtop() {
 }
 
 #set -x
-test $# -eq 1 || usage
 
 TAR=/usr/bin/tar
 
@@ -40,9 +42,32 @@ if test ! -d qtgui;then
 fi
 targetdir=${targetdir-/tmp}
 dotag=${dotag-yes}
-version=`cat VERSION`
-versionforcvs=`echo $version | sed -e 's/\./_/g'`
-TAG="RECOLL_$versionforcvs"
+snap=${snap-no}
+
+while getopts ts o
+do	case "$o" in
+	t)	dotag=no;;
+	s)	snap=yes;dotag=no;;
+	[?])	usage;;
+	esac
+done
+shift `expr $OPTIND - 1`
+
+test $dotag = "yes" -a $snap = "yes" && usage
+
+test $# -eq 1 || usage
+
+echo dotag $dotag snap $snap
+
+if test $snap = yes ; then
+  version=`date +%s`
+  versionforcvs=$version
+  TAG=""
+else
+  version=`cat VERSION`
+  versionforcvs=`echo $version | sed -e 's/\./_/g'`
+  TAG="RECOLL_$versionforcvs"
+fi
 
 if test "$dotag" = "yes" ; then
   echo Creating AND TAGGING version $versionforcvs
diff --git a/src/mk/manifest.txt b/src/mk/manifest.txt
index 377c05bb..54a76a4a 100644
--- a/src/mk/manifest.txt
+++ b/src/mk/manifest.txt
@@ -145,6 +145,7 @@ filters/rclsvg
 filters/rcltex
 filters/rcltext
 filters/rcluncomp
+filters/rclwar
 filters/rclwpd
 filters/rclxls
 filters/rclzip