[SCM] Samba Shared Repository - branch master updated - 31dc3629475a07dcc9900929ce943c274db36250

[Karolin Seeger]

The branch, master has been updated
       via  31dc3629475a07dcc9900929ce943c274db36250 (commit)
       via  cb4d7b48e51fe5bcf538e7b98b5a2392e51cb0b0 (commit)
       via  a99a176707cade1e6cc12c46a6ca689ef9ea1f16 (commit)
      from  bee2b6c3a3890949bd87e1e4b8c6de010c808f4d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 31dc3629475a07dcc9900929ce943c274db36250
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date:   Mon Sep 22 08:57:59 2008 -0700

    create-tarball: Adapt script to changed directory structure.
    
    Karolin

commit cb4d7b48e51fe5bcf538e7b98b5a2392e51cb0b0
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date:   Mon Sep 22 08:55:01 2008 -0700

    create-tarball: Don't remove /*.
    
    These strings do appear several times. Extend the grep pattern to
    get the right string only. This avoids the removal of /*!
    
    Karolin

commit a99a176707cade1e6cc12c46a6ca689ef9ea1f16
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date:   Mon Sep 22 08:53:40 2008 -0700

    create-tarball: Remove trailing/leading whitespaces.
    
    Karolin

-----------------------------------------------------------------------

Summary of changes:
 release-scripts/create-tarball |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 3463f01..04728d8 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}


-- 
Samba Shared Repository