diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 03:45:06 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 03:45:06 +0200 |
| commit | b5d84a74d146cfe0d2e0c336a88bd269ad61cded (patch) | |
| tree | 8acad6b634cfe312144f92f8a0fb6ab44b47cd19 /source4/script | |
| parent | 237f1cca028881a57f961884f427673907c1535a (diff) | |
| parent | 1f474f4a545752f7ac0ad402d01d1e768b973dbe (diff) | |
| download | samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.tar.gz samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.tar.bz2 samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/build/smb_build/makefile.pm
source/heimdal_build/config.mk
source/lib/events/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/registry/config.mk
source/lib/socket_wrapper/config.mk
source/lib/tdb/config.mk
source/lib/tls/config.mk
source/lib/util/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/scripting/ejs/config.mk
source/smbd/process_model.mk
(This used to be commit 760378e0294dd0cd4523a83448328478632d7e3d)
Diffstat (limited to 'source4/script')
| -rwxr-xr-x | source4/script/mkproto.pl | 1 | ||||
| -rwxr-xr-x | source4/script/mkrelease.sh | 16 |
2 files changed, 12 insertions, 5 deletions
diff --git a/source4/script/mkproto.pl b/source4/script/mkproto.pl index 87a68e33fa..e1b790d41d 100755 --- a/source4/script/mkproto.pl +++ b/source4/script/mkproto.pl @@ -192,6 +192,7 @@ sub process_file($$$) if ($line =~ /^_PUBLIC_ FN_/) { handle_loadparm($public_file, $line); + handle_loadparm($private_file, $line); next; } diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh index a6e7c8493b..0af738deb5 100755 --- a/source4/script/mkrelease.sh +++ b/source4/script/mkrelease.sh @@ -1,10 +1,15 @@ #!/bin/sh -TMPDIR=`mktemp samba-XXXXX` -rm $TMPDIR || exit 1 -svn export . $TMPDIR || exit 1 +if [ ! -d ".git" -o `dirname $0` != "./source/script" ]; then + echo "Run this script from the top-level directory in the" + echo "repository as: ./source/script/mkrelease.sh" + exit 1 +fi -( cd $TMPDIR/source +TMPDIR=`mktemp -d samba-XXXXX` +(git archive --format=tar HEAD | (cd $TMPDIR/ && tar xf -)) + +( cd $TMPDIR/source || exit 1 ./autogen.sh || exit 1 ./configure || exit 1 make dist || exit 1 @@ -12,7 +17,8 @@ svn export . $TMPDIR || exit 1 VERSION=`sed -n 's/^SAMBA_VERSION_STRING=//p' $TMPDIR/source/version.h` mv $TMPDIR samba-$VERSION || exit 1 -tar -cf samba-$VERSION.tar 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" |