diff --git a/mozilla/build/mac/build_scripts/Moz/BuildCore.pm b/mozilla/build/mac/build_scripts/Moz/BuildCore.pm
index 840c2dda16f..ed23d1d84e5 100644
--- a/mozilla/build/mac/build_scripts/Moz/BuildCore.pm
+++ b/mozilla/build/mac/build_scripts/Moz/BuildCore.pm
@@ -78,15 +78,9 @@ sub SanityCheckBuildOptions()
$bad_options = 1;
}
- if ($main::options{soap} && !$main::options{xmlextras})
+ if ($main::options{wsp} && !$main::options{xmlextras})
{
- print "Warning: \$options{soap} is on but \$options{xmlextras} is off. SOAP will not be built.\n";
- $bad_options = 1;
- }
-
- if ($main::options{wsp} && !$main::options{soap})
- {
- print "Warning: \$options{wsp} is on but \$options{soap} is off. wsp will not be built.\n";
+ print "Warning: \$options{wsp} is on but \$options{xmlextras} is off. wsp will not be built.\n";
$bad_options = 1;
}
diff --git a/mozilla/build/mac/build_scripts/MozillaBuildFlags.txt b/mozilla/build/mac/build_scripts/MozillaBuildFlags.txt
index b9694211c74..022a00f1610 100644
--- a/mozilla/build/mac/build_scripts/MozillaBuildFlags.txt
+++ b/mozilla/build/mac/build_scripts/MozillaBuildFlags.txt
@@ -50,7 +50,6 @@ mng 1
ldap 1 MOZ_LDAP_XPCOM
ldap_experimental 0 MOZ_LDAP_XPCOM_EXPERIMENTAL
xmlextras 1
-soap 1
wsp 0 MOZ_WSP
inspector 1
mailextras 1
diff --git a/mozilla/build/mac/build_scripts/MozillaBuildList.pm b/mozilla/build/mac/build_scripts/MozillaBuildList.pm
index 66ed39d0b61..1f30106eb8d 100644
--- a/mozilla/build/mac/build_scripts/MozillaBuildList.pm
+++ b/mozilla/build/mac/build_scripts/MozillaBuildList.pm
@@ -887,17 +887,12 @@ sub BuildClientDist()
if ($main::options{xmlextras})
{
InstallFromManifest(":mozilla:extensions:xmlextras:base:public:MANIFEST_IDL", "$distdirectory:idl:");
- if ($main::options{soap})
+ InstallFromManifest(":mozilla:extensions:xmlextras:schema:public:MANIFEST_IDL", "$distdirectory:idl:");
+ InstallFromManifest(":mozilla:extensions:xmlextras:soap:public:MANIFEST_IDL", "$distdirectory:idl:");
+ if ($main::options{wsp})
{
InstallFromManifest(":mozilla:extensions:xmlextras:proxy:public:MANIFEST_IDL", "$distdirectory:idl:");
- InstallFromManifest(":mozilla:extensions:xmlextras:schema:public:MANIFEST_IDL", "$distdirectory:idl:");
- InstallFromManifest(":mozilla:extensions:xmlextras:soap:public:MANIFEST_IDL", "$distdirectory:idl:");
InstallFromManifest(":mozilla:extensions:xmlextras:wsdl:public:MANIFEST_IDL", "$distdirectory:idl:");
- if ($main::options{wsp})
- {
- InstallFromManifest(":mozilla:extensions:xmlextras:proxy:public:MANIFEST_IDL", "$distdirectory:idl:");
- InstallFromManifest(":mozilla:extensions:xmlextras:wsdl:public:MANIFEST_IDL", "$distdirectory:idl:");
- }
}
}
@@ -1212,15 +1207,12 @@ sub BuildIDLProjects()
if ($main::options{xmlextras})
{
BuildIDLProject(":mozilla:extensions:xmlextras:macbuild:xmlextrasIDL.xml", "xmlextras");
- if ($main::options{soap})
+ BuildIDLProject(":mozilla:extensions:xmlextras:macbuild:xmlschemaIDL.xml", "xmlschema");
+ BuildIDLProject(":mozilla:extensions:xmlextras:macbuild:xmlsoapIDL.xml", "xmlsoap");
+ if ($main::options{wsp})
{
- BuildIDLProject(":mozilla:extensions:xmlextras:macbuild:xmlschemaIDL.xml", "xmlschema");
- BuildIDLProject(":mozilla:extensions:xmlextras:macbuild:xmlsoapIDL.xml", "xmlsoap");
- if ($main::options{wsp})
- {
- BuildIDLProject(":mozilla:extensions:xmlextras:macbuild:xmlwsproxyIDL.xml", "wsproxy");
- BuildIDLProject(":mozilla:extensions:xmlextras:macbuild:xmlwsdlIDL.xml", "wsdl");
- }
+ BuildIDLProject(":mozilla:extensions:xmlextras:macbuild:xmlwsproxyIDL.xml", "wsproxy");
+ BuildIDLProject(":mozilla:extensions:xmlextras:macbuild:xmlwsdlIDL.xml", "wsdl");
}
}
@@ -1983,19 +1975,11 @@ sub BuildExtensionsProjects()
# XML Extras
if ($main::options{xmlextras})
{
- if ($main::options{soap})
- {
- if ($main::options{wsp}) {
- BuildProject(":mozilla:extensions:xmlextras:macbuild:xmlwsp.xml", "xmlwsp$D.o");
- }
- else {
- BuildProject(":mozilla:extensions:xmlextras:macbuild:xmlwsp.xml", "xmlwsp$D.o stub");
- }
- BuildProject(":mozilla:extensions:xmlextras:macbuild:xmlsoap.xml", "xmlsoap$D.o");
+ if ($main::options{wsp}) {
+ BuildProject(":mozilla:extensions:xmlextras:macbuild:xmlwsp.xml", "xmlwsp$D.o");
}
- else
- {
- BuildProject(":mozilla:extensions:xmlextras:macbuild:xmlsoap.xml", "xmlsoap$D.o stub");
+ else {
+ BuildProject(":mozilla:extensions:xmlextras:macbuild:xmlwsp.xml", "xmlwsp$D.o stub");
}
BuildOneProject(":mozilla:extensions:xmlextras:macbuild:xmlextras.xml", "xmlextras$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
}
diff --git a/mozilla/extensions/xmlextras/macbuild/xmlextras.xml b/mozilla/extensions/xmlextras/macbuild/xmlextras.xml
index 6affc9c5214..02c5a95fa11 100644
--- a/mozilla/extensions/xmlextras/macbuild/xmlextras.xml
+++ b/mozilla/extensions/xmlextras/macbuild/xmlextras.xml
@@ -1024,13 +1024,6 @@
Text
-
- Name
- xmlsoapDebug.o
- MacOS
- Library
-
-
Name
nsLoadListenerProxy.cpp
@@ -1038,6 +1031,160 @@
Text
+
+ Name
+ nsSchema.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSchemaAttributes.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSchemaComplexType.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSchemaComponentBase.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSchemaLoader.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSchemaParticles.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSchemaSimpleTypes.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPTypes.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsDefaultSOAPEncoder.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsHTTPSOAPTransport.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPBlock.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPCall.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPEncoding.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPException.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPFault.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPHeaderBlock.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPMessage.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPParameter.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPPropertyBag.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPResponse.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPUtils.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ xmlwspDebug.o
+ MacOS
+ Library
+ Debug
+
@@ -1097,12 +1244,117 @@
Name
- xmlsoapDebug.o
+ nsLoadListenerProxy.cpp
MacOS
Name
- nsLoadListenerProxy.cpp
+ nsSchema.cpp
+ MacOS
+
+
+ Name
+ nsSchemaAttributes.cpp
+ MacOS
+
+
+ Name
+ nsSchemaComplexType.cpp
+ MacOS
+
+
+ Name
+ nsSchemaComponentBase.cpp
+ MacOS
+
+
+ Name
+ nsSchemaLoader.cpp
+ MacOS
+
+
+ Name
+ nsSchemaParticles.cpp
+ MacOS
+
+
+ Name
+ nsSchemaSimpleTypes.cpp
+ MacOS
+
+
+ Name
+ nsSOAPTypes.cpp
+ MacOS
+
+
+ Name
+ nsDefaultSOAPEncoder.cpp
+ MacOS
+
+
+ Name
+ nsHTTPSOAPTransport.cpp
+ MacOS
+
+
+ Name
+ nsSOAPBlock.cpp
+ MacOS
+
+
+ Name
+ nsSOAPCall.cpp
+ MacOS
+
+
+ Name
+ nsSOAPEncoding.cpp
+ MacOS
+
+
+ Name
+ nsSOAPException.cpp
+ MacOS
+
+
+ Name
+ nsSOAPFault.cpp
+ MacOS
+
+
+ Name
+ nsSOAPHeaderBlock.cpp
+ MacOS
+
+
+ Name
+ nsSOAPMessage.cpp
+ MacOS
+
+
+ Name
+ nsSOAPParameter.cpp
+ MacOS
+
+
+ Name
+ nsSOAPPropertyBag.cpp
+ MacOS
+
+
+ Name
+ nsSOAPResponse.cpp
+ MacOS
+
+
+ Name
+ nsSOAPUtils.cpp
+ MacOS
+
+
+ Name
+ xmlwspDebug.o
MacOS
@@ -2078,13 +2330,6 @@
Text
-
- Name
- xmlsoap.o
- MacOS
- Library
-
-
Name
nsLoadListenerProxy.cpp
@@ -2092,6 +2337,160 @@
Text
+
+ Name
+ nsSchema.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSchemaAttributes.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSchemaComplexType.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSchemaComponentBase.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSchemaLoader.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSchemaParticles.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSchemaSimpleTypes.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPTypes.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsDefaultSOAPEncoder.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsHTTPSOAPTransport.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPBlock.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPCall.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPEncoding.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPException.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPFault.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPHeaderBlock.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPMessage.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPParameter.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPPropertyBag.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPResponse.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ nsSOAPUtils.cpp
+ MacOS
+ Text
+ Debug
+
+
+ Name
+ xmlwsp.o
+ MacOS
+ Library
+ Debug
+
@@ -2151,12 +2550,117 @@
Name
- xmlsoap.o
+ nsLoadListenerProxy.cpp
MacOS
Name
- nsLoadListenerProxy.cpp
+ nsSchema.cpp
+ MacOS
+
+
+ Name
+ nsSchemaAttributes.cpp
+ MacOS
+
+
+ Name
+ nsSchemaComplexType.cpp
+ MacOS
+
+
+ Name
+ nsSchemaComponentBase.cpp
+ MacOS
+
+
+ Name
+ nsSchemaLoader.cpp
+ MacOS
+
+
+ Name
+ nsSchemaParticles.cpp
+ MacOS
+
+
+ Name
+ nsSchemaSimpleTypes.cpp
+ MacOS
+
+
+ Name
+ nsSOAPTypes.cpp
+ MacOS
+
+
+ Name
+ nsDefaultSOAPEncoder.cpp
+ MacOS
+
+
+ Name
+ nsHTTPSOAPTransport.cpp
+ MacOS
+
+
+ Name
+ nsSOAPBlock.cpp
+ MacOS
+
+
+ Name
+ nsSOAPCall.cpp
+ MacOS
+
+
+ Name
+ nsSOAPEncoding.cpp
+ MacOS
+
+
+ Name
+ nsSOAPException.cpp
+ MacOS
+
+
+ Name
+ nsSOAPFault.cpp
+ MacOS
+
+
+ Name
+ nsSOAPHeaderBlock.cpp
+ MacOS
+
+
+ Name
+ nsSOAPMessage.cpp
+ MacOS
+
+
+ Name
+ nsSOAPParameter.cpp
+ MacOS
+
+
+ Name
+ nsSOAPPropertyBag.cpp
+ MacOS
+
+
+ Name
+ nsSOAPResponse.cpp
+ MacOS
+
+
+ Name
+ nsSOAPUtils.cpp
+ MacOS
+
+
+ Name
+ xmlwsp.o
MacOS
@@ -2201,12 +2705,142 @@
MacOS
+ soap
+
+ xmlextrasDebug.shlb
+ Name
+ nsDefaultSOAPEncoder.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsHTTPSOAPTransport.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSOAPBlock.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSOAPCall.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSOAPEncoding.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSOAPException.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSOAPFault.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSOAPHeaderBlock.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSOAPMessage.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSOAPParameter.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSOAPPropertyBag.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSOAPResponse.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSOAPUtils.cpp
+ MacOS
+
+
+ schema
+
+ xmlextrasDebug.shlb
+ Name
+ nsSchema.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSchemaAttributes.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSchemaComplexType.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSchemaComponentBase.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSchemaLoader.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSchemaParticles.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSchemaSimpleTypes.cpp
+ MacOS
+
+
+ xmlextrasDebug.shlb
+ Name
+ nsSOAPTypes.cpp
+ MacOS
+
+
Options
Optimized
xmlextras.shlb
Name
- xmlsoap.o
+ xmlwsp.o
MacOS
@@ -2214,7 +2848,7 @@
xmlextrasDebug.shlb
Name
- xmlsoapDebug.o
+ xmlwspDebug.o
MacOS
diff --git a/mozilla/extensions/xmlextras/macbuild/xmlwsp.xml b/mozilla/extensions/xmlextras/macbuild/xmlwsp.xml
index 4bc797db353..b01185f4c1f 100644
--- a/mozilla/extensions/xmlextras/macbuild/xmlwsp.xml
+++ b/mozilla/extensions/xmlextras/macbuild/xmlwsp.xml
@@ -1819,10 +1819,10 @@
MWPEF_collapsereloads0
- MWProject_PPC_typeSharedLibrary
+ MWProject_PPC_typeLibrary
MWProject_PPC_outfilexmlwsp.o
- MWProject_PPC_filecreatorMOZZ
- MWProject_PPC_filetypeshlb
+ MWProject_PPC_filecreator????
+ MWProject_PPC_filetype????
MWProject_PPC_size0
MWProject_PPC_minsize0
MWProject_PPC_stacksize0