Rename the "xpt" manifest directive to "interfaces", per bug 568691 comment 66.
authorBenjamin Smedberg <benjamin@smedbergs.us>
Sun, 27 Jun 2010 21:50:51 -0400
changeset 47077 74065033cb802d40a6e3fb76845abc38b328485b
parent 47076 68016e94098e691b65f2dab74ef13a290b7b6233
child 47078 5229353383b0eac753fdbf350bafa3f9eb21cccf
push idunknown
push userunknown
push dateunknown
bugs568691
milestone1.9.3a6pre
Rename the "xpt" manifest directive to "interfaces", per bug 568691 comment 66.
netwerk/test/httpserver/jar.mn
xpcom/components/ManifestParser.cpp
--- a/netwerk/test/httpserver/jar.mn
+++ b/netwerk/test/httpserver/jar.mn
@@ -1,6 +1,6 @@
 #ifdef XPI_NAME
 httpd.jar:
 %  component {54ef6f81-30af-4b1d-ac55-8ba811293e41} components/httpd.js
 %  contract @mozilla.org/server/jshttp;1 {54ef6f81-30af-4b1d-ac55-8ba811293e41}
-%  xpt components/test_necko.xpt
+%  interfaces components/test_necko.xpt
 #endif
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -85,17 +85,17 @@ struct ManifestDirective
      int lineno, char *const *argv,
      bool platform, bool contentaccessible);
 
   bool isContract;
 };
 static const ManifestDirective kParsingTable[] = {
   { "binary-component", 1, true, false, false,
     &nsComponentManagerImpl::ManifestBinaryComponent, NULL },
-  { "xpt",              1, true, false, false,
+  { "interfaces",       1, true, false, false,
     &nsComponentManagerImpl::ManifestXPT, NULL },
   { "component",        2, true, false, false,
     &nsComponentManagerImpl::ManifestComponent, NULL },
   { "contract",         2, true, false, false,
     &nsComponentManagerImpl::ManifestContract, NULL, true},
   { "category",         3, true, false, false,
     &nsComponentManagerImpl::ManifestCategory, NULL },
   { "content",          2, true, true,  true,