Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

parameterize client.mk to Settings::moz_client_mk so we can substitute other builds here, e.g. camino. -mcafee

Browse Source
This commit is contained in:
cltbld%netscape.com 2003-06-26 01:06:48 +00:00
parent 7c09f5e493
commit 98a3f0b555
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/tinderbox/build-seamonkey-util.pl
View File

@ -23,7 +23,7 @@ use Config; # for $Config{sig_name} and $Config{sig_num}
use File::Find ();
use File::Copy;
$::UtilsVersion = '$Revision: 1.241 $ ';
$::UtilsVersion = '$Revision: 1.242 $ ';
package TinderUtils;
@ -88,7 +88,7 @@ Options:
--notimestamp Do not pull by date.
-tag TREETAG Pull by tag (-r TREETAG).
-t TREENAME The name of the tree
--mozconfig FILENAME Provide a mozconfig file for client.mk to use.
--mozconfig FILENAME Provide a mozconfig file for $Settings::moz_client_mk
--version Print the version number (same as cvs revision).
--help
More details:
@ -785,15 +785,15 @@ sub BuildIt {
# Allow skipping of mozilla phase.
unless ($Settings::SkipMozilla) {
# Make sure we have client.mk
unless (-e "$TreeSpecific::name/client.mk") {
# Make sure we have $Settings::moz_client_mk
unless (-e "$TreeSpecific::name/$Settings::moz_client_mk") {
# Set CVSROOT here. We should only need to checkout a new
# version of client.mk once; we might have more than one
# cvs tree so set CVSROOT here to avoid confusion.
# version of $Settings::moz_client_mk once; we might have
# more than one cvs tree so set CVSROOT here to avoid confusion.
$ENV{CVSROOT} = $Settings::moz_cvsroot;
run_shell_command("$Settings::CVS $cvsco $TreeSpecific::name/client.mk");
run_shell_command("$Settings::CVS $cvsco $TreeSpecific::name/$Settings::moz_client_mk");
}
# Create toplevel source directory.
@ -821,9 +821,9 @@ sub BuildIt {
}
}
# Build up initial make command.
my $make = "$Settings::Make -f client.mk $Settings::MakeOverrides CONFIGURE_ENV_ARGS='$Settings::ConfigureEnvArgs'";
my $make = "$Settings::Make -f $Settings::moz_client_mk $Settings::MakeOverrides CONFIGURE_ENV_ARGS='$Settings::ConfigureEnvArgs'";
if ($Settings::FastUpdate) {
$make = "$Settings::Make -f client.mk fast-update && $Settings::Make -f client.mk $Settings::MakeOverrides CONFIGURE_ENV_ARGS='$Settings::ConfigureEnvArgs' build";
$make = "$Settings::Make -f $Settings::moz_client_mk fast-update && $Settings::Make -f $Settings::moz_client_mk $Settings::MakeOverrides CONFIGURE_ENV_ARGS='$Settings::ConfigureEnvArgs' build";
}
# Build up target string.

3
tools/tinderbox/tinder-defaults.pl
View File

@ -96,6 +96,9 @@ $moz_cvsroot = $ENV{CVSROOT};
#- Set these proper values for your tinderbox server
$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
# Allow for non-client builds, e.g. camino.
$moz_client_mk = 'client.mk';
#- Set if you want to build in a separate object tree
$ObjDir = '';