Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1197293 - allow for TC builds that don't use 'make upload'; r=ted

Browse Source
This commit is contained in:
Mike Shal 2015-08-21 14:23:19 -04:00
parent 0cee44c98f
commit 575b998797
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/gen_mach_buildprops.py
View File

@ -56,14 +56,15 @@ if __name__ == '__main__':
parser.add_argument("--partial-mar-file", required=False, parser.add_argument("--partial-mar-file", required=False,
action="store", dest="partial_mar_file", action="store", dest="partial_mar_file",
help="Path to the partial MAR file, relative to the objdir.") help="Path to the partial MAR file, relative to the objdir.")
parser.add_argument("--upload-properties", required=True, parser.add_argument("--upload-properties", required=False,
action="store", dest="upload_properties", action="store", dest="upload_properties",
help="Path to the properties written by 'make upload'") help="Path to the properties written by 'make upload'")
args = parser.parse_args() args = parser.parse_args()
json_data = getMarProperties(args.complete_mar_file) json_data = getMarProperties(args.complete_mar_file)
with open(args.upload_properties) as f: if args.upload_properties:
json_data.update(json.load(f)) with open(args.upload_properties) as f:
json_data.update(json.load(f))
if args.partial_mar_file: if args.partial_mar_file:
json_data.update(getMarProperties(args.partial_mar_file, partial=True)) json_data.update(getMarProperties(args.partial_mar_file, partial=True))

6
build/moz-automation.mk
View File

@ -17,8 +17,10 @@ include $(topsrcdir)/toolkit/mozapps/installer/upload-files.mk
# Clear out DIST_FILES if it was set by upload-files.mk (for Android builds) # Clear out DIST_FILES if it was set by upload-files.mk (for Android builds)
DIST_FILES = DIST_FILES =
ifeq (1,$(MOZ_AUTOMATION_UPLOAD))
# Properties from 'make upload' that are file URLs. # Properties from 'make upload' that are file URLs.
AUTOMATION_UPLOAD_PROPERTIES = $(DIST)/upload-properties.json AUTOMATION_UPLOAD_PROPERTIES = --upload-properties $(DIST)/upload-properties.json
endif
# Helper variables to convert from MOZ_AUTOMATION_* variables to the # Helper variables to convert from MOZ_AUTOMATION_* variables to the
# corresponding the make target # corresponding the make target
@ -98,7 +100,7 @@ automation/l10n-check: automation/pretty-l10n-check
automation/update-packaging: automation/pretty-update-packaging automation/update-packaging: automation/pretty-update-packaging
automation/build: $(addprefix automation/,$(MOZ_AUTOMATION_TIERS)) automation/build: $(addprefix automation/,$(MOZ_AUTOMATION_TIERS))
$(PYTHON) $(topsrcdir)/build/gen_mach_buildprops.py --complete-mar-file $(DIST)/$(COMPLETE_MAR) $(addprefix --partial-mar-file ,$(wildcard $(DIST)/$(PARTIAL_MAR))) --upload-properties $(AUTOMATION_UPLOAD_PROPERTIES) $(PYTHON) $(topsrcdir)/build/gen_mach_buildprops.py --complete-mar-file $(DIST)/$(COMPLETE_MAR) $(addprefix --partial-mar-file ,$(wildcard $(DIST)/$(PARTIAL_MAR))) $(AUTOMATION_UPLOAD_PROPERTIES)
# Note: We have to force -j1 here, at least until bug 1036563 is fixed. # Note: We have to force -j1 here, at least until bug 1036563 is fixed.
AUTOMATION_EXTRA_CMDLINE-l10n-check = -j1 AUTOMATION_EXTRA_CMDLINE-l10n-check = -j1

4
testing/mozharness/mozharness/mozilla/building/buildbase.py
View File

@ -1280,8 +1280,8 @@ or run without that action (ie: --no-{action})"
if os.path.exists(mach_properties_path): if os.path.exists(mach_properties_path):
with self.opened(mach_properties_path, error_level=error_level) as (fh, err): with self.opened(mach_properties_path, error_level=error_level) as (fh, err):
build_props = json.load(fh) build_props = json.load(fh)
if not build_props or err: if err:
self.log("%s exists but there was an error finding any " self.log("%s exists but there was an error reading the "
"properties. props: `%s` - error: " "properties. props: `%s` - error: "
"`%s`" % (mach_properties_path, "`%s`" % (mach_properties_path,
build_props or 'None', build_props or 'None',