svn commit: samba r19752 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl: . Samba4 Samba4/NDR Wireshark

[jelmer at samba.org]

Author: jelmer
Date: 2006-11-16 22:13:44 +0000 (Thu, 16 Nov 2006)
New Revision: 19752

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

Log:
Remove support for the `depends' attribute (use "import") instead.

Modified:
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
   branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm


Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm	2006-11-16 22:11:32 UTC (rev 19751)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm	2006-11-16 22:13:44 UTC (rev 19752)
@@ -766,7 +766,6 @@
 	"endpoint"		=> ["INTERFACE"],
 	"pointer_default"	=> ["INTERFACE"],
 	"pointer_default_top"	=> ["INTERFACE"],
-	"depends"		=> ["INTERFACE"],
 	"helper"		=> ["INTERFACE"],
 	"authservice"		=> ["INTERFACE"],
 
@@ -1045,10 +1044,6 @@
 	my($interface) = shift;
 	my($data) = $interface->{DATA};
 
-	if (has_property($interface, "depends")) {
-		nonfatal $interface, "depends() is pidl-specific and deprecated. Use `import' instead";
-	}
-
 	if (has_property($interface, "helper")) {
 		nonfatal $interface, "helper() is pidl-specific and deprecated. Use `include' instead";
 	}

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm	2006-11-16 22:11:32 UTC (rev 19751)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/EJS.pm	2006-11-16 22:13:44 UTC (rev 19752)
@@ -753,10 +753,6 @@
 	pidl_hdr "#ifndef _HEADER_EJS_$interface->{NAME}\n";
 	pidl_hdr "#define _HEADER_EJS_$interface->{NAME}\n\n";
 
-	if (has_property($interface, "depends")) {
-		EjsImport(split / /, $interface->{PROPERTIES}->{depends});
-	}
-
 	pidl_hdr "\n";
 
 	foreach my $d (@{$interface->{TYPES}}) {

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm	2006-11-16 22:11:32 UTC (rev 19751)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Header.pm	2006-11-16 22:13:44 UTC (rev 19752)
@@ -334,10 +334,6 @@
 	pidl "#ifndef _HEADER_$interface->{NAME}\n";
 	pidl "#define _HEADER_$interface->{NAME}\n\n";
 
-	if (defined $interface->{PROPERTIES}->{depends}) {
-		HeaderImport(split / /, $interface->{PROPERTIES}->{depends});
-	}
-
 	foreach my $d (@{$interface->{DATA}}) {
 		next if ($d->{TYPE} ne "CONST");
 		HeaderConst($d);

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2006-11-16 22:11:32 UTC (rev 19751)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm	2006-11-16 22:13:44 UTC (rev 19752)
@@ -2258,10 +2258,6 @@
 		pidl choose_header("librpc/gen_ndr/ndr_orpc.h", "ndr/orpc.h");
 	}
 
-	if (defined $interface->{PROPERTIES}->{depends}) {
-		HeaderImport(split / /, $interface->{PROPERTIES}->{depends});
-	}
-
 	if (defined $interface->{PROPERTIES}->{helper}) {
 		HeaderInclude(split / /, $interface->{PROPERTIES}->{helper});
 	}

Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
===================================================================
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm	2006-11-16 22:11:32 UTC (rev 19751)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm	2006-11-16 22:13:44 UTC (rev 19752)
@@ -747,9 +747,6 @@
 	pidl_hdr "#define $define";
 	pidl_hdr "";
 
-	ProcessImport(split / /, $x->{PROPERTIES}->{depends}) if 
-				 (defined $x->{PROPERTIES}->{depends});
-
 	pidl_def "static gint proto_dcerpc_$x->{NAME} = -1;";
 	register_ett("ett_dcerpc_$x->{NAME}");
 	register_hf_field("hf_$x->{NAME}_opnum", "Operation", "$x->{NAME}.opnum", "FT_UINT16", "BASE_DEC", "NULL", 0, "");