r3689: Large number of COM updates:

[samba.git] / source4 / build / pidl / pidl.pl

diff --git a/source4/build/pidl/pidl.pl b/source4/build/pidl/pidl.pl
index 1c122932ba48c94a6a72c6cd64f499c466790af8..bb7f1f8ed61ef5c4b258d6169a518efc6ccf6bcf 100755 (executable)
--- a/source4/build/pidl/pidl.pl
+++ b/source4/build/pidl/pidl.pl
@@ -17,11 +17,13 @@ use idl;
 use dump;
 use header;
 use server;
+use stub;
 use parser;
 use eparser;
 use validator;
 use util;
 use template;
+use swig;
 
 my($opt_help) = 0;
 my($opt_parse) = 0;
@@ -33,6 +35,7 @@ my($opt_server) = 0;
 my($opt_parser) = 0;
 my($opt_eparser) = 0;
 my($opt_keep) = 0;
+my($opt_swig) = 0;
 my($opt_output);
 
 my $idl_parser = new idl;
@@ -68,6 +71,7 @@ sub ShowHelp()
              --server              create server boilerplate
              --template            print a template for a pipe
              --eparser             create an ethereal parser
+             --swig                create swig wrapper file
              --diff                run diff on the idl and dumped output
              --keep                keep the .pidl file
            \n";
@@ -86,7 +90,8 @@ GetOptions (
            'parser' => \$opt_parser,
            'eparser' => \$opt_eparser,
            'diff' => \$opt_diff,
-           'keep' => \$opt_keep
+           'keep' => \$opt_keep,
+           'swig' => \$opt_swig
            );
 
 if ($opt_help) {
@@ -114,7 +119,7 @@ sub process_file($)
 
        if ($opt_parse) {
                $pidl = IdlParse($idl_file);
-               defined $pidl || die "Failed to parse $idl_file";
+               defined @$pidl || die "Failed to parse $idl_file";
                IdlValidator::Validate($pidl);
                if ($opt_keep && !util::SaveStructure($pidl_file, $pidl)) {
                            die "Failed to save $pidl_file\n";
@@ -135,7 +140,17 @@ sub process_file($)
 
        if ($opt_server) {
                my($server) = util::ChangeExtension($output, "_s.c");
-               util::FileSave($server, IdlServer::Parse($pidl));
+               my $res = "";
+               foreach my $x (@{$pidl}) {
+                       next if ($x->{TYPE} ne "INTERFACE");
+
+                       if (util::has_property($x, "object")) {
+                               $res .= IdlStub::ParseInterface($x);
+                       } else {
+                               $res .= IdlServer::ParseInterface($x);
+                       }
+               }
+               util::FileSave($server, $res);
        }
 
        if ($opt_parser) {
@@ -146,6 +161,20 @@ sub process_file($)
        if ($opt_eparser) {
                my($parser) = dirname($output) . "/packet-dcerpc-$basename.c";
                IdlEParser::Parse($pidl, $parser);
+               $parser = dirname($output) . "/packet-dcerpc-proto-$basename.h";
+               IdlEParser::ParseHeader($pidl, $parser);
+               my($header) = dirname($output) . "/packet-dcerpc-proto.h";
+               open(OUT, ">>$header") || die "can't open $header";
+               print OUT "#include \"ndr_$basename.h\"\n";
+               print OUT "#include \"packet-dcerpc-proto-$basename.h\"\n";
+               close(OUT);
+       }
+
+       if ($opt_swig) {
+               my($filename) = $output;
+               $filename =~ s/\/ndr_/\//;
+               $filename = util::ChangeExtension($filename, ".i");
+               util::FileSave($filename, IdlSwig::Parse($pidl));
        }
 
        if ($opt_diff) {