r23713: Oops accidentially checked in the wrong file - sorry!

[ira/wip.git] / make-tarball.sh

diff --git a/make-tarball.sh b/make-tarball.sh
index 1eb05db70dcb4f48acb3fd7b164cdd274e09058e..c57f01dc790fcf9e894f4e4de52c268a1e0a33b9 100644 (file)
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -4,23 +4,43 @@
 ## You either need to include the using_samba cvs module in the
 ## parent directory or tell the script where to find it 
 ##
-## Usgae:  ./make-tarball.sh
+## Usgae:  ./make-tarball.sh [nodocs]
 
+NODOCS=0
+if [ x"$1" = x"nodocs" ] ; then
+       NODOCS=1
+       echo Not including docs.
+fi
+
+DOCSDIR=../samba-docs/
 USING_SAMBA=../using_samba/
 SRCDIR=`pwd`
 
-if [ ! -d $USING_SAMBA ]; then
-
-       echo Cannot find "Using Samba" directory \(assuming $USING_SAMBA\).  
-       echo Please set the USING_SAMBA variable in this script to the correct
-       echo location.  The html files are available in the using_samba CVS 
-       echo module on cvs.samba.org.  See http://cvs/samba.org/ for details 
-       echo about anonymous CVS access.  Exiting now....
-
-       exit 1
-
+if [ $NODOCS -eq 0 ]; then
+       if [ ! -d $USING_SAMBA ]; then
+       
+               echo Cannot find "Using Samba" directory \(assuming $USING_SAMBA\).  
+               echo Please set the USING_SAMBA variable in this script to the correct
+               echo location.  The html files are available in the using_samba CVS 
+               echo module on cvs.samba.org.  See http://cvs.samba.org/ for details 
+               echo about anonymous CVS access.  Exiting now....
+       
+               exit 1
+       
+       fi
+       
+       if [ ! -d $DOCSDIR ]; then
+       
+               echo Cannot find samba-docs \(assuming $DOCSDIR\).
+               echo Please set the DOCSDIR variable in this script 
+               echo to the correct path.
+       
+               exit 1
+       
+       fi
 fi
 
+( cd source ; sh script/mkversion.sh )
 VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING source/include/version.h | cut -d\" -f2 | sed 's/ /_/g'`
 TARBALLDIR=/tmp/samba-$VERSION
 
@@ -31,7 +51,11 @@ echo Creating the tarball source directory in $TARBALLDIR
 
 mkdir $TARBALLDIR
 rsync -aC ./ $TARBALLDIR
-rsync -aC $USING_SAMBA $TARBALLDIR/docs/htmldocs/
+/bin/rm -rf $TARBALLDIR/docs/*
+if [ $NODOCS -eq 0 ]; then
+       rsync -aC $DOCSDIR/ $TARBALLDIR/docs/ 
+       rsync -aC $USING_SAMBA $TARBALLDIR/docs/htmldocs/
+fi
 
 echo Creating packaging scripts...
 ( cd $TARBALLDIR/packaging; sh bin/update-pkginfo $VERSION 1 )