Issue 2986 - Move distribution_mode to config.py

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 standalone|store
+Usage: $name build devbuild|release
        $name sign APK_PATH
-       $name build-and-sign devbuild|release standalone|store\
+       $name build-and-sign devbuild|release\
 """).substitute({"name": os.path.basename(sys.argv[0])})
 
 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
@@ skipping 64 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
 
+  distribution_mode = config.DISTRIBUTION_MODE
+  if distribution_mode not in ("standalone", "store"):
+    print >>sys.stderr, "Invalid distribution mode, check config.py"
+    sys.exit(4)
+
   if do_build:
     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