try: tc draft
authorTom Prince <mozilla@hocat.ca>
Tue, 17 Oct 2017 13:25:25 -0600
changeset 55496 ab2482ce0407fc57ee4efb016445c22a9adfe614
parent 55492 af90edbec45cba297bde1af4c2840b1e9798a43d
push id5081
push usermozilla@hocat.ca
push dateTue, 17 Oct 2017 19:25:30 +0000
treeherdertry-comm-central@ab2482ce0407 [default view] [failures only]
try: tc
mail/base/content/mailWindowOverlay.xul
mail/config/mozconfigs/linux64/nightly
mail/locales/l10n.ini
mail/moz.configure
taskcluster/ci/build/linux.yml
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -3120,17 +3120,17 @@
         <menuitem id="menu_mac_show_all" label="&showAllAppsCmdMac.label;"/>
 #endif
 #endif
        </menupopup>
       </menu>
 
 #ifdef XP_MACOSX
 <!-- Mac window menu -->
-#include ../../../mozilla/toolkit/content/macWindowMenu.inc
+#include ../../../toolkit/content/macWindowMenu.inc
 #endif
 
       <!-- Help -->
       <menu id="helpMenu"/>
 
       <spacer id="menubar_spacer" flex="100%"/>
       </menubar>
     </toolbaritem>
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -1,16 +1,16 @@
 . $topsrcdir/build/unix/mozconfig.linux
-. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/comm/build/mozconfig.stylo"
 
 # Disable webrender on Linux buildbot builders to avoid the Rust requirement
 # of libX11 version > 1.4.99.1 (see bug 1350011).
 ac_add_options --disable-webrender
 
-ac_add_options --enable-application=mail
+ac_add_options --enable-application=comm/mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
 ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
 ac_add_options --enable-calendar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
@@ -23,13 +23,9 @@ ac_add_options "MOZ_ALLOW_LEGACY_EXTENSI
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
 . "$topsrcdir/build/mozconfig.cache"
--- a/mail/locales/l10n.ini
+++ b/mail/locales/l10n.ini
@@ -1,16 +1,16 @@
 [general]
-depth = ../..
-all = mail/locales/all-locales
+depth = ../../..
+all = comm/mail/locales/all-locales
 
 [compare]
 dirs = mail
     chat
     other-licenses/branding/thunderbird
     editor/ui
 
 [includes]
 # include toolkit from mozilla.
 # Don't specify which, use l10n-central.ini and friends if you're
 # not working on a local check-out
-toolkit = mozilla/toolkit/locales/l10n.ini
-devtools_client = mozilla/devtools/client/locales/l10n.ini
+toolkit = /toolkit/locales/l10n.ini
+devtools_client = /devtools/client/locales/l10n.ini
--- a/mail/moz.configure
+++ b/mail/moz.configure
@@ -1,9 +1,20 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 imply_option('MOZ_PLACES', True)
 
-include('../mozilla/toolkit/moz.configure')
+@depends(application)
+def is_comm(app):
+    return app[0].startswith('comm/')
+
+@depends(is_comm)
+def toolkit_configure(is_comm):
+    if is_comm:
+        return '../../toolkit/moz.configure'
+    else:
+        return '../mozilla/toolkit/moz.configure'
+
+include(toolkit_configure)
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -8,16 +8,17 @@ linux64/opt:
         symbol: tc(B)
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         docker-image:
           indexed: "docker.images.v2.level-3.desktop-build.latest"
         max-run-time: 36000
         env:
             TOOLTOOL_MANIFEST: "comm/mail/config/tooltool-manifests/linux64/releng.manifest"
+            TRY_COMMIT_MSG: ""
         volumes: # FIXME: Pick this up from in-tree based on index path?
         - /builds/worker/checkouts
         - /builds/worker/tooltool-cache
         - /builds/worker/workspace
     run:
         using: mozharness
         comm-checkout: true
         actions: [build check-test update]