From 139065f68c723cb1749a400fcd800e058ba696f7 Mon Sep 17 00:00:00 2001 From: "beard%netscape.com" Date: Tue, 27 Feb 2001 02:44:26 +0000 Subject: [PATCH] remove dependence on $main::CARBON, add $main::options{cache} to conditionally build new cache projects. r=sfraser --- build/mac/build_scripts/Moz/BuildUtils.pm | 1 - build/mac/build_scripts/MozillaBuildFlags.txt | 1 + build/mac/build_scripts/MozillaBuildList.pm | 37 +++++++++++-------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/build/mac/build_scripts/Moz/BuildUtils.pm b/build/mac/build_scripts/Moz/BuildUtils.pm index f7ce29b2f029..aa5a20054c12 100644 --- a/build/mac/build_scripts/Moz/BuildUtils.pm +++ b/build/mac/build_scripts/Moz/BuildUtils.pm @@ -63,7 +63,6 @@ sub SetupDefaultBuildOptions($$) # configuration variables that globally affect what is built #------------------------------------------------------------- $main::DEBUG = $debug; - $main::CARBON = 0; # turn on to build with TARGET_CARBON $main::PROFILE = 0; $main::RUNTIME = 0; # turn on to just build runtime support and NSPR projects $main::GC_LEAK_DETECTOR = 0; # turn on to use GC leak detection diff --git a/build/mac/build_scripts/MozillaBuildFlags.txt b/build/mac/build_scripts/MozillaBuildFlags.txt index 2bf3e59c84ed..0d95b10ab1b0 100644 --- a/build/mac/build_scripts/MozillaBuildFlags.txt +++ b/build/mac/build_scripts/MozillaBuildFlags.txt @@ -47,6 +47,7 @@ xptlink 0 psm 0 embedding_test 1 carbon 0 +cache 0 filepath_flags idepath ":CodeWarrior IDE Path.txt" diff --git a/build/mac/build_scripts/MozillaBuildList.pm b/build/mac/build_scripts/MozillaBuildList.pm index 1073834e1f9a..f2ca09abb6aa 100644 --- a/build/mac/build_scripts/MozillaBuildList.pm +++ b/build/mac/build_scripts/MozillaBuildList.pm @@ -853,7 +853,7 @@ sub BuildStubs() my($distdirectory) = ":mozilla:dist"; # $C becomes a component of target names for selecting either the Carbon or non-Carbon target of a project - my($C) = $main::CARBON ? "Carbon" : ""; + my($C) = $main::options{carbon} ? "Carbon" : ""; StartBuildModule("stubs"); @@ -931,6 +931,11 @@ sub BuildIDLProjects() BuildIDLProject(":mozilla:netwerk:macbuild:netwerkIDL.mcp","necko"); BuildIDLProject(":mozilla:uriloader:macbuild:uriLoaderIDL.mcp", "uriloader"); + if ($main::options{cache}) + { + BuildIDLProject(":mozilla:netwerk:macbuild:cacheIDL.mcp", "cache"); + } + # psm glue BuildIDLProject(":mozilla:extensions:psm-glue:macbuild:psmglueIDL.mcp", "psmglue"); @@ -1033,21 +1038,16 @@ sub BuildRuntimeProjects() my($D) = $main::DEBUG ? "Debug" : ""; # $C becomes a component of target names for selecting either the Carbon or non-Carbon target of a project - my($C) = $main::CARBON ? "Carbon" : ""; + my($C) = $main::options{carbon} ? "Carbon" : ""; my($P) = $main::PROFILE ? "Profil" : ""; my($EssentialFiles) = $main::DEBUG ? ":mozilla:dist:viewer_debug:Essential Files:" : ":mozilla:dist:viewer:Essential Files:"; #// #// Shared libraries #// - if ( $main::CARBON ) + if ( $main::options{carbon} ) { - if ( $main::CARBONLITE ) { - BuildProject(":mozilla:lib:mac:InterfaceLib:Interface.mcp", "Carbon Interfaces (Lite)"); - } - else { - BuildProject(":mozilla:lib:mac:InterfaceLib:Interface.mcp", "Carbon Interfaces"); - } + BuildProject(":mozilla:lib:mac:InterfaceLib:Interface.mcp", "Carbon Interfaces"); } else { @@ -1066,7 +1066,7 @@ sub BuildRuntimeProjects() BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.mcp", "MoreFiles.o"); - if ($main::GC_LEAK_DETECTOR && !$main::CARBON) { + if ($main::GC_LEAK_DETECTOR && !$main::options{carbon}) { BuildProject(":mozilla:gc:boehm:macbuild:gc.mcp", "gc.ppc.lib"); MakeAlias(":mozilla:gc:boehm:macbuild:gc.PPC.lib", ":mozilla:dist:gc:gc.PPC.lib"); BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp", "MemAllocatorGC.o"); @@ -1209,16 +1209,21 @@ sub BuildNeckoProjects() my($D) = $main::DEBUG ? "Debug" : ""; # $C becomes a component of target names for selecting either the Carbon or non-Carbon target of a project - my($C) = $main::CARBON ? "Carbon" : ""; + my($C) = $main::options{carbon} ? "Carbon" : ""; my($Components) = $main::DEBUG ? ":mozilla:dist:viewer_debug:Components:" : ":mozilla:dist:viewer:Components:"; StartBuildModule("necko"); BuildOneProjectWithOutput(":mozilla:netwerk:macbuild:netwerk.mcp", "Necko$C$D.shlb", "Necko$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); - - BuildOneProject(":mozilla:netwerk:macbuild:netwerk2.mcp", "Necko2$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); - BuildOneProject(":mozilla:dom:src:jsurl:macbuild:JSUrl.mcp", "JSUrl$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); + BuildOneProject(":mozilla:netwerk:macbuild:netwerk2.mcp", "Necko2$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); + + if ($main::options{cache}) + { + BuildOneProject(":mozilla:netwerk:macbuild:cache.mcp", "Cache$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); + } + + BuildOneProject(":mozilla:dom:src:jsurl:macbuild:JSUrl.mcp", "JSUrl$D.shlb", 1, $main::ALIAS_SYM_FILES, 1); EndBuildModule("necko"); } @@ -1330,7 +1335,7 @@ sub BuildLayoutProjects() # $D becomes a suffix to target names for selecting either the debug or non-debug target of a project my($D) = $main::DEBUG ? "Debug" : ""; # $C becomes a component of target names for selecting either the Carbon or non-Carbon target of a project - my($C) = $main::CARBON ? "Carbon" : ""; + my($C) = $main::options{carbon} ? "Carbon" : ""; my($dist_dir) = GetBinDirectory(); StartBuildModule("nglayout"); @@ -1446,7 +1451,7 @@ sub BuildEmbeddingProjects() BuildOneProject(":mozilla:embedding:base:macbuild:EmbedAPI.mcp", "EmbedAPI$D.o", 0, 0, 0); MakeAlias(":mozilla:embedding:base:macbuild:EmbedAPI$D.o", ":mozilla:dist:embedding:"); - if ($main::options{embedding_test} && !$main::CARBON) + if ($main::options{embedding_test} && !$main::options{carbon}) { if (-e GetCodeWarriorRelativePath("MacOS Support:PowerPlant")) {