Issue 4679 - Refactoring of build.py in adblockbrowser-build

build.py

 #!/usr/bin/env python
 
 import glob
 import json
 import os
 import re
 import shutil
 import string
 import subprocess
 import sys
@@ skipping 25 matching lines @@
 _BUILD_RELEASE = "release"
 _BUILD_MODES = (_BUILD_DEVBUILD, _BUILD_RELEASE)
 _OBJDIR_ARM = "obj-arm-linux-androideabi"
 _OBJDIR_X86 = "obj-i386-linux-android"
 
 
 def print_usage():
     print >>sys.stderr, string.Template("""\
 Usage: $name %s
        $name %s APK_PATH
-       $name %s APK_PATH\

[anton, 2016/12/01 06:50:15]

shouldn't it be `$name %s` here (APK_PATH is not required) ?

[diegocarloslima, 2016/12/01 10:36:18]

Actually the APK_PATH was missing in the error message here. For signing
commands, the APK_PATH is required

[Felix Dahlke, 2016/12/12 08:03:19]

No, APK_PATH is not required for build-and-sign: First a new APK is built, then
it is signed. Only the sign command needs to be provided with the APK path.

[diegocarloslima, 2016/12/12 09:42:43]

Yeah, my bad, it isn't required. Actually, it already knows where the apk is to
sign it since it's generated by the build step.

+       $name %s\
 """ % (_CMD_BUILD, _CMD_SIGN,
        _CMD_BUILD_SIGN)).substitute({"name": os.path.basename(sys.argv[0])})
 
 
 def _generate_mozconfig(architecture, distribution_mode, build_mode):
     mozconfig_path = _GENERATED_MOZCONFIG_PATH
     with open(mozconfig_path, "w+") as mozconfig:
         mozconfig.write(". \"%s\"\n" % _MOZCONFIG_COMMON_PATH)
         if architecture == _ARCH_X86:
             mozconfig.write(". \"%s\"\n" % _MOZCONFIG_X86_PATH)
@@ skipping 97 matching lines @@
             "build mode", "build modes", _BUILD_MODES)
         sys.exit(6)
 
     if do_build:
         apk_path = _build(architecture, 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