svn commit: samba r5019 - in branches/SAMBA_4_0/source: build/pidl script

[tpot at samba.org]

Author: tpot
Date: 2005-01-26 20:46:58 +0000 (Wed, 26 Jan 2005)
New Revision: 5019

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5019

Log:
Some tweaks to building the swig .i files.

Modified:
   branches/SAMBA_4_0/source/build/pidl/pidl.pl
   branches/SAMBA_4_0/source/script/build_idl.sh


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/pidl.pl
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/pidl.pl	2005-01-26 20:43:55 UTC (rev 5018)
+++ branches/SAMBA_4_0/source/build/pidl/pidl.pl	2005-01-26 20:46:58 UTC (rev 5019)
@@ -145,6 +145,12 @@
 		  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,15 +216,14 @@
 		  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");
+		  IdlSwig::RewriteC($pidl, $parser, $filename);
+		}
 	}
 
-	if ($opt_swig) {
-	        my($filename) = $output;
-	        $filename =~ s/\/ndr_/\//;
-		$filename = util::ChangeExtension($filename, ".i");
-		util::FileSave($filename, IdlSwig::Parse($pidl));
-	}
-
 	if ($opt_diff) {
 		my($tempfile) = util::ChangeExtension($output, ".tmp");
 		util::FileSave($tempfile, IdlDump::Dump($pidl));

Modified: branches/SAMBA_4_0/source/script/build_idl.sh
===================================================================
--- branches/SAMBA_4_0/source/script/build_idl.sh	2005-01-26 20:43:55 UTC (rev 5018)
+++ branches/SAMBA_4_0/source/script/build_idl.sh	2005-01-26 20:46:58 UTC (rev 5019)
@@ -4,7 +4,7 @@
 
 [ -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