The branch, master has been updated
via 73140a1 build: remove mktowscript
via 8b99c20 build: Add missing depencency on NDR_NBT
via 13c651c build: Add missing dep on UTIL_TEVENT
from 399c0db s3:registry: remove unused function regdb_key_is_base_key()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 73140a11c40cbef81b9af6363a72fdba2077222d
Author: Andrew Bartlett <[email protected]>
Date: Tue Jul 5 09:47:25 2011 +1000
build: remove mktowscript
We finished the conversion a long time ago
Andrew Bartlett
Autobuild-User: Andrew Bartlett <[email protected]>
Autobuild-Date: Tue Jul 5 05:56:06 CEST 2011 on sn-devel-104
commit 8b99c2063a99f23ad08d39b69f4988eee058628b
Author: Andrew Bartlett <[email protected]>
Date: Tue Jul 5 04:33:27 2011 +0200
build: Add missing depencency on NDR_NBT
commit 13c651cf298d815333423b10a2d7d699099c20f3
Author: Andrew Bartlett <[email protected]>
Date: Tue Jul 5 04:22:16 2011 +0200
build: Add missing dep on UTIL_TEVENT
-----------------------------------------------------------------------
Summary of changes:
buildtools/mktowscript/mklist.txt | 86 -------
buildtools/mktowscript/mktowscript.pl | 451 ---------------------------------
buildtools/mktowscript/rebuild_all.sh | 37 ---
libcli/netlogon/wscript_build | 2 +-
librpc/wscript_build | 2 +-
5 files changed, 2 insertions(+), 576 deletions(-)
delete mode 100644 buildtools/mktowscript/mklist.txt
delete mode 100755 buildtools/mktowscript/mktowscript.pl
delete mode 100755 buildtools/mktowscript/rebuild_all.sh
Changeset truncated at 500 lines:
diff --git a/buildtools/mktowscript/mklist.txt
b/buildtools/mktowscript/mklist.txt
deleted file mode 100644
index ee77bb9..0000000
--- a/buildtools/mktowscript/mklist.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-source4/main.mk
-source4/lib/basic.mk
-pidl/config.mk
-nsswitch/config.mk
-nsswitch/libwbclient/config.mk
-source4/heimdal_build/internal.mk
-source4/lib/ldb-samba/config.mk
-source4/librpc/config.mk
-source4/utils/config.mk
-source4/utils/net/config.mk
-source4/scripting/python/config.mk
-source4/auth/config.mk
-source4/auth/gensec/config.mk
-source4/auth/kerberos/config.mk
-source4/auth/ntlm/config.mk
-source4/auth/credentials/config.mk
-source4/auth/ntlmssp/config.mk
-source4/libnet/config.mk
-source4/nbt_server/config.mk
-source4/wrepl_server/config.mk
-source4/ntvfs/config.mk
-source4/ntvfs/unixuid/config.mk
-source4/ntvfs/sysdep/config.mk
-source4/ntvfs/common/config.mk
-source4/ntvfs/posix/config.mk
-source4/selftest/config.mk
-source4/cldap_server/config.mk
-source4/smb_server/config.mk
-source4/smb_server/smb2/config.mk
-source4/smb_server/smb/config.mk
-source4/smbd/config.mk source4/smbd/process_model.mk
-source4/kdc/config.mk
-source4/dsdb/config.mk
-source4/dsdb/samdb/ldb_modules/config.mk
-source4/web_server/config.mk
-source4/param/config.mk
-source4/winbind/config.mk
-source4/cluster/config.mk
-source4/client/config.mk
-source4/ntptr/config.mk
-source4/rpc_server/config.mk
-source4/libcli/config.mk
-source4/libcli/smb2/config.mk
-source4/libcli/wbclient/config.mk
-source4/libcli/security/config.mk
-source4/libcli/ldap/config.mk
-source4/ntp_signd/config.mk
-source4/torture/config.mk
-source4/torture/smb2/config.mk
-source4/torture/local/config.mk
-source4/torture/drs/config.mk
-source4/torture/winbind/config.mk
-source4/torture/libsmbclient/config.mk
-source4/torture/libnetapi/config.mk
-source4/lib/messaging/config.mk
-source4/lib/events/config.mk
-source4/lib/stream/config.mk
-source4/lib/cmdline/config.mk
-source4/lib/com/config.mk
-source4/lib/registry/config.mk
-source4/lib/wmi/config.mk
-source4/lib/socket/config.mk
-source4/lib/samba3/config.mk
-source4/ldap_server/config.mk
-libgpo/config.mk
-libcli/cldap/config.mk
-libcli/samsync/config.mk
-libcli/nbt/config.mk
-libcli/auth/config.mk
-libcli/drsuapi/config.mk
-libcli/security/config.mk
-libcli/smb/config.mk
-libcli/named_pipe_auth/config.mk
-libcli/ldap/config.mk
-lib/uid_wrapper/config.mk
-lib/crypto/config.mk
-lib/socket_wrapper/config.mk
-lib/util/config.mk
-lib/util/charset/config.mk
-lib/nss_wrapper/config.mk
-lib/tsocket/config.mk
-lib/popt/config.mk
-lib/async_req/config.mk
-lib/tdr/config.mk
-lib/torture/config.mk
-lib/smbconf/config.mk
diff --git a/buildtools/mktowscript/mktowscript.pl
b/buildtools/mktowscript/mktowscript.pl
deleted file mode 100755
index a05506b..0000000
--- a/buildtools/mktowscript/mktowscript.pl
+++ /dev/null
@@ -1,451 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-use Data::Dumper;
-use File::Basename;
-use List::MoreUtils qw(uniq);
-
-my $globals;
-my $dname;
-
-sub read_file($)
-{
- my $filename = shift;
- open(CONFIG_MK, "$filename");
- my @lines = <CONFIG_MK>;
- close(CONFIG_MK);
- return @lines;
-}
-
-sub trim($)
-{
- my $string = shift;
- $string =~ s/^\s+//;
- $string =~ s/\s+$//;
- return $string;
-}
-
-sub strlist($)
-{
- my $s = shift;
- $s =~ s/\$\(SHLIBEXT\)/so/g;
- $s =~ s/\$\(heimdalsrcdir\)/..\/heimdal/g;
- $s =~ s/\$\(heimdalbuildsrcdir\)/..\/heimdal_build/g;
- $s =~ s/\$\(nsswitchsrcdir\)/..\/nsswitch/g;
- $s =~ s/\$\(param_OBJ_FILES\)/..\/pyparam.c/g;
- $s =~ s/\$\(libclisrcdir\)\///g;
- $s =~ s/\$\(socketwrappersrcdir\)\///g;
- $s =~ s/\$\(libcompressionsrcdir\)\///g;
- $s =~ s/\$\(\w*srcdir\)\///g;
- $s =~ s/\$\(libgpodir\)\///g;
- $s =~ s/\:\.o=\.ho//g;
- $s =~ s/\:\.o=\.d//g;
-
- # this one doesn't exist?
- $s =~ s/\bLDAP_ENCODE\b//g;
-
- # these need to use the library names
- $s =~ s/\bLIBLDB\b/ldb/g;
- $s =~ s/\bLDB\b/ldb/g;
- $s =~ s/\bLIBTALLOC\b/talloc/g;
- $s =~ s/\bTALLOC\b/talloc/g;
- $s =~ s/\bLIBTEVENT\b/tevent/g;
- $s =~ s/\bTEVENT\b/tevent/g;
- $s =~ s/\bTSOCKET\b/LIBTSOCKET/g;
- $s =~ s/\bGENSEC\b/gensec/g;
- $s =~ s/\bLIBTDB\b/tdb/g;
- $s =~ s/\bRESOLV\b/resolv/g;
-
- return trim(join(' ', split(/\s+/, $s)));
-}
-
-sub expand_vars($$)
-{
- my $vars = shift;
- my $s = shift;
- foreach my $v (keys %{$vars}) {
- if ($s =~ /\$\($v\)/) {
- $s =~ s/\$\($v\)/$vars->{$v}/g;
- delete($vars->{$v});
- }
- }
- foreach my $v (keys %{$globals}) {
- if ($s =~ /\$\($v\)/) {
- $s =~ s/\$\($v\)/$globals->{$v}/g;
- }
- }
- return $s;
-}
-
-sub find_file($)
-{
- my $f = shift;
- my $orig = $f;
-
- if ($f =~ /\$/) {
- printf(STDERR "bad variable expansion for file $orig in
$dname\n");
- exit(1);
- }
-
- my $b = basename($f);
- return $b if (-e $b);
-
- return $f if (-e $f);
-
- while ($f =~ /\//) {
- $f =~ s/^[^\/]+\///g;
- return $f if (-e $f);
- }
- my $f2;
- $f2 = `find . -name "$f" -type f`;
- return $f2 unless ($f2 eq "");
- $f2 = `find .. -name "$f" -type f`;
- return $f2 unless ($f2 eq "");
- $f2 = `find ../.. -name "$f" -type f`;
- return $f2 unless ($f2 eq "");
- $f2 = `find ../../.. -name "$f" -type f`;
- return $f2 unless ($f2 eq "");
- printf(STDERR "Failed to find $orig in $dname\n");
- exit(1);
- return '';
-}
-
-sub find_files($)
-{
- my $list = shift;
- my $ret = '';
- foreach my $f (split(/\s+/, $list)) {
- if ($f =~ /\.[0-9]$/) {
- # a man page
- my $m = find_file($f . ".xml");
- die("Unable to find man page $f\n") if ($m eq "");
- $m =~ s/\.xml$//;
- return $m;
- }
- $f = find_file($f);
- $f =~ s/^[.]\///;
- $ret .= ' ' . $f;
- }
- $ret = strlist($ret);
- my @list = split(/\s+/, $ret);
- @list = uniq(@list);
- $ret = trim(join(' ', @list));
- return $ret;
-}
-
-sub read_config_mk($)
-{
- my $filename = shift;
- my @lines = read_file($filename);
- my $prev = "";
- my $linenum = 1;
- my $section = "GLOBAL";
- my $infragment;
- my $result;
- my $line = "";
- my $secnumber = 1;
-
- $result->{"GLOBAL"}->{SECNUMBER} = $secnumber++;
-
- foreach (@lines) {
- $linenum++;
-
- # lines beginning with '#' are ignored
- next if (/^\#.*$/);
-
- if (/^(.*)\\$/) {
- $prev .= $1;
- next;
- } else {
- $line = "$prev$_";
- $prev = "";
- }
-
- if ($line =~
/^mkinclude.*asn1_deps.pl\s+([^\s]+)\s+([^\s]+)\s+\\\$\\\(\w+\\\)\/([^\s|]+)\s*([^|]*)\|$/)
{
- my $src = $1;
- $section = $2;
- my $dir = $3;
- my $options = $4;
- $section = "HEIMDAL_" . uc($section);
- $result->{$section}->{TYPE} = 'ASN1';
- $result->{$section}->{SECNUMBER} = $secnumber++;
- if ($options ne '') {
- $result->{$section}->{OPTIONS} = $options;
- }
- $result->{$section}->{DIRECTORY} = $dir;
- $result->{$section}->{$section . '_OBJ_FILES'} = $src;
- next;
- }
-
- if ($line =~
/^mkinclude.*et_deps.pl\s+([^\s]+)\s+\\\$\\\(\w+\\\)\/([^\s|]+)\|$/) {
- my $src = $1;
- my $dir = $2;
- $section = basename($src);
- $section =~ s/\./_/g;
- $section = "HEIMDAL_" . uc($section);
- $result->{$section}->{TYPE} = 'ERRTABLE';
- $result->{$section}->{SECNUMBER} = $secnumber++;
- $result->{$section}->{DIRECTORY} = "$dir";
- $result->{$section}->{$section . '_OBJ_FILES'} = $src;
- next;
- }
-
- if ($line =~ /^\[(\w+)::([\w-]+)\]/)
- {
- my $type = $1;
- $section = $2;
- $infragment = 0;
-
- $result->{$section}->{TYPE} = $type;
- $result->{$section}->{SECNUMBER} = $secnumber++;
- next;
- }
-
- # include
- if ($line =~ /^mkinclude (.*)$/) {
- my $subfile = $1;
- $result->{$subfile}->{TYPE} = 'SUBCONFIG';
- $result->{$subfile}->{SECNUMBER} = $secnumber++;
- next;
- }
-
- # empty line
- if ($line =~ /^[ \t]*$/) {
- next;
- }
-
- # global stuff is considered part of the makefile
- if ($section eq "GLOBAL") {
- $infragment = 1;
- next;
- }
-
- # Assignment
- if ($line =~ /^([a-zA-Z0-9_-]+)[\t ]*=(.*)$/) {
- $result->{$section}->{$1} =
expand_vars($result->{$section}, strlist($2));
- $globals->{$1} = $result->{$section}->{$1};
- next;
- }
-
- # +=
- if ($line =~ /^([a-zA-Z0-9_-]+)[\t ]*\+=(.*)$/) {
- if (!$result->{$section}->{$1}) {
- $result->{$section}->{$1}="";
- }
- $result->{$section}->{$1} .= " " .
expand_vars($result->{$section}, strlist($2));
- $globals->{$1} = $result->{$section}->{$1};
- next;
- }
-
- if ($line =~
/\$\(eval.\$\(call.proto_header_template.*,(.*),.*/) {
- $result->{$section}->{AUTOPROTO} = $1;
- }
- if ($line =~ /^\$\(eval/) {
- # skip eval lines for now
- next;
- }
-
- printf(STDERR "$linenum: Bad line: $line");
- }
-
- return $result;
-}
-
-
-sub process_results($)
-{
- my $result = shift;
-
- foreach my $s (sort {$result->{$a}->{SECNUMBER} <=>
$result->{$b}->{SECNUMBER}} keys %{$result}) {
- next if ($s eq "GLOBAL");
- my $sec = $result->{$s};
- if ($sec->{TYPE} eq "SUBCONFIG") {
- my $d = dirname($s);
- next if ($d eq ".");
- printf "bld.BUILD_SUBDIR('%s')\n", dirname($s);
- } else {
- printf "\nbld.SAMBA_%s('%s'", $sec->{TYPE}, $s;
- my $trailer="";
- my $got_src = 0;
- my $got_private_deps = 0;
-
- foreach my $k (keys %{$sec}) {
- #print "key=$k\n";
-
- next if ($k eq "SECNUMBER");
- next if ($k eq "TYPE");
- if ($k eq "INIT_FUNCTION") {
- $trailer .=
sprintf(",\n\tinit_function='%s'", trim($sec->{$k}));
- next;
- }
- if ($k eq "INIT_FUNCTION_SENTINEL") {
- $trailer .=
sprintf(",\n\tinit_function_sentinal='%s'", trim($sec->{$k}));
- next;
- }
- if ($k eq "_PY_FILES" ||
- $k eq "EPYDOC_OPTIONS" ||
- $k eq "COV_TARGET" ||
- $k eq "GCOV" ||
- $k eq "PC_FILES" ||
- $k eq "CONFIG4FILE" ||
- $k eq "LMHOSTSFILE4") {
- $trailer .= sprintf(",\n\t# %s='%s'",
$k, trim($sec->{$k}));
- next;
- }
- if ($k eq "SUBSYSTEM") {
- $trailer .=
sprintf(",\n\tsubsystem='%s'", trim($sec->{$k}));
- next;
- }
- if ($k eq "PRIVATE_DEPENDENCIES") {
- $trailer .= sprintf(",\n\tdeps='%s'",
strlist($sec->{$k}));
- $got_private_deps = 1;
- next;
- }
- if ($k eq "PUBLIC_DEPENDENCIES") {
- $trailer .=
sprintf(",\n\tpublic_deps='%s'", strlist($sec->{$k}));
- next;
- }
- if ($k eq "ALIASES") {
- $trailer .=
sprintf(",\n\taliases='%s'", strlist($sec->{$k}));
- next;
- }
- if ($k eq "CFLAGS") {
- $trailer .= sprintf(",\n\tcflags='%s'",
strlist($sec->{$k}));
- next;
- }
- if ($k eq "OPTIONS") {
- $trailer .=
sprintf(",\n\toptions='%s'", strlist($sec->{$k}));
- next;
- }
- if ($k eq "DIRECTORY") {
- $trailer .=
sprintf(",\n\tdirectory='%s'", strlist($sec->{$k}));
- next;
- }
- if ($k eq "LDFLAGS") {
- $trailer .=
sprintf(",\n\tldflags='%s'", strlist($sec->{$k}));
- next;
- }
- if ($k eq "INSTALLDIR") {
- $trailer .=
sprintf(",\n\tinstalldir='%s'", strlist($sec->{$k}));
- next;
- }
- if ($k eq "ASN1C") {
- $trailer .=
sprintf(",\n\tcompiler='%s'", strlist($sec->{$k}));
- next;
- }
- if ($k eq "ET_COMPILER") {
- $trailer .=
sprintf(",\n\tcompiler='%s'", strlist($sec->{$k}));
- next;
- }
- if ($k eq "ENABLE") {
- my $v = strlist($sec->{$k});
- if ($v eq "NO") {
- $trailer .=
sprintf(",\n\tenabled=False");
- next;
- }
- next if ($v eq "YES");
- die("Unknown ENABLE value $v in $s\n");
- }
- if ($k eq "USE_HOSTCC") {
- my $v = strlist($sec->{$k});
- if ($v eq "YES") {
- $trailer .=
sprintf(",\n\tuse_hostcc=True");
- next;
- }
- next if ($v eq "NO");
- die("Unknown HOST_CC value $v in $s\n");
- }
- if ($k eq "$s" . "_VERSION") {
- $trailer .= sprintf(",\n\tvnum='%s'",
strlist($sec->{$k}));
- next;
- }
- if ($k eq "$s" . "_SOVERSION") {
- next;
- }
- if ($k eq "LIBRARY_REALNAME") {
- $trailer .=
sprintf(",\n\trealname='%s'", strlist($sec->{$k}));
- next;
- }
- if ($k eq "OUTPUT_TYPE") {
- $trailer .=
sprintf(",\n\toutput_type='%s'", strlist($sec->{$k}));
- next;
- }
- if ($k eq "AUTOPROTO") {
- my $list =
trim(find_files(strlist($sec->{$k})));
- $trailer .=
sprintf(",\n\tautoproto='%s'", $list);
- next;
- }
- if ($k eq "PUBLIC_HEADERS") {
- my $list = trim(strlist($sec->{$k}));
- if ($list =~ /\$\(addprefix
.*,(.*)\)(.*)$/) {
- $list = trim("$1 $2");
- $list = find_files($list);
- } else {
- $list =
trim(find_files(strlist($sec->{$k})));
- }
- $trailer .=
sprintf(",\n\tpublic_headers='%s'", $list);
- next;
- }
- if ($k eq "MANPAGES") {
- my $list =
trim(find_files(strlist($sec->{$k})));
- $trailer .=
sprintf(",\n\tmanpages='%s'", $list);
- next;
- }
- if ($k eq "$s" . "_OBJ_FILES") {
- my $list = trim(strlist($sec->{$k}));
- $list =~ s/\.o/.c/g;
- $list =~ s/\.ho/.c/g;
- if ($list =~ /\$\(addprefix
.*,(.*)\)(.*)$/) {
- $list = trim("$1 $2");
- $list = find_files($list);
- $list = "'$list'";
- } elsif ($list =~ /\$\(addprefix
\$\((\w+)\)(.*),(.*)\)(.*)$/) {
--
Samba Shared Repository
