Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 126691 (need extensions\interfaceinfo build fu). sr=sfraser. Not part of the default build.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@118940 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterv%netscape.com 2002-04-13 21:57:59 +00:00
parent 0ee760a574
commit ce5b7e4b26
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/build/mac/build_scripts/Moz/BuildCore.pm
View File

@ -84,6 +84,12 @@ sub SanityCheckBuildOptions()
$bad_options = 1; $bad_options = 1;
} }
if ($main::options{wsp} && !$main::options{iiextras})
{
print "Warning: \$options{wsp} is on but \$options{iiextras} is off. wsp will be built but won't be useable.\n";
$bad_options = 1;
}
if ($bad_options) { if ($bad_options) {
print "Build will start in 5 seconds. Press command-. to stop\n"; print "Build will start in 5 seconds. Press command-. to stop\n";

1
mozilla/build/mac/build_scripts/MozillaBuildFlags.txt
View File

@ -51,6 +51,7 @@ ldap 1 MOZ_LDAP_XPCOM
ldap_experimental 0 MOZ_LDAP_XPCOM_EXPERIMENTAL ldap_experimental 0 MOZ_LDAP_XPCOM_EXPERIMENTAL
xmlextras 1 xmlextras 1
wsp 0 MOZ_WSP wsp 0 MOZ_WSP
iiextras 0
inspector 1 inspector 1
mailextras 1 mailextras 1
xptlink 0 xptlink 0

23
mozilla/build/mac/build_scripts/MozillaBuildList.pm
View File

@ -1114,6 +1114,12 @@ sub BuildClientDist()
InstallFromManifest(":mozilla:extensions:transformiix:public:MANIFEST_IDL", "$distdirectory:idl:"); InstallFromManifest(":mozilla:extensions:transformiix:public:MANIFEST_IDL", "$distdirectory:idl:");
} }
#IIEXTRAS
if ($main::options{iiextras})
{
InstallFromManifest(":mozilla:extensions:interfaceinfo:public:MANIFEST_IDL", "$distdirectory:idl:");
}
#XMLEXTRAS #XMLEXTRAS
if ($main::options{xmlextras}) if ($main::options{xmlextras})
{ {
@ -1439,6 +1445,11 @@ sub BuildIDLProjects()
BuildIDLProject(":mozilla:extensions:transformiix:macbuild:transformiixIDL.xml", "transformiix"); BuildIDLProject(":mozilla:extensions:transformiix:macbuild:transformiixIDL.xml", "transformiix");
} }
if ($main::options{iiextras})
{
BuildIDLProject(":mozilla:extensions:interfaceinfo:macbuild:iiextrasIDL.xml", "iiextras");
}
if ($main::options{xmlextras}) if ($main::options{xmlextras})
{ {
BuildIDLProject(":mozilla:extensions:xmlextras:macbuild:xmlextrasIDL.xml", "xmlextras"); BuildIDLProject(":mozilla:extensions:xmlextras:macbuild:xmlextrasIDL.xml", "xmlextras");
@ -1489,7 +1500,6 @@ sub BuildRuntimeProjects()
# $C becomes a component of target names for selecting either the Carbon or non-Carbon target of a project # $C becomes a component of target names for selecting either the Carbon or non-Carbon target of a project
my($C) = $main::options{carbon} ? "Carbon" : ""; my($C) = $main::options{carbon} ? "Carbon" : "";
my($P) = $main::PROFILE ? "Profil" : ""; my($P) = $main::PROFILE ? "Profil" : "";
my($EssentialFiles) = $main::DEBUG ? ":mozilla:dist:viewer_debug:Essential Files:" : ":mozilla:dist:viewer:Essential Files:";
#// #//
#// Shared libraries #// Shared libraries
@ -1508,7 +1518,7 @@ sub BuildRuntimeProjects()
#// Build all of the startup libraries, for Application, Component, and Shared Libraries. These are #// Build all of the startup libraries, for Application, Component, and Shared Libraries. These are
#// required for all subsequent libraries in the system. #// required for all subsequent libraries in the system.
BuildProject(":mozilla:lib:mac:NSStartup:NSStartup.xml", "NSStartup.all"); BuildProject(":mozilla:lib:mac:NSStartup:NSStartup.xml", "NSStartup.all");
BuildOneProjectWithOutput(":mozilla:lib:mac:NSRuntime:NSRuntime.xml", "NSRuntime$C$P$D.shlb", "NSRuntime$D.shlb", 1, $main::ALIAS_SYM_FILES, 0); BuildOneProjectWithOutput(":mozilla:lib:mac:NSRuntime:NSRuntime.xml", "NSRuntime$C$P$D.shlb", "NSRuntime$D.shlb", 1, $main::ALIAS_SYM_FILES, 0);
BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.xml", "MoreFiles$D.o"); BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.xml", "MoreFiles$D.o");
@ -2206,7 +2216,14 @@ sub BuildExtensionsProjects()
# to link against. This is really only needed for the static build, but there is no harm in building it anyway. # to link against. This is really only needed for the static build, but there is no harm in building it anyway.
BuildOneProject(":mozilla:directory:xpcom:macbuild:LDAPClientDummyLib.xml", "LDAPClient$D.shlb", 1, 0, 0); BuildOneProject(":mozilla:directory:xpcom:macbuild:LDAPClientDummyLib.xml", "LDAPClient$D.shlb", 1, 0, 0);
} }
# InterfaceInfo Extras
if ($main::options{iiextras})
{
BuildOneProject(":mozilla:extensions:interfaceinfo:macbuild:iiextras.xml", "iiextras$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
InstallResources(":mozilla:extensions:interfaceinfo:src:MANIFEST_COMPONENTS", "$components_dir");
}
# XML Extras # XML Extras
if ($main::options{xmlextras}) if ($main::options{xmlextras})
{ {