diff options
Diffstat (limited to 'source3/script')
| -rwxr-xr-x | source3/script/installbin.sh.in | 9 | ||||
| -rwxr-xr-x | source3/script/installman.sh | 1 | ||||
| -rwxr-xr-x | source3/script/mkproto.sh | 2 | ||||
| -rw-r--r-- | source3/script/mksyms.awk | 76 | ||||
| -rwxr-xr-x | source3/script/mksyms.sh | 45 | ||||
| -rwxr-xr-x | source3/script/tests/test_posix_s3.sh | 2 | ||||
| -rwxr-xr-x | source3/script/uninstallbin.sh.in | 6 |
7 files changed, 124 insertions, 17 deletions
diff --git a/source3/script/installbin.sh.in b/source3/script/installbin.sh.in index 59a6c31ca8..c607d9e445 100755 --- a/source3/script/installbin.sh.in +++ b/source3/script/installbin.sh.in @@ -19,15 +19,6 @@ for p in $*; do fi cp $p $DESTDIR/$BINDIR/ chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2 - - # this is a special case, mount needs this in a specific location - if [ $p2 = smbmount ]; then - if [ ! -d $DESTDIR/@rootsbindir@ ]; then - mkdir $DESTDIR/@rootsbindir@ - fi - echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 " - ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs - fi done diff --git a/source3/script/installman.sh b/source3/script/installman.sh index 7edc707ab0..869ce6ee38 100755 --- a/source3/script/installman.sh +++ b/source3/script/installman.sh @@ -49,7 +49,6 @@ for lang in $langs; do # Check if this man page if required by the configured feature set case "${MP_BASENAME}" in smbsh.1) test -z "${SMBWRAPPER}" && continue ;; - smbmnt.8|smbmount.8|smbumount.8) test -z "${SMBMOUNT_PROGS}" && continue ;; *) ;; esac diff --git a/source3/script/mkproto.sh b/source3/script/mkproto.sh index e46e73e3e9..8561f42dff 100755 --- a/source3/script/mkproto.sh +++ b/source3/script/mkproto.sh @@ -25,7 +25,7 @@ header="$1" shift headertmp="$header.$$.tmp~" -proto_src="`echo $@ | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort | uniq | egrep -v 'tdb/|wrapped|modules/getdate'`" +proto_src="`echo $@ | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort | uniq | egrep -v 'tdb/|wrapped|modules/getdate' | egrep -v '\.a$'`" echo creating $header diff --git a/source3/script/mksyms.awk b/source3/script/mksyms.awk new file mode 100644 index 0000000000..a30bea4d34 --- /dev/null +++ b/source3/script/mksyms.awk @@ -0,0 +1,76 @@ +# +# mksyms.awk +# +# Extract symbols to export from C-header files. +# output in version-script format for linking shared libraries. +# +# Copyright (C) 2008 Micheal Adam <obnox@samba.org> +# +BEGIN { + inheader=0; + current_file=""; + print "#" + print "# This file is automatically generated with \"make symbols\". DO NOT EDIT " + print "#" + print "{" + print "\tglobal:" +} + +END { + print"" + print "\tlocal: *;" + print "};" +} + +{ + if (FILENAME!=current_file) { + print "\t\t# The following definitions come from",FILENAME + current_file=FILENAME + } + if (inheader) { + if (match($0,"[)][ \t]*[;][ \t]*$")) { + inheader = 0; + } + next; + } +} + +/^static/ || /^[ \t]*typedef/ || !/^[a-zA-Z\_]/ { + next; +} + +/^extern[ \t]+[^()]+[;][ \t]*$/ { + gsub(/[^ \t]+[ \t]+/, ""); + sub(/[;][ \t]*$/, ""); + printf "\t\t%s;\n", $0; + next; +} + +# look for function headers: +{ + gotstart = 0; + if ($0 ~ /^[A-Za-z_][A-Za-z0-9_]+/) { + gotstart = 1; + } + if(!gotstart) { + next; + } +} + +/[_A-Za-z0-9]+[ \t]*[(].*[)][ \t]*;[ \t]*$/ { + sub(/[(].*$/, ""); + gsub(/[^ \t]+[ \t]+/, ""); + gsub(/^[*]/, ""); + printf "\t\t%s;\n",$0; + next; +} + +/[_A-Za-z0-9]+[ \t]*[(]/ { + inheader=1; + sub(/[(].*$/, ""); + gsub(/[^ \t]+[ \t]+/, ""); + gsub(/^[*]/, ""); + printf "\t\t%s;\n",$0; + next; +} + diff --git a/source3/script/mksyms.sh b/source3/script/mksyms.sh new file mode 100755 index 0000000000..637ec5027c --- /dev/null +++ b/source3/script/mksyms.sh @@ -0,0 +1,45 @@ +#! /bin/sh + +# +# mksyms.sh +# +# Extract symbols to export from C-header files. +# output in version-script format for linking shared libraries. +# +# This is the shell warpper for the mksyms.awk core script. +# +# Copyright (C) 2008 Micheal Adam <obnox@samba.org> +# + +LANG=C; export LANG +LC_ALL=C; export LC_ALL +LC_COLLATE=C; export LC_COLLATE + +if [ $# -lt 2 ] +then + echo "Usage: $0 awk output_file header_files" + exit 1 +fi + +awk="$1" +shift + +symsfile="$1" +shift +symsfile_tmp="$symsfile.$$.tmp~" + +proto_src="`echo $@ | tr ' ' '\n' | sort | uniq `" + +echo creating $symsfile + +mkdir -p `dirname $symsfile` + +${awk} -f script/mksyms.awk $proto_src > $symsfile_tmp + +if cmp -s $symsfile $symsfile_tmp 2>/dev/null +then + echo "$symsfile unchanged" + rm $symsfile_tmp +else + mv $symsfile_tmp $symsfile +fi diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh index 91863b7a6b..7b4c0224ba 100755 --- a/source3/script/tests/test_posix_s3.sh +++ b/source3/script/tests/test_posix_s3.sh @@ -54,6 +54,8 @@ skipped="$skipped RAW-SFILEINFO" echo "WARNING: Skipping tests $skipped" +ADDARGS="$ADDARGS --option=torture:sharedelay=100000" + failed=0 for t in $tests; do if [ ! -z "$start" -a "$start" != $t ]; then diff --git a/source3/script/uninstallbin.sh.in b/source3/script/uninstallbin.sh.in index e1bbf6ecb1..8064db8d95 100755 --- a/source3/script/uninstallbin.sh.in +++ b/source3/script/uninstallbin.sh.in @@ -26,12 +26,6 @@ for p in $*; do echo "Cannot remove $DESTDIR/$BINDIR/$p2 ... does $USER have privileges? " fi fi - - # this is a special case, mount needs this in a specific location - if test "$p2" = smbmount -a -f "$DESTDIR/sbin/mount.smbfs"; then - echo "Removing $DESTDIR/sbin/mount.smbfs " - rm -f "$DESTDIR/@rootsbindir@/sbin/mount.smbfs" - fi done |