Skip to main content

Browse the archive

Revision 8598e8717ddd8daf383d81952a6c02a29a4ecb60 authored by Jordan Lund on 25 February 2016, 21:25:37 UTC, committed by Jordan Lund on 25 February 2016, 21:25:37 UTC 
Bug 1251288 - Make sure that debug builds use default update channel, r=rail DONTBUILD
 

I tested this via running fx_desktop_build.py with and without this patch and
compared self.config:
```
./scripts/fx_desktop_build.py --cfg
configs/builds/releng_base_linux_64_builds.py --custom-build-variant-cfg debug
--branch date --build-pool production --developer-run --dump-config
```
diff -pU 10 logs/localconfig_without_patch.json logs/localconfig_with_patch.json

here is the diff of the above:
http://people.mozilla.org/~jlund/update-channel-self-config.diff

MozReview-Commit-ID: J82rgamohTk

--HG--
extra : source : 9bcdab8d416f0ae3db1bef533f778d08d797f5dd
extra : intermediate-source : fd9990a554a2120bb0f9fe59f575562a808323c4
1 parent c8c77b1
Raw File
.ycm_extra_conf.py 
# 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/.

import imp
import os
from StringIO import StringIO
import shlex
import sys

old_bytecode = sys.dont_write_bytecode
sys.dont_write_bytecode = True

path = os.path.join(os.path.dirname(__file__), 'mach')

if not os.path.exists(path):
    path = os.path.join(os.path.dirname(__file__), 'config.status')
    config = imp.load_module('_buildconfig', open(path), path, ('', 'r', imp.PY_SOURCE))
    path = os.path.join(config.topsrcdir, 'mach')
mach_module = imp.load_module('_mach', open(path), path, ('', 'r', imp.PY_SOURCE))

sys.dont_write_bytecode = old_bytecode

def FlagsForFile(filename):
    mach = mach_module.get_mach()
    out = StringIO()
    out.encoding = None
    mach.run(['compileflags', filename], stdout=out, stderr=out)

    flag_list = shlex.split(out.getvalue())

    # This flag is added by Fennec for android build and causes ycmd to fail to parse the file.
    # Removing this flag is a workaround until ycmd starts to handle this flag properly.
    # https://github.com/Valloric/YouCompleteMe/issues/1490
    final_flags = [x for x in flag_list if not x.startswith('-march=armv')]

    return {
        'flags': final_flags,
        'do_cache': True
    }
back to top