Issue 2995 - Set ABB_RELEASE_BUILD properly

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
        $name sign APK_PATH
-       $name build-and-sign devbuild|release\
+       $name build-and-sign\
 """).substitute({"name": os.path.basename(sys.argv[0])})
 
-def check_mozconfig(path, distribution_mode):
+def check_mozconfig(path, distribution_mode, build_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 distribution_mode == "standalone":
     raise Exception("'%s' seems to set --disable-updater, please don't." % path)
   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)
+  release_build = "export ABB_RELEASE_BUILD=1" in contents
+  if release_build and build_mode != "release":
+    raise Exception("'%s' shouldn't export ABB_RELEASE_BUILD=1." % path)
+  elif not release_build and build_mode == "release":
+    raise Exception("'%s' should export ABB_RELEASE_BUILD=1." % path)
+
+def find_mozconfig(distribution_mode, build_mode):
+  mozconfig_path = os.path.join(BASE_DIR, "mozconfig-" + distribution_mode +
+                                "-" + build_mode)
+  check_mozconfig(mozconfig_path, distribution_mode, build_mode)
   return mozconfig_path
 
-def build(build_mode, distribution_mode, sdk_path, ndk_path):
+def build(distribution_mode, build_mode, sdk_path, ndk_path):
   mozharness_environment = os.environ.copy()
-  mozharness_environment["MOZCONFIG"] = find_mozconfig(distribution_mode)
+  mozharness_environment["MOZCONFIG"] = find_mozconfig(distribution_mode,
+                                                       build_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)
@@ skipping 14 matching lines @@
   try:
     subprocess.check_call(["jarsigner", "-verbose", "-sigalg", "SHA1withRSA",
                            "-digestalg", "SHA1", "-keystore", key_store,
                            temp_apk_path, key_name])
     os.remove(apk_path)
     subprocess.check_call(["zipalign", "-v", "4", temp_apk_path, apk_path])
   finally:
     os.remove(temp_apk_path)
 
 if __name__ == "__main__":
-  if len(sys.argv) < 3:
+  if len(sys.argv) < 2:
     print_usage()
     sys.exit(1)
 
   mode = sys.argv[1]
   do_build = mode in ("build", "build-and-sign")
   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"):
+  if do_sign:
+    if len(sys.argv) < 3:
       print_usage()
       sys.exit(3)
-
-  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)
 
+  build_mode = config.BUILD_MODE
+  if build_mode not in ("devbuild", "release"):
+    print >>sys.stderr, "Invalid build mode, check config.py"
+    sys.exit(5)
+
   if do_build:
-    apk_path = build(build_mode, distribution_mode, config.ANDROID_SDK_PATH,
+    apk_path = build(distribution_mode, build_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