diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-09-20 15:24:44 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-09-20 15:24:44 -0700 |
| commit | ead126caace0cd94ab515f5d9f2199b60a84f914 (patch) | |
| tree | 3778093012c4216674321416788072f497ac3a4b /source4 | |
| parent | 8853babb504298bd87fb5cae2120f2be63b08312 (diff) | |
| parent | db67f43aefccccedbd8bf59c7d97c99295b7a168 (diff) | |
| download | samba-ead126caace0cd94ab515f5d9f2199b60a84f914.tar.gz samba-ead126caace0cd94ab515f5d9f2199b60a84f914.tar.bz2 samba-ead126caace0cd94ab515f5d9f2199b60a84f914.zip | |
Merge branch 'v4-0-stable' into newmaster
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/VERSION | 4 | ||||
| -rwxr-xr-x | source4/script/mkrelease.sh | 45 | ||||
| -rw-r--r-- | source4/selftest/slow | 3 |
3 files changed, 18 insertions, 34 deletions
diff --git a/source4/VERSION b/source4/VERSION index 76e66da6bd..350367982e 100644 --- a/source4/VERSION +++ b/source4/VERSION @@ -57,7 +57,7 @@ SAMBA_VERSION_TP_RELEASE= # e.g. SAMBA_VERSION_ALPHA_RELEASE=1 # # -> "4.0.0alpha1" # ######################################################## -SAMBA_VERSION_ALPHA_RELEASE=12 +SAMBA_VERSION_ALPHA_RELEASE=13 ######################################################## # For 'pre' releases the version will be # @@ -89,7 +89,7 @@ SAMBA_VERSION_RC_RELEASE= # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # # -> "3.0.0-SVN-build-199" # ######################################################## -SAMBA_VERSION_IS_GIT_SNAPSHOT=yes +SAMBA_VERSION_IS_GIT_SNAPSHOT=no ######################################################## # This is for specifying a release nickname # diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh index 6fc17714f7..4c0d9e01eb 100755 --- a/source4/script/mkrelease.sh +++ b/source4/script/mkrelease.sh @@ -6,38 +6,21 @@ if [ ! -d ".git" -o `dirname $0` != "./source4/script" ]; then exit 1 fi -echo "WARNING: This script prepares an autotools based release, which has known problems!" +cd source4 +../buildtools/bin/waf dist + +TGZFILE="`echo *.tar.gz`" +gunzip $TGZFILE +TARFILE="`echo *.tar`" +tar xf $TARFILE +DIRN="`echo -n $TARFILE | sed -e 's/\.tar//'`" +cd $DIRN/source4 && ./autogen.sh && cd ../.. +tar cf $TARFILE $DIRN +rm -r "$DIRN" -OUTDIR=`mktemp -d samba-XXXXX` -(git archive --format=tar HEAD | (cd $OUTDIR/ && tar xf -)) - -#Prepare the tarball for a Samba4 release, with some generated files, -#but without Samba3 stuff (to avoid confusion) -( cd $OUTDIR/ || exit 1 - rm -rf README Manifest Read-Manifest-Now Roadmap source3 packaging docs-xml examples swat WHATSNEW.txt MAINTAINERS || exit 1 - cd source4 || exit 1 - ./autogen-autotools.sh || exit 1 - ./configure || exit 1 - make dist || exit 1 -) || exit 1 - -VERSION_FILE=$OUTDIR/source4/version.h -if [ ! -f $VERSION_FILE ]; then - echo "Cannot find version.h at $VERSION_FILE" - exit 1; -fi - -VERSION=`sed -n 's/^SAMBA_VERSION_STRING=//p' $VERSION_FILE` -echo "Version: $VERSION" -mv $OUTDIR samba-$VERSION || exit 1 -tar -cf samba-$VERSION.tar samba-$VERSION || (rm -rf samba-$VERSION; exit 1) -rm -rf samba-$VERSION || exit 1 echo "Now run: " -echo "gpg --detach-sign --armor samba-$VERSION.tar" -echo "gzip samba-$VERSION.tar" +echo "gpg --detach-sign --armor $TARFILE" +echo "gzip $TARFILE" echo "And then upload " -echo "samba-$VERSION.tar.gz samba-$VERSION.tar.asc" +echo "$TARFILE.gz $TARFILE.asc" echo "to pub/samba/samba4/ on samba.org" - - - diff --git a/source4/selftest/slow b/source4/selftest/slow index 6501a0cbf0..7c2090c0e6 100644 --- a/source4/selftest/slow +++ b/source4/selftest/slow @@ -1,4 +1,4 @@ -# This file contains regexes matching tests that are very slow and +# This file contains regexes matching tests that are very slow and # should be skipped during a normal test run. .*base.bench.holdcon.* # Slow raw.bench.lookup # Slow @@ -6,3 +6,4 @@ base.utable # Slow base.smb # Slow rpc.scanner # Slow ntvfs.cifs.base.delaywrite # It's a slow test and having it on the proxy share is not needed +.*stress.* # Slow |