wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 978211 - OSX automation configs; r=glandium

Browse Source
This commit is contained in:
Mike Shal 2014-07-03 22:05:45 -04:00
parent dd27883604
commit edaa3387d9
5 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/config/mozconfigs/macosx-universal/nightly-nonunified
View File

@ -1,3 +1,8 @@
MOZ_AUTOMATION_PRETTY=1
MOZ_AUTOMATION_UPLOAD=0
MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0
MOZ_AUTOMATION_TALOS_SENDCHANGE=0
MOZ_AUTOMATION_CHECK=0
. "$topsrcdir/browser/config/mozconfigs/macosx-universal/nightly"
ac_add_options --disable-unified-compilation

1
browser/config/mozconfigs/macosx64/debug
View File

@ -1,3 +1,4 @@
MOZ_AUTOMATION_TALOS_SENDCHANGE=0
. $topsrcdir/build/macosx/mozconfig.common
ac_add_options --enable-debug

4
browser/config/mozconfigs/macosx64/debug-nonunified
View File

@ -1,3 +1,7 @@
MOZ_AUTOMATION_UPLOAD=0
MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0
MOZ_AUTOMATION_TALOS_SENDCHANGE=0
MOZ_AUTOMATION_CHECK=0
. "$topsrcdir/browser/config/mozconfigs/macosx64/debug"
ac_add_options --disable-unified-compilation

6
build/macosx/mozconfig.common
View File

@ -2,6 +2,12 @@
# 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/.
MOZ_AUTOMATION_L10N_CHECK=0
if [ "x$IS_NIGHTLY" = "xyes" ]; then
MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
MOZ_AUTOMATION_UPDATE_PACKAGING=1
fi
. "$topsrcdir/build/mozconfig.common"
if [ -d "$topsrcdir/clang" ]; then

9
python/mozbuild/mozbuild/mach_commands.py
View File

@ -369,9 +369,16 @@ class Build(MachCommandBase):
make_extra = self.mozconfig['make_extra'] or []
make_extra = dict(m.split('=', 1) for m in make_extra)
# For universal builds, we need to run the automation steps in
# the first architecture from MOZ_BUILD_PROJECTS
projects = make_extra.get('MOZ_BUILD_PROJECTS')
if projects:
subdir = os.path.join(self.topobjdir, projects.split()[0])
else:
subdir = self.topobjdir
moz_automation = os.getenv('MOZ_AUTOMATION') or make_extra.get('export MOZ_AUTOMATION', None)
if moz_automation and status == 0:
status = self._run_make(target='automation/build',
status = self._run_make(target='automation/build', directory=subdir,
line_handler=output.on_line, log=False, print_directory=False,
ensure_exit_code=False, num_jobs=jobs, silent=not verbose)