Improved on option parsing help + added it to configure.py as well.

config/parse_options.py

@@ -0,0 +1,50 @@
+#! /usr/bin/env python2.6
+# -*- mode: python; coding: utf-8; -*-
+#
+from optparse import OptionParser
+import os, sys
+
+PROJRELROOT = '../'
+
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), PROJRELROOT)))
+
+from scripts.cml.generate_container_cml import *
+
+# Parse options + autogenerate cml rule file if necessary.
+def build_parse_options():
+    autogen_true = 0
+    usage = "usage: %prog [options] arg"
+    parser = OptionParser(usage)
+
+    parser.add_option("-a", "--arch", type = "string", dest = "arch",
+                      help = "Use configuration file for architecture")
+    parser.add_option("-c", "--num-containers", type = "int", dest = "ncont",
+                      help = "Maximum number of containers that will be "
+                             "made available in configuration")
+    parser.add_option("-f", "--use-file", dest = "cml_file",
+                      help = "Supply user-defined cml file "
+                             "(Use only if you want to override default)")
+    parser.add_option("-r", "--reset-old-config", action = "store_true",
+                      default = False, dest = "reset_old_config",
+                      help = "Reset configuration file settings "
+                             "(If you had configured before and changing the "
+                             "rule file, this will reset existing values to default)")
+
+    (options, args) = parser.parse_args()
+
+    autogen_true = len(sys.argv) > 1 or not os.path.exists(CML2_CML_FILE)
+
+    if autogen_true and not options.arch:
+        print "No arch supplied (-a), using `arm' as default."
+        options.arch = "arm"
+    if autogen_true and not options.ncont:
+        options.ncont = 4
+        print "Max container count not supplied (-c), using %d as default." % options.ncont
+
+    # Regenerate cml file if options are supplied or the file doesn't exist.
+    if autogen_true:
+        generate_container_cml(options.arch, options.ncont)
+        if options.reset_old_config == 1 and os.path.exists(CML2_OLDCONFIG_FILE):
+            print "Deleting %s" % CML2_OLDCONFIG_FILE
+            os.remove(CML2_OLDCONFIG_FILE)
+