diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /release-scripts | |
parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'release-scripts')
-rwxr-xr-x | release-scripts/create-tarball | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball index 3463f012a5..04728d835d 100755 --- a/release-scripts/create-tarball +++ b/release-scripts/create-tarball @@ -7,7 +7,7 @@ OPT_TAG="" OPT_KEYID="" TOPDIR="`dirname $0`/.." -VER_H="${TOPDIR}/source/include/version.h" +VER_H="${TOPDIR}/source3/include/version.h" function exitOnError { @@ -38,7 +38,7 @@ function printUsage } ## -## Parse the command line options +## Parse the command line options ## function parseOptions @@ -115,7 +115,7 @@ function buildDocs rsync -av "${OPT_DOCSDIR}"/ docs/ exitOnError $? "Failed top copy docs from ${OPT_DOCSDIR}" - + return 0 fi @@ -163,23 +163,23 @@ function createReleaseTag ## ## Main driver ## -function main +function main { parseOptions "$@" exitOnError $? "Failed to parse options" - + cd $TOPDIR git-checkout ${OPT_BRANCH} exitOnError $? "Invalid branch name \"${OPT_BRANCH}\"" - (cd source && ./script/mkversion.sh) + (cd source3 && ./script/mkversion.sh) if [ ! -f $VER_H ]; then exitOnError 1 "Failed to find ${VER_H}!" fi - version=`grep SAMBA_VERSION_OFFICIAL_STRING $VER_H | awk '{print $3}'` - vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX $VER_H | awk '{print $3}'` + version=`grep "define SAMBA_VERSION_OFFICIAL_STRING" $VER_H | awk '{print $3}'` + vendor_version=`grep "define SAMBA_VERSION_VENDOR_SUFFIX" $VER_H | awk '{print $3}'` if [ -n "$vendor_version" ]; then version="$version-$vendor_version" fi @@ -198,7 +198,7 @@ function main buildDocs exitOnError $? "Failed to build documentation" - ( cd source && ./autogen.sh ) + ( cd source3 && ./autogen.sh ) cd .. tar cf samba-${version}.tar --exclude=.git* --exclude=CVS --exclude=.svn samba-${version} |