From 80b8a3e11df51d81b89a8c0a54727c99ee2a6cca Mon Sep 17 00:00:00 2001 From: "mcmullen%netscape.com" Date: Tue, 4 May 1999 19:28:14 +0000 Subject: [PATCH] International files in a separate group. --- build/mac/NGLayoutBuildList.pm | 73 +++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 24 deletions(-) diff --git a/build/mac/NGLayoutBuildList.pm b/build/mac/NGLayoutBuildList.pm index 4a0161d6948..b577f423c4e 100644 --- a/build/mac/NGLayoutBuildList.pm +++ b/build/mac/NGLayoutBuildList.pm @@ -434,6 +434,8 @@ sub BuildDist() #// 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"); + + print("--- Dist export complete ----\n") } @@ -504,7 +506,6 @@ sub BuildCommonProjects() # $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(); #// #// Stub libraries @@ -566,7 +567,40 @@ sub BuildCommonProjects() BuildOneProject(":mozilla:js:macbuild:XPConnect.mcp", "XPConnect$D.shlb", "", 1, $main::ALIAS_SYM_FILES, 0); - # International projects + BuildOneProject(":mozilla:modules:libutil:macbuild:libutil.mcp", "libutil$D.shlb", "libutil.toc", 1, $main::ALIAS_SYM_FILES, 0); + + ReconcileProject(":mozilla:modules:libimg:macbuild:png.mcp", ":mozilla:modules:libimg:macbuild:png.toc"); + BuildProject(":mozilla:modules:libimg:macbuild:png.mcp", "png$D.o"); + + BuildOneProject(":mozilla:modules:libimg:macbuild:libimg.mcp", "libimg$D.shlb", "libimg.toc", 1, $main::ALIAS_SYM_FILES, 0); + BuildOneProject(":mozilla:modules:libimg:macbuild:gifdecoder.mcp", "gifdecoder$D.shlb", "gifdecoder.toc", 1, $main::ALIAS_SYM_FILES, 1); + BuildOneProject(":mozilla:modules:libimg:macbuild:pngdecoder.mcp", "pngdecoder$D.shlb", "pngdecoder.toc", 1, $main::ALIAS_SYM_FILES, 1); + BuildOneProject(":mozilla:modules:libimg:macbuild:jpgdecoder.mcp", "jpgdecoder$D.shlb", "jpgdecoder.toc", 1, $main::ALIAS_SYM_FILES, 1); + + BuildOneProject(":mozilla:network:macbuild:network.mcp", "NetworkModular$D.shlb", "network.toc", 1, $main::ALIAS_SYM_FILES, 0); + + BuildOneProject(":mozilla:extensions:wallet:macbuild:wallet.mcp", "Wallet$D.shlb", "wallet.toc", 1, $main::ALIAS_SYM_FILES, 1); + + BuildOneProject(":mozilla:rdf:brprof:build:brprof.mcp", "BrowsingProfile$D.shlb", "brprof.toc", 1, $main::ALIAS_SYM_FILES, 1); + BuildOneProject(":mozilla:rdf:chrome:build:chrome.mcp", "ChomeRegistry$D.shlb", "chrome.toc", 1, $main::ALIAS_SYM_FILES, 1); + +#// XXX moved this TEMPORARILY to layout while we sort out a dependency +# BuildOneProject(":mozilla:rdf:macbuild:rdf.mcp", "rdf$D.shlb", "rdf.toc", 1, $main::ALIAS_SYM_FILES, 1); + + print("--- Common projects complete ----\n") +} + +#//-------------------------------------------------------------------------------------------------- +#// Build international projects +#//-------------------------------------------------------------------------------------------------- + +sub BuildInternationalProjects() +{ + unless( $main::build{intl} ) { return; } + + # $D becomes a suffix to target names for selecting either the debug or non-debug target of a project + my($D) = $main::DEBUG ? "Debug" : ""; + BuildOneProject(":mozilla:intl:uconv:macbuild:uconv.mcp", "uconv$D.shlb", "uconv.toc", 1, $main::ALIAS_SYM_FILES, 1); BuildOneProject(":mozilla:intl:uconv:macbuild:ucvlatin.mcp", "ucvlatin$D.shlb", "uconvlatin.toc", 1, $main::ALIAS_SYM_FILES, 1); @@ -575,7 +609,7 @@ sub BuildCommonProjects() BuildOneProject(":mozilla:intl:uconv:macbuild:ucvja2.mcp", "ucvja2$D.shlb", "ucvja2.toc", 1, $main::ALIAS_SYM_FILES, 1); -#// Have not enable yet... place holder +#// Have not enabled yet... place holder BuildOneProject(":mozilla:intl:uconv:macbuild:ucvtw.mcp", "ucvtw$D.shlb", "ucvtw.toc", 1, $main::ALIAS_SYM_FILES, 1); BuildOneProject(":mozilla:intl:uconv:macbuild:ucvtw2.mcp", "ucvtw2$D.shlb", "ucvtw2.toc", 1, $main::ALIAS_SYM_FILES, 1); @@ -596,27 +630,9 @@ sub BuildCommonProjects() BuildOneProject(":mozilla:intl:strres:macbuild:strres.mcp", "strres$D.shlb", "strres.toc", 1, $main::ALIAS_SYM_FILES, 1); - BuildOneProject(":mozilla:modules:libutil:macbuild:libutil.mcp", "libutil$D.shlb", "libutil.toc", 1, $main::ALIAS_SYM_FILES, 0); - - ReconcileProject(":mozilla:modules:libimg:macbuild:png.mcp", ":mozilla:modules:libimg:macbuild:png.toc"); - BuildProject(":mozilla:modules:libimg:macbuild:png.mcp", "png$D.o"); - - BuildOneProject(":mozilla:modules:libimg:macbuild:libimg.mcp", "libimg$D.shlb", "libimg.toc", 1, $main::ALIAS_SYM_FILES, 0); - BuildOneProject(":mozilla:modules:libimg:macbuild:gifdecoder.mcp", "gifdecoder$D.shlb", "gifdecoder.toc", 1, $main::ALIAS_SYM_FILES, 1); - BuildOneProject(":mozilla:modules:libimg:macbuild:pngdecoder.mcp", "pngdecoder$D.shlb", "pngdecoder.toc", 1, $main::ALIAS_SYM_FILES, 1); - BuildOneProject(":mozilla:modules:libimg:macbuild:jpgdecoder.mcp", "jpgdecoder$D.shlb", "jpgdecoder.toc", 1, $main::ALIAS_SYM_FILES, 1); - - BuildOneProject(":mozilla:network:macbuild:network.mcp", "NetworkModular$D.shlb", "network.toc", 1, $main::ALIAS_SYM_FILES, 0); - - BuildOneProject(":mozilla:extensions:wallet:macbuild:wallet.mcp", "Wallet$D.shlb", "wallet.toc", 1, $main::ALIAS_SYM_FILES, 1); + print("--- International projects complete ----\n") +} # intl - BuildOneProject(":mozilla:rdf:brprof:build:brprof.mcp", "BrowsingProfile$D.shlb", "brprof.toc", 1, $main::ALIAS_SYM_FILES, 1); - BuildOneProject(":mozilla:rdf:chrome:build:chrome.mcp", "ChomeRegistry$D.shlb", "chrome.toc", 1, $main::ALIAS_SYM_FILES, 1); - -#// XXX moved this TEMPORARILY to layout while we sort out a dependency -# BuildOneProject(":mozilla:rdf:macbuild:rdf.mcp", "rdf$D.shlb", "rdf.toc", 1, $main::ALIAS_SYM_FILES, 1); -} - #//-------------------------------------------------------------------------------------------------- #// Make resource aliases for one directory @@ -721,11 +737,12 @@ sub MakeResourceAliases() # copy the chrome registry. We want an actual copy so that changes for custom UI's # don't accidentally get checked into the tree. (pinkerton, bug#5296). copy ( ":mozilla:rdf:chrome:build:registry.rdf", "$chrome_dir" . "registry.rdf" ); - print ( "copying mozilla:rdf:chrime:build:registry.rdf to $chrome_dir\n" ); + print ( "copying mozilla:rdf:chrome:build:registry.rdf to $chrome_dir\n" ); # Install XPFE component resources InstallResources(":mozilla:xpfe:components:find:resources:MANIFEST", "$samples_dir"); + print("--- Resource copying complete ----\n") } @@ -791,6 +808,7 @@ sub BuildLayoutProjects() BuildOneProject(":mozilla:xpinstall:macbuild:xpinstall.mcp", "xpinstall$D.shlb", "", 1, $main::ALIAS_SYM_FILES, 1); + print("---- Layout projects complete ----\n") } @@ -813,6 +831,7 @@ sub BuildEditorProjects() BuildOneProject(":mozilla:editor:macbuild:editor.mcp", "EditorCore$D.shlb", "EditorCore.toc", 1, $main::ALIAS_SYM_FILES, 1); + print("--- Editor projects complete ----\n") } @@ -832,6 +851,8 @@ sub BuildViewerProjects() BuildOneProject(":mozilla:webshell:tests:viewer:mac:viewer.mcp", "viewer$D", "viewer.toc", 0, 0, 0); # BuildOneProject(":mozilla:xpfe:macbuild:xpfeviewer.mcp", "xpfeviewer$D.shlb", "xpfeviewer.toc", 0, 0, 0); + + print("--- Viewer projects complete ----\n") } @@ -859,6 +880,8 @@ sub BuildXPAppProjects() BuildOneProject(":mozilla:xpfe:bootstrap:macbuild:apprunner.mcp", "apprunner$D", "apprunner.toc", 0, 0, 1); + print("--- XPApp projects complete ----\n") + } @@ -898,6 +921,7 @@ sub BuildMailNewsProjects() # BuildOneProject(":mozilla:mailnews:mime:cthandlers:calendar:macbuild:calendar.mcp", "calendar$D.shlb", "calendar.toc", 1, $main::ALIAS_SYM_FILES, 1); + print("--- MailNews projects complete ----\n") } @@ -913,6 +937,7 @@ sub BuildProjects() BuildStubs(); BuildCommonProjects(); + BuildInternationalProjects(); BuildLayoutProjects(); BuildEditorProjects(); MakeResourceAliases();