From 8d9edf569443bb78ea0354b83793bd0fd03a1b00 Mon Sep 17 00:00:00 2001 From: "ducarroz%netscape.com" Date: Thu, 15 Apr 1999 20:07:37 +0000 Subject: [PATCH] add mailnews into build process for Mac. By default, mailnews if off even when build{all}=1, you must set build{mailnews}=1 in order to built messenger. --- build/mac/BuildNGLayout.pl | 5 +++ build/mac/BuildNGLayoutDebug.pl | 5 +++ build/mac/NGLayoutBuildList.pm | 60 +++++++++++++++++++++++++++++ build/mac/PullBuildNGLayoutDebug.pl | 5 +++ build/mac/TinderboxNGLayout.pl | 5 +++ build/mac/TinderboxNGLayoutOpt.pl | 5 +++ 6 files changed, 85 insertions(+) diff --git a/build/mac/BuildNGLayout.pl b/build/mac/BuildNGLayout.pl index 047adfaf20f8..9c13e860554f 100644 --- a/build/mac/BuildNGLayout.pl +++ b/build/mac/BuildNGLayout.pl @@ -48,6 +48,7 @@ $build{resources} = 0; $build{editor} = 0; $build{viewer} = 0; $build{xpapp} = 0; +$build{mailnews} = 0; if ($pull{all}) { @@ -58,10 +59,14 @@ if ($pull{all}) } if ($build{all}) { + $temp = $build{mailnews}; + foreach $k (keys(%build)) { $build{$k} = 1; } + + $build{mailnews} = $temp; # don't turn on mailnews until we are sure that everything is ok on Tinderbox } # do the work diff --git a/build/mac/BuildNGLayoutDebug.pl b/build/mac/BuildNGLayoutDebug.pl index fbb75681ada1..d3bc4976d986 100644 --- a/build/mac/BuildNGLayoutDebug.pl +++ b/build/mac/BuildNGLayoutDebug.pl @@ -49,6 +49,7 @@ $build{resources} = 0; $build{editor} = 0; $build{viewer} = 0; $build{xpapp} = 0; +$build{mailnews} = 0; if ($pull{all}) { @@ -59,10 +60,14 @@ if ($pull{all}) } if ($build{all}) { + $temp = $build{mailnews}; + foreach $k (keys(%build)) { $build{$k} = 1; } + + $build{mailnews} = $temp; # don't turn on mailnews until we are sure that everything is ok on Tinderbox } # do the work diff --git a/build/mac/NGLayoutBuildList.pm b/build/mac/NGLayoutBuildList.pm index 35bea7344a92..6206025bf22f 100644 --- a/build/mac/NGLayoutBuildList.pm +++ b/build/mac/NGLayoutBuildList.pm @@ -396,6 +396,24 @@ sub BuildDist() InstallFromManifest(":mozilla:xpfe:AppCores:public:MANIFEST", "$distdirectory:xpfe:"); InstallFromManifest(":mozilla:xpfe:appshell:public:MANIFEST", "$distdirectory:xpfe:"); + # MAILNEWS + if ($main::build{mailnews}) + { + InstallFromManifest(":mozilla:mailnews:public:MANIFEST", "$distdirectory:mailnews:"); + InstallFromManifest(":mozilla:mailnews:base:public:MANIFEST", "$distdirectory:mailnews:"); + InstallFromManifest(":mozilla:mailnews:base:build:MANIFEST", "$distdirectory:mailnews:"); + InstallFromManifest(":mozilla:mailnews:base:src:MANIFEST", "$distdirectory:mailnews:"); + InstallFromManifest(":mozilla:mailnews:base:util:MANIFEST", "$distdirectory:mailnews:"); + InstallFromManifest(":mozilla:mailnews:compose:public:MANIFEST", "$distdirectory:mailnews:"); + InstallFromManifest(":mozilla:mailnews:db:mdb:public:MANIFEST", "$distdirectory:mailnews:"); + InstallFromManifest(":mozilla:mailnews:db:msgdb:public:MANIFEST", "$distdirectory:mailnews:"); + InstallFromManifest(":mozilla:mailnews:db:msgdb:build:MANIFEST", "$distdirectory:mailnews:"); + InstallFromManifest(":mozilla:mailnews:local:public:MANIFEST", "$distdirectory:mailnews:"); + InstallFromManifest(":mozilla:mailnews:local:build:MANIFEST", "$distdirectory:mailnews:"); + InstallFromManifest(":mozilla:mailnews:mime:public:MANIFEST", "$distdirectory:mailnews:"); + InstallFromManifest(":mozilla:mailnews:news:public:MANIFEST", "$distdirectory:mailnews:"); + } + #// To get out defines in all the project, dummy alias NGLayoutConfigInclude.h into MacConfigInclude.h MakeAlias(":mozilla:config:mac:NGLayoutConfigInclude.h", ":mozilla:dist:config:MacConfigInclude.h"); } @@ -642,6 +660,18 @@ sub MakeResouceAliases() BuildFolderResourceAliases(":mozilla:xpfe:AppCores:xul:", "$samples_dir"); BuildFolderResourceAliases(":mozilla:xpfe:AppCores:xul:resources:", "$toolbar_dir"); MakeAlias(":mozilla:xpfe:AppCores:xul:resources:throbbingN.gif", "$throbber_dir"); + + if ($main::build{mailnews}) + { + my($messenger_dir) = "$resource_dir" . "mailnews:messenger:"; + BuildFolderResourceAliases(":mozilla:mailnews:ui:messenger:resources:", "$messenger_dir"); + + my($compose_dir) = "$resource_dir" . "mailnews:compose:"; + BuildFolderResourceAliases(":mozilla:mailnews:ui:compose:resources:", "$compose_dir"); + + my($msgpref_dir) = "$resource_dir" . "mailnews:preference:"; + BuildFolderResourceAliases(":mozilla:mailnews:ui:preference:resources:", "$msgpref_dir"); + } my($chrome_dir) = "$dist_dir" . "chrome:"; BuildFolderResourceAliases(":mozilla:rdf:chrome:build:", "$chrome_dir"); @@ -777,6 +807,35 @@ sub BuildXPAppProjects() +#//-------------------------------------------------------------------------------------------------- +#// Build MailNews Projects +#//-------------------------------------------------------------------------------------------------- + +sub BuildMailNewsProjects() +{ + unless( $main::build{mailnews} ) { return; } + _assertRightDirectory(); + + # $D becomes a suffix to target names for selecting either the debug or non-debug target of a project + my($D) = $main::DEBUG ? "Debug" : ""; + my($dist_dir) = _getDistDirectory(); + + BuildOneProject(":mozilla:mailnews:base:util:macbuild:msgUtil.mcp", "MsgUtil$D.lib", "MsgUtil.toc", 0, 0, 0); + + BuildOneProject(":mozilla:mailnews:base:macbuild:msgCore.mcp", "mailnews$D.shlb", "mailnews.toc", 1, $main::ALIAS_SYM_FILES, 1); + + BuildOneProject(":mozilla:mailnews:compose:macbuild:msgCompose.mcp", "MsgCompose$D.shlb", "MsgCompose.toc", 1, $main::ALIAS_SYM_FILES, 1); + + BuildOneProject(":mozilla:mailnews:db:macbuild:msgDB.mcp", "MsgDB$D.shlb", "MsgDB.toc", 1, $main::ALIAS_SYM_FILES, 1); + + BuildOneProject(":mozilla:mailnews:local:macbuild:msglocal.mcp", "MsgLocal$D.shlb", "MsgLocal.toc", 1, $main::ALIAS_SYM_FILES, 1); + + BuildOneProject(":mozilla:mailnews:mime:macbuild:mime.mcp", "Mime$D.shlb", "Mime.toc", 1, $main::ALIAS_SYM_FILES, 1); + +} + + + #//-------------------------------------------------------------------------------------------------- #// Build everything #//-------------------------------------------------------------------------------------------------- @@ -793,4 +852,5 @@ sub BuildProjects() MakeResouceAliases(); BuildViewerProjects(); BuildXPAppProjects(); + BuildMailNewsProjects(); } diff --git a/build/mac/PullBuildNGLayoutDebug.pl b/build/mac/PullBuildNGLayoutDebug.pl index a019af017973..cc3cd32f24cb 100644 --- a/build/mac/PullBuildNGLayoutDebug.pl +++ b/build/mac/PullBuildNGLayoutDebug.pl @@ -49,6 +49,7 @@ $build{resources} = 0; $build{editor} = 0; $build{viewer} = 0; $build{xpapp} = 0; +$build{mailnews} = 0; if ($pull{all}) { @@ -59,10 +60,14 @@ if ($pull{all}) } if ($build{all}) { + $temp = $build{mailnews}; + foreach $k (keys(%build)) { $build{$k} = 1; } + + $build{mailnews} = $temp; # don't turn on mailnews until we are sure that everything is ok on Tinderbox } # do the work diff --git a/build/mac/TinderboxNGLayout.pl b/build/mac/TinderboxNGLayout.pl index 877fa5694fbf..f601af0fd18a 100644 --- a/build/mac/TinderboxNGLayout.pl +++ b/build/mac/TinderboxNGLayout.pl @@ -49,6 +49,7 @@ $build{resources} = 0; $build{editor} = 0; $build{viewer} = 0; $build{xpapp} = 0; +$build{mailnews} = 0; # script @@ -65,10 +66,14 @@ if ($pull{all}) } if ($build{all}) { + $temp = $build{mailnews}; + foreach $k (keys(%build)) { $build{$k} = 1; } + + $build{mailnews} = $temp; # don't turn on mailnews until we are sure that everything is ok on Tinderbox } # do the work diff --git a/build/mac/TinderboxNGLayoutOpt.pl b/build/mac/TinderboxNGLayoutOpt.pl index 9993ae10bf82..b50526354e23 100644 --- a/build/mac/TinderboxNGLayoutOpt.pl +++ b/build/mac/TinderboxNGLayoutOpt.pl @@ -49,6 +49,7 @@ $build{resources} = 0; $build{editor} = 0; $build{viewer} = 0; $build{xpapp} = 0; +$build{mailnews} = 0; # script @@ -63,10 +64,14 @@ if ($pull{all}) } if ($build{all}) { + $temp = $build{mailnews}; + foreach $k (keys(%build)) { $build{$k} = 1; } + + $build{mailnews} = $temp; # don't turn on mailnews until we are sure that everything is ok on Tinderbox } # do the work