diff --git a/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl b/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl index 24d91f57363..9585f79be95 100644 --- a/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl +++ b/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl @@ -157,7 +157,7 @@ $MofoRoot = ":ext:cltbld\@cvs.mozilla.org:/mofo"; #$moz_client_mk = 'client.mk'; #- Set if you want to build in a separate object tree -#$ObjDir = ''; +$ObjDir = 'obj-fx-trunk'; # Extra build name, if needed. $BuildNameExtra = 'Nightly'; @@ -200,7 +200,7 @@ $BinaryName = 'firefox-bin'; # Release build options $ReleaseBuild = 1; -$shiptalkback = 1; +$shiptalkback = 0; $ReleaseToLatest = 1; # Push the release to latest-? $ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-? $build_hour = 4; diff --git a/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl b/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl index 66db7ba4dc8..84a8dd5373f 100644 --- a/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl +++ b/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl @@ -150,8 +150,7 @@ $MofoRoot = ":ext:cltbld\@cvs.mozilla.org:/mofo"; #$moz_client_mk = 'client.mk'; #- Set if you want to build in a separate object tree -#XXX: this breaks talkback currently -#$ObjDir = 'fx-trunk'; +$ObjDir = 'obj-fx-trunk'; # Extra build name, if needed. $BuildNameExtra = 'Nightly'; @@ -194,7 +193,7 @@ $BinaryName = 'firefox.exe'; # Release build options $ReleaseBuild = 1; -$shiptalkback = 1; +$shiptalkback = 0; $ReleaseToLatest = 1; # Push the release to latest-? $ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-? $build_hour = "4";