diff options
| author | Tim Potter <tpot@samba.org> | 2005-01-26 20:46:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:14 -0500 |
| commit | 28a3ccf9af96ae214f92e6ea16edb84c53163cec (patch) | |
| tree | 7829d23aed28a560599c0448dada93546e68a7b4 | |
| parent | 07b65ce281504bff7ba08ef57e3c15301dbd8255 (diff) | |
| download | samba-28a3ccf9af96ae214f92e6ea16edb84c53163cec.tar.gz samba-28a3ccf9af96ae214f92e6ea16edb84c53163cec.tar.bz2 samba-28a3ccf9af96ae214f92e6ea16edb84c53163cec.zip | |
r5019: Some tweaks to building the swig .i files.
(This used to be commit c252a286efcb9ca2024c8d234c8a65855522fb25)
| -rwxr-xr-x | source4/build/pidl/pidl.pl | 19 | ||||
| -rwxr-xr-x | source4/script/build_idl.sh | 2 |
2 files changed, 13 insertions, 8 deletions
diff --git a/source4/build/pidl/pidl.pl b/source4/build/pidl/pidl.pl index 5c09ca1842..a541bd2717 100755 --- a/source4/build/pidl/pidl.pl +++ b/source4/build/pidl/pidl.pl @@ -145,6 +145,12 @@ sub process_file($) my($eparserhdr) = dirname($output) . "/packet-dcerpc-$basename.h"; IdlEParser::RewriteHeader($pidl, $header, $eparserhdr); } + if ($opt_swig) { + my($filename) = $output; + $filename =~ s/\/ndr_/\//; + $filename = util::ChangeExtension($filename, ".i"); + IdlSwig::RewriteHeader($pidl, $header, $filename); + } } if ($opt_client) { @@ -210,13 +216,12 @@ $dcom my($eparser) = dirname($output) . "/packet-dcerpc-$basename.c"; IdlEParser::RewriteC($pidl, $parser, $eparser); } - } - - if ($opt_swig) { - my($filename) = $output; - $filename =~ s/\/ndr_/\//; - $filename = util::ChangeExtension($filename, ".i"); - util::FileSave($filename, IdlSwig::Parse($pidl)); + if ($opt_swig) { + my($filename) = $output; + $filename =~ s/\/ndr_/\//; + $filename = util::ChangeExtension($filename, ".i"); + IdlSwig::RewriteC($pidl, $parser, $filename); + } } if ($opt_diff) { diff --git a/source4/script/build_idl.sh b/source4/script/build_idl.sh index a4d0dfea8b..66f3400b6d 100755 --- a/source4/script/build_idl.sh +++ b/source4/script/build_idl.sh @@ -4,7 +4,7 @@ FULLBUILD=$1 [ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1 -PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server --client" +PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server --client --swig" EPARSERPIDL="$PERL ./build/pidl/pidl.pl --output $EPARSERPREFIX/ndr_ --parse --header --parser --eparser" if [ x$FULLBUILD = xFULL ]; then |