Issue 2961 - Add distribution mode parameter

build.py

 #!/usr/bin/env python
 
 import glob
 import json
 import os
 import shutil
 import string
 import subprocess
 import sys
 import tempfile
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 ENSURE_DEPENDENCIES_PATH = os.path.join(BASE_DIR, "ensure_dependencies.py")
 MULTI_L10N_PATH = os.path.join(BASE_DIR, "mozharness", "scripts",
                                "multil10n.py")
 DIST_PATH = os.path.join(BASE_DIR, "adblockbrowser",
                          "obj-arm-linux-androideabi", "dist")
 
 def print_usage():
   print >>sys.stderr, string.Template("""\
-Usage: $name build devbuild|release
+Usage: $name build devbuild|release standalone|store
        $name sign APK_PATH
-       $name build-and-sign devbuild|release\
+       $name build-and-sign devbuild|release standalone|store\
 """).substitute({"name": os.path.basename(sys.argv[0])})
 
-def check_mozconfig(path, mode):
+def check_mozconfig(path, distribution_mode):
   if not os.path.exists(path):
     raise Exception("'%s' doesn't exist, please create it." % path)
 
   with open(path) as file:
     contents = file.read()
 
   # This check can be removed once https://issues.adblockplus.org/ticket/2490 is
   # done.
   if "--disable-crashreporter" not in contents:
     raise Exception(
       "'%s' doesn't seem to set --disable-crashreporter, please do." % path)
 
   if "export MOZILLA_OFFICIAL=1" not in contents:
     raise Exception(
       "'%s' doesn't seem to export MOZILLA_OFFICIAL=1, please do." % path)
 
   updater_disabled = "--disable-updater" in contents
-  if updater_disabled and mode == "devbuild":
+  if updater_disabled and distribution_mode == "standalone":
     raise Exception("'%s' seems to set --disable-updater, please don't." % path)
-  elif not updater_disabled and mode == "release":
+  elif not updater_disabled and distribution_mode == "store":
     raise Exception(
       "'%s' doesn't seem to set --disable-updater, please do." % path)
 
 def find_mozconfig(mode):
   mozconfig_path = os.path.join(BASE_DIR, "mozconfig-" + mode)
   check_mozconfig(mozconfig_path, mode)
   return mozconfig_path
 
-def build(mode, sdk_path, ndk_path):
+def build(build_mode, distribution_mode, sdk_path, ndk_path):
   mozharness_environment = os.environ.copy()
-  mozharness_environment["MOZCONFIG"] = find_mozconfig(mode)
+  mozharness_environment["MOZCONFIG"] = find_mozconfig(distribution_mode)
   mozharness_environment["ANDROID_SDK_PATH"] = sdk_path
   mozharness_environment["ANDROID_NDK_PATH"] = ndk_path
 
   subprocess.check_call([MULTI_L10N_PATH, "--cfg", "adblockbrowser-cfg.py"],
                         env=mozharness_environment)
 
   [manifest_path] = glob.glob(os.path.join(
     DIST_PATH, "fennec-*.multi.android-arm.json"))
   with open(manifest_path) as manifest_file:
     manifest = json.load(manifest_file)
 
   apk_path = os.path.join(DIST_PATH, "gecko-unsigned-unaligned.apk")
-  if mode == "release":
+  if build_mode == "release":
     target_apk_name = "adblockbrowser-%s-arm.apk" % manifest["moz_app_version"]
   else:
     target_apk_name = "adblockbrowser-%s.%s-arm.apk" % (
       manifest["moz_app_version"], manifest["buildid"])
   target_apk_path = os.path.join(DIST_PATH, target_apk_name)
   shutil.copyfile(apk_path, target_apk_path)
   return target_apk_path
 
 def sign(apk_path, key_store, key_name):
   temp_apk_path = tempfile.NamedTemporaryFile().name
@@ skipping 17 matching lines @@
   do_sign = mode in ("sign", "build-and-sign")
   if not do_build and not do_sign:
     print_usage()
     sys.exit(2)
 
   if do_build:
     build_mode = sys.argv[2]
     if build_mode not in ("devbuild", "release"):
       print_usage()
       sys.exit(3)
+    distribution_mode = len(sys.argv) > 3 and sys.argv[3] or ""
+    if distribution_mode not in ("standalone", "store"):
+      print_usage()
+      sys.exit(4)
 
   if do_sign:
     apk_path = sys.argv[2]
 
   subprocess.check_call([ENSURE_DEPENDENCIES_PATH])
   import config
 
   if do_build:
-    apk_path = build(build_mode, config.ANDROID_SDK_PATH,
+    apk_path = build(build_mode, distribution_mode, config.ANDROID_SDK_PATH,
                      config.ANDROID_NDK_PATH)
   if do_sign:
     sign(apk_path, config.ANDROID_KEYSTORE_PATH, config.ANDROID_KEY_NAME)
   else:
     print apk_path