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

jelmer at samba.org jelmer at samba.org
Wed Jul 27 19:58:09 GMT 2005


Author: jelmer
Date: 2005-07-27 19:58:09 +0000 (Wed, 27 Jul 2005)
New Revision: 8803

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

Log:
Rename --header to --ndr-header and --parser to --ndr-parser

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


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/pidl
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/pidl	2005-07-27 19:22:18 UTC (rev 8802)
+++ branches/SAMBA_4_0/source/build/pidl/pidl	2005-07-27 19:58:09 UTC (rev 8803)
@@ -37,11 +37,11 @@
 my($opt_dump) = 0;
 my($opt_uint_enums) = 0;
 my($opt_diff) = 0;
-my($opt_header);
+my($opt_ndr_header);
 my($opt_template) = 0;
 my($opt_client);
 my($opt_server);
-my($opt_parser);
+my($opt_ndr_parser);
 my($opt_eth_parser);
 my($opt_eth_header);
 my($opt_keep);
@@ -70,8 +70,8 @@
  --parse               parse a idl file to a .pidl file
  --dump                dump a pidl file back to idl
  --uint-enums          don't use C enums, instead use uint* types
- --header[=OUTFILE]    create a C NDR header file
- --parser[=OUTFILE]    create a C NDR parser
+ --ndr-header[=OUTFILE]create a C NDR header file
+ --ndr-parser[=OUTFILE]create a C NDR parser
  --ejs[=OUTFILE]       create ejs wrapper file
  --client[=OUTFILE]    create a C NDR client
  --server[=OUTFILE]    create server boilerplate
@@ -98,10 +98,10 @@
 	    'parse' => \$opt_parse,
 	    'dump' => \$opt_dump,
 	    'uint-enums' => \$opt_uint_enums,
-	    'header:s' => \$opt_header,
+	    'ndr-header:s' => \$opt_ndr_header,
 	    'server:s' => \$opt_server,
 	    'template' => \$opt_template,
-	    'parser:s' => \$opt_parser,
+	    'ndr-parser:s' => \$opt_ndr_parser,
 	    'client:s' => \$opt_client,
 	    'eth-parser:s' => \$opt_eth_parser,
 	    'eth-header:s' => \$opt_eth_header,
@@ -205,16 +205,16 @@
 		$pidl = Parse::Pidl::ODL::ODL2IDL($pidl);
 	}
 
-	if (defined($opt_header) or defined($opt_eth_parser) or 
+	if (defined($opt_ndr_header) or defined($opt_eth_parser) or 
 	    defined($opt_eth_header) or defined($opt_client) or 
-	    defined($opt_server) or defined($opt_parser) or 
+	    defined($opt_server) or defined($opt_ndr_parser) or 
 	    defined($opt_ejs)) {
 		require Parse::Pidl::NDR;
 		$ndr = Parse::Pidl::NDR::Parse($pidl);
 	}
 
-	if (defined($opt_header)) {
-		my $header = ($opt_header or "$outputdir/ndr_$basename.h");
+	if (defined($opt_ndr_header)) {
+		my $header = ($opt_ndr_header or "$outputdir/ndr_$basename.h");
 		require Parse::Pidl::Samba::NDR::Header;
 		Parse::Pidl::Util::FileSave($header, Parse::Pidl::Samba::NDR::Header::Parse($pidl));
 		if (defined($opt_swig)) {
@@ -275,8 +275,8 @@
 		}
 	}
 
-	if (defined($opt_parser)) {
-		my $parser = ($opt_parser or "$outputdir/ndr_$basename.c");
+	if (defined($opt_ndr_parser)) {
+		my $parser = ($opt_ndr_parser or "$outputdir/ndr_$basename.c");
 		require Parse::Pidl::Samba::NDR::Parser;
 		Parse::Pidl::Util::FileSave($parser, Parse::Pidl::Samba::NDR::Parser::Parse($ndr, $parser));
 	}

Modified: branches/SAMBA_4_0/source/script/build_idl.sh
===================================================================
--- branches/SAMBA_4_0/source/script/build_idl.sh	2005-07-27 19:22:18 UTC (rev 8802)
+++ branches/SAMBA_4_0/source/script/build_idl.sh	2005-07-27 19:58:09 UTC (rev 8803)
@@ -6,7 +6,7 @@
 
 [ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1
 
-PIDL="$PERL -Ibuild/pidl ./build/pidl/pidl --outputdir librpc/gen_ndr --parse --header --parser --server --client --dcom-proxy --com-header --swig --odl --ejs $PIDL_EXTRA_ARGS"
+PIDL="$PERL -Ibuild/pidl ./build/pidl/pidl --outputdir librpc/gen_ndr --parse --ndr-header --ndr-parser --server --client --dcom-proxy --com-header --swig --odl --ejs $PIDL_EXTRA_ARGS"
 
 if [ x$FULLBUILD = xFULL ]; then
       echo Rebuilding all idl files in librpc/idl



More information about the samba-cvs mailing list