Changeset 740 for vendor/current/source4/script

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/script

Files:

• configure_check_unused.pl (deleted)
• depfilter.py (modified) (1 diff)
• installdat.sh (deleted)
• installdirs.sh (deleted)
• installheader.pl (deleted)
• installlib.sh (deleted)
• installman.sh (deleted)
• installmisc.sh (deleted)
• installpc.sh (deleted)
• installswat.sh (deleted)
• minimal_includes.pl (modified) (7 diffs)
• mkinstalldirs (deleted)
• mkproto.pl (modified) (3 diffs)
• mkrelease.sh (modified) (1 diff)
• mkversion.sh (deleted)
• pkg-config (deleted)
• revert.sh (deleted)
• uninstalllib.sh (deleted)
• uninstallman.sh (deleted)

vendor/current/source4/script/depfilter.py

@@ -1 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Filter out arcs in a dotty graph that are at or below a certain

vendor/current/source4/script/minimal_includes.pl

@@ -12 +12 @@
 my $opt_remove = 0;
 my $opt_skip_system = 0;
+my $opt_waf = 0;
 
 #####################################################################
@@ -44 +45 @@
         my $fname = shift;
         my $obj;
-        if ($fname =~ s/(.*)\.c$/$1.o/) {
+        if ($opt_waf) {
+                my $ret = `../buildtools/bin/waf $fname 2>&1`;
+                return $ret
+        }
+        if ($fname =~ s/(.*)\..*$/$1.o/) {
                 $obj = "$1.o";
         } else {
@@ -68 +73 @@
         $lines->[$i] = "";
 
-        `/bin/mv -f $fname $fname.misaved` && die "failed to rename $fname";
+        my $mname = $fname . ".misaved";
+
+        unlink($mname);
+        rename($fname, $mname) || die "failed to rename $fname";
         save_lines($fname, $lines);
         
@@ -80 +88 @@
                         } else {
                                 print "$fname: removing $line\n";
+                                unlink($mname);
                                 return;
                         }
@@ -88 +97 @@
 
         $lines->[$i] = $line;
-        `/bin/mv -f $fname.misaved $fname` && die "failed to restore $fname";
+        rename($mname, $fname) || die "failed to restore $fname";
 }
 
@@ -139 +148 @@
                  --remove       remove includes, don't just list them
                  --skip-system  don't remove system/ includes
+                 --waf          use waf target conventions
 ";
 }
@@ -148 +158 @@
             'remove' => \$opt_remove,
             'skip-system' => \$opt_skip_system,
+            'waf' => \$opt_waf,
             );
 

vendor/current/source4/script/mkproto.pl

@@ -129 +129 @@
         my ($file,$line) = @_;
 
-        if ($line =~ /^_PUBLIC_ FN_(GLOBAL|LOCAL)_(CONST_STRING|STRING|BOOL|bool|CHAR|INTEGER|LIST)\((\w+),.*\)/o) {
+        if ($line =~ /^FN_(GLOBAL|LOCAL)_(CONST_STRING|STRING|BOOL|bool|CHAR|INTEGER|LIST)\((\w+),.*\)/o) {
                 my $scope = $1;
                 my $type = $2;
@@ -148 +148 @@
                             );
 
-                $file->("$tmap{$type}$name($smap{$scope});\n");
+                $file->("$tmap{$type}lpcfg_$name($smap{$scope});\n");
         }
 }
@@ -191 +191 @@
                 next if ($line =~ /^\/|[;]/);
 
-                if ($line =~ /^_PUBLIC_ FN_/) {
+                if ($line =~ /^FN_/) {
                         handle_loadparm($public_file, $line);
                         handle_loadparm($private_file, $line);

vendor/current/source4/script/mkrelease.sh

@@ -7 +7 @@
 fi
 
-OUTDIR=`mktemp -d samba-XXXXX`
-(git archive --format=tar HEAD | (cd $OUTDIR/ && tar xf -))
+cd source4
+../buildtools/bin/waf dist
+TGZFILE="`echo *.tar.gz`"
+gunzip $TGZFILE
+TARFILE="`echo *.tar`"
 
-echo SAMBA_VERSION_IS_GIT_SNAPSHOT=no >> $OUTDIR/source4/VERSION
-
-rm -f $OUTDIR/source4/ldap_server/devdocs/rfc????.txt \
-      $OUTDIR/source4/heimdal/lib/wind/rfc????.txt
-
-#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.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"
-
-
-