From f20c2f0d6b42f652f39c0082237c3f8d69752ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuli=20Sepp=C3=A4nen?= Date: Thu, 18 Nov 2010 18:00:54 +0200 Subject: Added command-line option parser and an unsigned build option to build_all.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modified win/build_all.py so that it parses command-line options using getopt. Added option "-u / --unsigned" which allows forcing unsigned builds and a "-h / --help" option. By default a signed build is generated, provided that the Python SignTool module is installed. If not, the build is interrupted. Signed-off-by: Samuli Seppänen Acked-by: Peter Stuge Signed-off-by: David Sommerseth --- win/build_all.py | 71 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 56 insertions(+), 15 deletions(-) (limited to 'win') diff --git a/win/build_all.py b/win/build_all.py index 92d2bf4..dec3a78 100644 --- a/win/build_all.py +++ b/win/build_all.py @@ -1,18 +1,59 @@ -from config_all import main as config_all -from build import main as build_openvpn -from build_ddk import main as build_ddk -from sign import main as sign -from make_dist import main as make_dist - -def main(config): - config_all(config) - build_openvpn() - build_ddk(config, 'tap', 'all') - build_ddk(config, 'tapinstall', 'all') - sign(config, 'all') - make_dist(config) - -# if we are run directly, and not loaded as a module +import getopt, sys +from config_all import main as config_all +from build import main as build_openvpn +from build_ddk import main as build_ddk +from make_dist import main as make_dist + +def Usage(): + '''Show usage information''' + print "Usage: build_all.py [OPTIONS]..." + print "Build OpenVPN using Visual Studio tools" + print + print " -h, --help Show this help" + print " -u, --unsigned Do not sign the TAP drivers" + sys.exit(1) + +def main(config): + + # Do a signed build by default + signedBuild=True + + # Parse the command line argument(s) + try: + opts, args = getopt.getopt(sys.argv[1:], "hu", ["help", "unsigned"]) + except getopt.GetoptError: + Usage() + + for o, a in opts: + if o in ("-h","--help"): + Usage() + if o in ("-u", "--unsigned"): + signedBuild=False + + + # Check if the SignTool module is present. This avoids ImportErrors popping + # up annoyingly _after_ the build. + if signedBuild: + try: + from signtool import SignTool + except (ImportError): + print "ERROR: SignTool python module not found! Can't do a signed build." + sys.exit(1) + else: + print "Doing an unsigned build as requested" + + # Start the build + config_all(config) + build_openvpn() + build_ddk(config, 'tap', 'all') + build_ddk(config, 'tapinstall', 'all') + + if signedBuild: + sign(config, 'all') + + make_dist(config) + +# if we are run directly, and not loaded as a module if __name__ == "__main__": from wb import config main(config) -- cgit v1.2.3