Author: obnox Date: 2007-04-18 11:12:31 +0000 (Wed, 18 Apr 2007) New Revision: 22330
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22330 Log: 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. Modified: branches/SAMBA_3_0/make-tarball.sh Changeset: Modified: branches/SAMBA_3_0/make-tarball.sh =================================================================== --- branches/SAMBA_3_0/make-tarball.sh 2007-04-18 11:08:16 UTC (rev 22329) +++ branches/SAMBA_3_0/make-tarball.sh 2007-04-18 11:12:31 UTC (rev 22330) @@ -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 - +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 -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 - - +( 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 @@ 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 )