mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Exploit new routine BuildProjectClean($;$). Fixed $dist_dir use to be consistent with standard use of variables for directories (i.e., include the trailing colon). Unified some small $DEBUG logic.
This commit is contained in:
parent
091839a1af
commit
4afc0e526b
@ -38,23 +38,18 @@ sub BuildMozilla()
|
||||
{
|
||||
use Moz;
|
||||
|
||||
chdir(":::"); # assuming this script is in "...:mozilla:build:mac:", change dir to just above "mozilla"
|
||||
chdir(":::"); # assuming this script is in "...:mozilla:build:mac:", change dir to just inside "mozilla"
|
||||
|
||||
|
||||
# Ideally, we would set the target name like so:
|
||||
# $target = $main::DEBUG ? "debug" : "optimized";
|
||||
# ...and all projects would have corresponding targets
|
||||
|
||||
|
||||
$D = $main::DEBUG ? "Debug" : ""; # $D becomes a suffix to target names for selecting either the debug or non-debug target of a project
|
||||
|
||||
if ( $main::DEBUG )
|
||||
{
|
||||
$dist_dir = ":dist:client_debug";
|
||||
$D = "Debug";
|
||||
$dist_dir = ":dist:client_debug:";
|
||||
}
|
||||
else
|
||||
{
|
||||
$dist_dir = ":dist:client";
|
||||
$D = "";
|
||||
$dist_dir = ":dist:client:";
|
||||
}
|
||||
|
||||
#
|
||||
@ -63,74 +58,74 @@ sub BuildMozilla()
|
||||
# that it builds.
|
||||
#
|
||||
|
||||
BuildProject(":build:mac:MakeDist.mcp", "Stubs");
|
||||
BuildProjectClean(":build:mac:MakeDist.mcp", "Stubs");
|
||||
|
||||
#
|
||||
# Build the appropriate target of each project
|
||||
#
|
||||
|
||||
BuildProject(":lib:mac:NSStdLib:NSStdLib.mcp", "Stubs");
|
||||
BuildProject(":lib:mac:NSRuntime:NSRuntime.mcp", "Stubs");
|
||||
BuildProject(":lib:mac:MacMemoryAllocator:MemAllocator.mcp", "Stubs");
|
||||
BuildProject(":cmd:macfe:projects:client:NavigatorStubs.mcp", "Stubs");
|
||||
BuildProjectClean(":lib:mac:NSStdLib:NSStdLib.mcp", "Stubs");
|
||||
BuildProjectClean(":lib:mac:NSRuntime:NSRuntime.mcp", "Stubs");
|
||||
BuildProjectClean(":lib:mac:MacMemoryAllocator:MemAllocator.mcp", "Stubs");
|
||||
BuildProjectClean(":cmd:macfe:projects:client:NavigatorStubs.mcp", "Stubs");
|
||||
|
||||
BuildProject(":lib:mac:NSRuntime:NSRuntime.mcp", "NSRuntime$D.shlb");
|
||||
MakeAlias(":lib:mac:NSRuntime:NSRuntime$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":lib:mac:NSRuntime:NSRuntime$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":cmd:macfe:restext:StringLib.mcp", "Strings$D.shlb");
|
||||
MakeAlias(":cmd:macfe:restext:Strings$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":cmd:macfe:restext:Strings$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":lib:mac:MoreFiles:build:MoreFilesPPC.mcp", "MoreFiles$D.shlb");
|
||||
MakeAlias(":lib:mac:MoreFiles:build:MoreFiles$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":lib:mac:MoreFiles:build:MoreFiles$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":nsprpub:macbuild:NSPR20PPC.mcp", "NSPR20$D.shlb");
|
||||
MakeAlias(":nsprpub:macbuild:NSPR20$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":nsprpub:macbuild:NSPR20$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":dbm:macbuild:DBMPPC.mcp", "DBM$D.shlb");
|
||||
MakeAlias(":dbm:macbuild:DBM$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":dbm:macbuild:DBM$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":lib:mac:MacMemoryAllocator:MemAllocator.mcp", "MemAllocator$D.shlb");
|
||||
MakeAlias(":lib:mac:MacMemoryAllocator:MemAllocator$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":lib:mac:MacMemoryAllocator:MemAllocator$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":lib:mac:NSStdLib:NSStdLib.mcp", "NSStdLib$D.shlb");
|
||||
MakeAlias(":lib:mac:NSStdLib:NSStdLib$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":lib:mac:NSStdLib:NSStdLib$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":modules:security:freenav:macbuild:NoSecurity.mcp", "NoSecurity$D.shlb");
|
||||
MakeAlias(":modules:security:freenav:macbuild:NoSecurity$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":modules:security:freenav:macbuild:NoSecurity$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":xpcom:macbuild:xpcomPPC.mcp", "xpcom$D.shlb");
|
||||
MakeAlias(":xpcom:macbuild:xpcom$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":xpcom:macbuild:xpcom$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":lib:mac:PowerPlant:PowerPlant.mcp", "PowerPlant$D.shlb");
|
||||
MakeAlias(":lib:mac:PowerPlant:PowerPlant$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":lib:mac:PowerPlant:PowerPlant$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":modules:zlib:macbuild:zlib.mcp", "zlib$D.shlb");
|
||||
MakeAlias(":modules:zlib:macbuild:zlib$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":modules:zlib:macbuild:zlib$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":jpeg:macbuild:JPEG.mcp", "JPEG$D.shlb");
|
||||
MakeAlias(":jpeg:macbuild:JPEG$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":jpeg:macbuild:JPEG$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":sun-java:stubs:macbuild:JavaStubs.mcp", "JavaRuntime$D.shlb");
|
||||
MakeAlias(":sun-java:stubs:macbuild:JavaRuntime$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":sun-java:stubs:macbuild:JavaRuntime$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":js:jsj:macbuild:JSJ_PPC.mcp", "JSJ$D.o");
|
||||
BuildProject(":js:jsj:macbuild:JSJ_PPC.mcp", "JSJ$D.o");
|
||||
|
||||
BuildProject(":js:macbuild:JavaScriptPPC.mcp", "JavaScript$D.shlb");
|
||||
MakeAlias(":js:macbuild:JavaScript$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":js:macbuild:JavaScript$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":nav-java:stubs:macbuild:NavJavaStubs.mcp", "NavJava$D.shlb");
|
||||
MakeAlias(":nav-java:stubs:macbuild:NavJava$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":nav-java:stubs:macbuild:NavJava$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":modules:rdf:macbuild:RDF.mcp", "RDF$D.shlb");
|
||||
MakeAlias(":modules:rdf:macbuild:RDF$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":modules:rdf:macbuild:RDF$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":modules:xml:macbuild:XML.mcp", "XML$D.shlb");
|
||||
MakeAlias(":modules:xml:macbuild:XML$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":modules:xml:macbuild:XML$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":modules:libfont:macbuild:FontBroker.mcp", "FontBroker$D.o");
|
||||
|
||||
BuildProject(":modules:schedulr:macbuild:Schedulr.mcp", "Scheduler$D.shlb");
|
||||
MakeAlias(":modules:schedulr:macbuild:Scheduler$D.shlb", "${dist_dir}:");
|
||||
MakeAlias(":modules:schedulr:macbuild:Scheduler$D.shlb", "$dist_dir");
|
||||
|
||||
BuildProject(":network:macbuild:network.mcp", "Network$D.o");
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user