summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-04-18 11:12:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:27 -0500
commit2ed59671ce881695023dc23ab1b491e4102aa88f (patch)
tree41f217027c1c2460bc25c8de4c01a2ace35536e3
parent9812a7e32e515315302d3040a4145592640de7f7 (diff)
downloadsamba-2ed59671ce881695023dc23ab1b491e4102aa88f.tar.gz
samba-2ed59671ce881695023dc23ab1b491e4102aa88f.tar.bz2
samba-2ed59671ce881695023dc23ab1b491e4102aa88f.zip
r22330: For my own convenience (changes discussed some weeks ago with
Jerry, who basically didn't care - now I can commit them myself;-): - Add a call to mkversion.sh to ensure sane version number even from a plain checkout. - Add a "nodocs" switch to allow for calling make-tarball.sh without the need of having samba-docs and using-samba around. (This used to be commit 1e1d22028aff2fc15cb471e33d5af56ee92bc3e3)
-rw-r--r--make-tarball.sh58
1 files changed, 34 insertions, 24 deletions
diff --git a/make-tarball.sh b/make-tarball.sh
index f3250d5c73..c57f01dc79 100644
--- a/make-tarball.sh
+++ b/make-tarball.sh
@@ -4,35 +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
-
-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
-
+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
@@ -44,8 +52,10 @@ echo Creating the tarball source directory in $TARBALLDIR
mkdir $TARBALLDIR
rsync -aC ./ $TARBALLDIR
/bin/rm -rf $TARBALLDIR/docs/*
-rsync -aC $DOCSDIR/ $TARBALLDIR/docs/
-rsync -aC $USING_SAMBA $TARBALLDIR/docs/htmldocs/
+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 )