Issue 2751 - Separate build and sign steps

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, "Usage: %s devbuild|release" % \
-    os.path.basename(sys.argv[0])
+  print >>sys.stderr, string.Template("""\
+Usage: $name build devbuild|release
+       $name sign APK_PATH
+       $name build-and-sign devbuild|release\
+""").substitute({"name": os.path.basename(sys.argv[0])})
 
 def check_mozconfig(path, 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.
@@ skipping 47 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) < 2:
+  if len(sys.argv) < 3:
     print_usage()
     sys.exit(1)
 
   mode = sys.argv[1]
-  if mode not in ("devbuild", "release"):
+  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"):
+      print_usage()
+      sys.exit(3)
+
+  if do_sign:
+    apk_path = sys.argv[2]
+
   subprocess.check_call([ENSURE_DEPENDENCIES_PATH])
   import config
-  apk_path = build(mode, config.ANDROID_SDK_PATH, config.ANDROID_NDK_PATH)
-  sign(apk_path, config.ANDROID_KEYSTORE_PATH, config.ANDROID_KEY_NAME)
+
+  if do_build:
+    apk_path = build(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:

[René Jeschke, 2015/08/13 08:01:52]

Nit: this (and the next line) could be removed, as it is dead code

+    print apk_path