From d0245394a3d3f744cd7baa8862bac14b243656c2 Mon Sep 17 00:00:00 2001 From: Jon Atkins Date: Fri, 22 Mar 2013 03:55:00 +0000 Subject: [PATCH] build.py - read optional defaultBuild from localbuildsettings.py fix for #20 also, some other minor tweaks/cleanups in that area of the code --- build.py | 20 +++++++++++++++----- buildsettings.py | 5 +++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/build.py b/build.py index ed403b50..07a126bd 100755 --- a/build.py +++ b/build.py @@ -19,14 +19,24 @@ try: except ImportError: pass +# load default build +try: + from localbuildsettings import defaultBuild +except ImportError: + defaultBuild = None + + +buildName = defaultBuild # build name from command line -if len(sys.argv) != 2: # argv[0] = program, argv[1] = buildname, len=2 - print ("Usage: build.py buildname") - print (" available build names:", ','.join(buildSettings.keys())) - sys.exit(1) +if len(sys.argv) == 2: # argv[0] = program, argv[1] = buildname, len=2 + buildName = sys.argv[1] -buildName = sys.argv[1] + +if buildName is None or not buildName in buildSettings: + print ("Usage: build.py buildname") + print (" available build names: %s" % ', '.join(buildSettings.keys())) + sys.exit(1) settings = buildSettings[buildName] diff --git a/buildsettings.py b/buildsettings.py index 2edefe9f..0288ea2c 100644 --- a/buildsettings.py +++ b/buildsettings.py @@ -28,3 +28,8 @@ buildSettings = { } + + +# defaultBuild - the name of the default build to use if none is specified on the build.py command line +# (in here as an example - it only works in localbuildsettings.py) +#defaultBuild = 'local'