From 28a3ccf9af96ae214f92e6ea16edb84c53163cec Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 26 Jan 2005 20:46:58 +0000
Subject: [PATCH] r5019: Some tweaks to building the swig .i files. (This used
 to be commit c252a286efcb9ca2024c8d234c8a65855522fb25)

---
 source4/build/pidl/pidl.pl  | 19 ++++++++++++-------
 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 5c09ca18422..a541bd27174 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 a4d0dfea8bd..66f3400b6d5 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
-- 
2.11.4.GIT