From 2588f7c8cc52dc494bd71f7ebf7ea2ec52ca4ad3 Mon Sep 17 00:00:00 2001 From: "rhelmer%mozilla.com" Date: Fri, 1 Dec 2006 02:22:58 +0000 Subject: [PATCH] back out changes, only meant for branch git-svn-id: svn://10.0.0.236/trunk@216205 18797224-902f-48f8-a5cc-f745e15eee43 --- .../tinderbox-configs/firefox/linux/mozconfig | 9 ++++++--- .../firefox/linux/tinder-config.pl | 20 +++++++++---------- .../firefox/macosx/mozconfig | 4 ++-- .../firefox/macosx/tinder-config.pl | 19 +++++++++--------- .../tinderbox-configs/firefox/win32/mozconfig | 5 +++-- .../firefox/win32/tinder-config.pl | 14 ++++++------- 6 files changed, 36 insertions(+), 35 deletions(-) diff --git a/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig b/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig index 2f34025ebaf..15462692021 100644 --- a/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig +++ b/mozilla/tools/tinderbox-configs/firefox/linux/mozconfig @@ -7,14 +7,17 @@ export MOZILLA_OFFICIAL=1 mk_add_options MOZ_CO_PROJECT=browser mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl +mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging mozilla/tools/codesighs" ac_add_options --enable-application=browser -ac_add_options --enable-update-channel=beta +ac_add_options --enable-update-channel=nightly ac_add_options --enable-update-packaging -ac_add_options --enable-optimize="-Os -freorder-blocks -fno-reorder-functions -gstabs+" +ac_add_options --enable-optimize ac_add_options --disable-debug ac_add_options --disable-tests +#not yet +#ac_add_options --enable-glitz ac_add_options --enable-canvas ac_add_options --enable-svg ac_add_options --enable-pango @@ -23,4 +26,4 @@ ac_add_options --enable-default-toolkit=cairo-gtk2 ac_add_options --enable-static ac_add_options --disable-shared -ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --enable-codesighs \ No newline at end of file diff --git a/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl b/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl index 3b2da8724d9..614b41b34b1 100644 --- a/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl +++ b/mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl @@ -1,12 +1,13 @@ # -## hostname: argo-vm -## uname: Linux argo-vm.mozilla.org 2.4.21-32.0.1.ELsmp #1 SMP Tue May 17 17:52:23 EDT 2005 i686 i686 i386 GNU/Linux +## hostname: argo +## uname: Linux argo.mozilla.org 2.4.21-32.0.1.ELsmp #1 SMP Tue May 17 17:52:23 EDT 2005 i686 i686 i386 GNU/Linux # #- tinder-config.pl - Tinderbox configuration file. #- Uncomment the variables you need to set. #- The default values are the same as the commented variables. +$BuildXForms = "1"; $ENV{MOZILLA_OFFICIAL} = 1; $ENV{CVS_RSH} = "ssh"; #$ENV{PATH} = "/usr/gcc-3.3.2rh/bin:$ENV{PATH}"; @@ -82,7 +83,7 @@ $DHTMLPerformanceTest = 0; # Tdhtml #$XULWindowOpenTest = 0; # Txul $StartupPerformanceTest = 0; # Ts -$TestsPhoneHome = 0; # Should test report back to server? +$TestsPhoneHome = 1; # Should test report back to server? $GraphNameOverride = 'argo-vm'; # $results_server @@ -158,7 +159,7 @@ $moz_cvsroot = ":ext:cltbld\@cvs.mozilla.org:/cvsroot"; #$ObjDir = ''; # Extra build name, if needed. -$BuildNameExtra = 'Release'; +$BuildNameExtra = 'Nightly'; # User comment, eg. ip address for dhcp builds. # ex: $UserComment = "ip = 208.12.36.108"; @@ -176,7 +177,7 @@ $BuildNameExtra = 'Release'; $BuildTree = 'Firefox'; #$BuildName = ''; -$BuildTag = 'MOZILLA_1_9a1_RELEASE'; +#$BuildTag = ''; #$BuildConfigDir = 'mozilla/config'; #$Topsrcdir = 'mozilla'; @@ -198,7 +199,7 @@ $BinaryName = 'firefox-bin'; # Release build options $ReleaseBuild = 1; $shiptalkback = 1; -$ReleaseToLatest = 0; # Push the release to latest-? +$ReleaseToLatest = 1; # Push the release to latest-? $ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-? $build_hour = 4; $package_creation_path = "/browser/installer"; @@ -210,13 +211,13 @@ $ftp_path = "/home/ftp/pub/firefox/nightly"; $url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly"; $tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds"; $tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds"; -$milestone = "mozilla1.9a1"; +$milestone = "trunk"; $notify_list = 'build-announce@mozilla.org'; $stub_installer = 0; $sea_installer = 0; $archive = 1; $push_raw_xpis = 0; -$update_pushinfo = 0; +$update_pushinfo = 1; $update_package = 1; $update_product = "Firefox"; $update_version = "trunk"; @@ -249,6 +250,3 @@ $update_ver_file = 'browser/config/version.txt'; # Prevent Extension Manager from spawning child processes during tests # - processes that tbox scripts cannot kill. #$ENV{NO_EM_RESTART} = '1'; - -# Do not build XForms -$BuildXForms = 0; diff --git a/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig b/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig index a223fadf800..5bdfaca843f 100644 --- a/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig +++ b/mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig @@ -11,7 +11,7 @@ mk_add_options MOZ_CO_PROJECT="browser" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build/universal ac_add_options --enable-application=browser -ac_add_options --enable-update-channel=beta +ac_add_options --enable-update-channel=nightly ac_add_options --enable-optimize="-O2 -g" ac_add_options --disable-debug ac_add_options --disable-tests @@ -19,7 +19,7 @@ ac_add_options --enable-update-packaging ac_add_options --enable-static ac_add_options --disable-shared +# ac_add_options --enable-official-branding ac_add_app_options ppc --enable-prebinding ac_add_options --enable-svg ac_add_options --enable-canvas -ac_add_options --with-branding=browser/branding/unofficial diff --git a/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl b/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl index 25cd68ef47a..1608ef1b2dc 100644 --- a/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl +++ b/mozilla/tools/tinderbox-configs/firefox/macosx/tinder-config.pl @@ -14,6 +14,8 @@ $ENV{CVS_RSH} = "ssh"; $MacUniversalBinary = 1; +$BuildXForms = 1; + # $ENV{MOZ_PACKAGE_MSI} #----------------------------------------------------------------------------- # Default: 0 @@ -77,7 +79,7 @@ $LayoutPerformanceTest = 1; # Tp #$XULWindowOpenTest = 1; # Txul $StartupPerformanceTest = 1; # Ts -$TestsPhoneHome = 0; # Should test report back to server? +$TestsPhoneHome = 1; # Should test report back to server? $GraphNameOverride = 'xserve06.build.mozilla.org_Fx-Trunk'; @@ -154,7 +156,7 @@ $moz_cvsroot = ":ext:cltbld\@cvs.mozilla.org:/cvsroot"; $ObjDir = '../build/universal'; # Extra build name, if needed. -$BuildNameExtra = 'Release'; +$BuildNameExtra = 'Universal Nightly'; # User comment, eg. ip address for dhcp builds. # ex: $UserComment = "ip = 208.12.36.108"; @@ -172,7 +174,7 @@ $BuildNameExtra = 'Release'; $BuildTree = 'Firefox'; #$BuildName = ''; -$BuildTag = 'MOZILLA_1_9a1_RELEASE'; +#$BuildTag = ''; #$BuildConfigDir = 'mozilla/config'; #$Topsrcdir = 'mozilla'; @@ -194,8 +196,8 @@ $BinaryName = 'firefox-bin'; # Release build options $ReleaseBuild = 1; $shiptalkback = 1; -$ReleaseToLatest = 0; # Push the release to latest-? -$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-? +#$ReleaseToLatest = 1; # Push the release to latest-? +#$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-? $build_hour = "4"; $package_creation_path = "/browser/installer"; # needs setting for mac + talkback: $mac_bundle_path = "/browser/app"; @@ -207,7 +209,7 @@ $ftp_path = "/home/ftp/pub/firefox/nightly"; $url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly"; $tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds"; $tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds"; -$milestone = "mozilla1.9a1"; +$milestone = "trunk"; $notify_list = "build-announce\@mozilla.org"; $stub_installer = 0; $sea_installer = 0; @@ -221,7 +223,7 @@ $update_hash = "md5"; $update_filehost = "ftp.mozilla.org"; $update_appv = "3.0a1"; $update_extv = "3.0a1"; -$update_pushinfo = 0; +$update_pushinfo = 1; # Reboot the OS at the end of build-and-test cycle. This is primarily # intended for Win9x, which can't last more than a few cycles before @@ -247,6 +249,3 @@ $update_pushinfo = 0; # Prevent Extension Manager from spawning child processes during tests # - processes that tbox scripts cannot kill. #$ENV{NO_EM_RESTART} = '1'; - -# Do not build XForms -$BuildXForms = 0; diff --git a/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig b/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig index bb9f332ff24..d7c8198cba5 100644 --- a/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig +++ b/mozilla/tools/tinderbox-configs/firefox/win32/mozconfig @@ -12,14 +12,15 @@ mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging" mk_add_options MOZ_PACKAGE_NSIS=1 ac_add_options --enable-application=browser -ac_add_options --enable-update-channel=beta +ac_add_options --enable-update-channel=nightly ac_add_options --enable-optimize ac_add_options --disable-debug +# ac_add_options --enable-codesighs ac_add_options --disable-tests ac_add_options --enable-static ac_add_options --disable-shared +# ac_add_options --enable-official-branding ac_add_options --enable-svg ac_add_options --enable-canvas ac_add_options --enable-default-toolkit=cairo-windows ac_add_options --enable-update-packaging -ac_add_options --with-branding=browser/branding/unofficial diff --git a/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl b/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl index b5f986614e3..b32e2d13bbf 100644 --- a/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl +++ b/mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl @@ -151,7 +151,7 @@ $moz_cvsroot = ':ext:cltbld@cvs.mozilla.org:/cvsroot'; #$ObjDir = 'fx-trunk-cairo'; # Extra build name, if needed. -$BuildNameExtra = 'Release'; +$BuildNameExtra = 'Nightly'; # User comment, eg. ip address for dhcp builds. # ex: $UserComment = "ip = 208.12.36.108"; @@ -170,7 +170,7 @@ $BuildNameExtra = 'Release'; $BuildTree = 'Firefox'; #$BuildName = ''; -$BuildTag = 'MOZILLA_1_9a1_RELEASE'; +#$BuildTag = ''; #$BuildConfigDir = 'mozilla/config'; #$Topsrcdir = 'mozilla'; @@ -192,7 +192,7 @@ $BinaryName = 'firefox.exe'; # Release build options $ReleaseBuild = 1; $shiptalkback = 1; -$ReleaseToLatest = 0; # Push the release to latest-? +$ReleaseToLatest = 1; # Push the release to latest-? $ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-? $build_hour = "4"; $package_creation_path = "/browser/installer"; @@ -204,7 +204,7 @@ $ftp_path = "/home/ftp/pub/firefox/nightly"; $url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly"; $tbox_ftp_path = "/home/ftp/pub/firefox/tinderbox-builds"; $tbox_url_path = "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds"; -$milestone = "mozilla1.9a1"; +$milestone = "trunk"; $notify_list = 'build-announce@mozilla.org'; $stub_installer = 0; $sea_installer = 1; @@ -217,7 +217,7 @@ $update_platform = "WINNT_x86-msvc"; $update_hash = "sha1"; $update_filehost = "ftp.mozilla.org"; $update_ver_file = 'browser/config/version.txt'; -$update_pushinfo = 0; +$update_pushinfo = 1; # Reboot the OS at the end of build-and-test cycle. This is primarily # intended for Win9x, which can't last more than a few cycles before @@ -244,5 +244,5 @@ $update_pushinfo = 0; # - processes that tbox scripts cannot kill. #$ENV{NO_EM_RESTART} = '1'; -# Do not build XForms -$BuildXForms = 0; +# Build XForms +$BuildXForms = 1;