Bug 1455127 - Remove --properties-file from upload.py; r=ted
☠☠ backed out by 46ea55337b33 ☠ ☠
authorGregory Szorc <gps@mozilla.com>
Wed, 18 Apr 2018 15:03:46 -0700
changeset 467931 8527e727b92d660afa7c529069ebf26a4127a046
parent 467930 8c8fe0facf52133b4df95ba97641b2875f364dbe
child 467932 ac17015816ca21649f102f50038a20a81b03babe
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1455127
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1455127 - Remove --properties-file from upload.py; r=ted This was only used for the remote server case. That code was recently deleted. MozReview-Commit-ID: 7usqWZ7CuBR
build/upload.py
toolkit/mozapps/installer/packager.mk
--- a/build/upload.py
+++ b/build/upload.py
@@ -83,29 +83,23 @@ if __name__ == '__main__':
         if path is not None:
             path = FixupMsysPath(path)
 
     parser = OptionParser(usage="usage: %prog [options] <files>")
     parser.add_option("-b", "--base-path",
                       action="store",
                       help="Preserve file paths relative to this path when uploading. "
                       "If unset, all files will be uploaded directly to UPLOAD_PATH.")
-    parser.add_option("--properties-file",
-                      action = "store",
-                      help="Path to the properties file to store the upload properties.")
     parser.add_option("--package",
                       action="store",
                       help="Name of the main package.")
     (options, args) = parser.parse_args()
     if len(args) < 1:
         print("You must specify at least one file to upload")
         sys.exit(1)
-    if not options.properties_file:
-        print("You must specify a --properties-file")
-        sys.exit(1)
 
     try:
         CopyFilesLocally(path, args, base_path=options.base_path,
                          package=options.package,
                          verbose=True)
     except IOError as strerror:
         print(strerror)
         sys.exit(1)
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -147,17 +147,16 @@ checksum:
 	@cat $(CHECKSUM_FILE)
 	@echo 'CHECKSUM FILE END'
 	$(SIGN_CHECKSUM_CMD)
 
 
 upload: checksum
 	$(PYTHON) -u $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) \
 		--package '$(PACKAGE)' \
-		--properties-file $(DIST)/mach_build_properties.json \
 		$(UPLOAD_FILES) \
 		$(CHECKSUM_FILES)
 
 # source-package creates a source tarball from the files in MOZ_PKG_SRCDIR,
 # which is either set to a clean checkout or defaults to $topsrcdir
 source-package:
 	@echo 'Generate the sourcestamp file'
 	# Make sure to have repository information available and then generate the