sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

build: added autoproto stub

Browse Source
This commit is contained in:
Andrew Tridgell 2010-02-23 08:56:35 +11:00
parent d0c19bb35e
commit 73634d6ff3
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildtools/mktowscript/mktowscript.pl
View File

@ -150,6 +150,9 @@ sub read_config_mk($)
next; next;
} }
if ($line =~ /\$\(eval.\$\(call.proto_header_template.*,(.*),.*/) {
$result->{$section}->{AUTOPROTO} = $1;
}
if ($line =~ /^\$\(eval/) { if ($line =~ /^\$\(eval/) {
# skip eval lines for now # skip eval lines for now
next; next;
@ -259,6 +262,11 @@ foreach my $s (sort {$result->{$a}->{SECNUMBER} <=> $result->{$b}->{SECNUMBER}}
$trailer .= sprintf(",\n\toutput_type='%s'", strlist($sec->{$k})); $trailer .= sprintf(",\n\toutput_type='%s'", strlist($sec->{$k}));
next; next;
} }
if ($k eq "AUTOPROTO") {
my $list = trim(find_files(strlist($sec->{$k})));
$trailer .= sprintf(",\n\tautoproto='%s'", $list);
next;
}
if ($k eq "$s" . "_OBJ_FILES") { if ($k eq "$s" . "_OBJ_FILES") {
my $list = trim(strlist($sec->{$k})); my $list = trim(strlist($sec->{$k}));
$list =~ s/\.o/.c/g; $list =~ s/\.o/.c/g;

6
lib/replace/wafsamba.py
View File

@ -161,7 +161,8 @@ def SAMBA_LIBRARY(bld, libname, source_list,
public_deps='', public_deps='',
include_list='.', include_list='.',
vnum=None, vnum=None,
cflags=None): cflags=None,
autoproto=None):
ilist = bld.SAMBA_LIBRARY_INCLUDE_LIST(deps) + bld.SUBDIR(bld.curdir, include_list) ilist = bld.SAMBA_LIBRARY_INCLUDE_LIST(deps) + bld.SUBDIR(bld.curdir, include_list)
ilist = bld.NORMPATH(ilist) ilist = bld.NORMPATH(ilist)
bld( bld(
@ -196,7 +197,8 @@ def SAMBA_BINARY(bld, binname, source_list,
modules=None, modules=None,
installdir=None, installdir=None,
ldflags=None, ldflags=None,
cflags=None): cflags=None,
autoproto=None):
ilist = '. ' + os.environ.get('PWD') + '/bin/default ' + bld.SAMBA_LIBRARY_INCLUDE_LIST(deps) + ' ' + include_list ilist = '. ' + os.environ.get('PWD') + '/bin/default ' + bld.SAMBA_LIBRARY_INCLUDE_LIST(deps) + ' ' + include_list
ilist = bld.NORMPATH(ilist) ilist = bld.NORMPATH(ilist)
ccflags = '' ccflags = ''