WebSVN – HelenOS – Diff – /branches/dynload/tools/config.py

 #!/usr/bin/env python
+#
 # Copyright (c) 2006 Ondrej Palkovsky
+# Copyright (c) 2009 Martin Decky
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
 """
-HelenOS configuration script
+HelenOS configuration system
 """
 import sys
 import os
 import re
 import commands
+import xtui
 INPUT = sys.argv[1]
 OUTPUT = 'Makefile.config'
-TMPOUTPUT = 'Makefile.config.tmp'
 def main():
     defaults = {}
-    try:
-        dlg = Dialog()
+    ask_names = []
-    except NotImplementedError:
-        dlg = NoDialog()
-    if len(sys.argv) >= 3 and sys.argv[2]=='default':
-        defmode = True
+    # Parse configuration file
-    else:
-        defmode = False
+    parse_config(INPUT, ask_names)
-    # Default run will update the configuration file
-    # with newest options
+    # Read defaults from previous run
     if os.path.exists(OUTPUT):
         read_defaults(OUTPUT, defaults)
-    # Get ARCH from command line if specified
+    # Default mode: only check defaults and regenerate configuration
-    if len(sys.argv) >= 4:
+    if ((len(sys.argv) >= 3) and (sys.argv[2] == 'default')):
-        defaults['ARCH'] = sys.argv[3]
+        if (check_choices(defaults, ask_names)):
-        defaults['PLATFORM'] = sys.argv[3]
+            create_output(OUTPUT, defaults, ask_names)
+            return 0
-    # Get COMPILER from command line if specified
+    screen = xtui.screen_init()
+    try:
-    if len(sys.argv) >= 5:
+        selname = None
-        defaults['COMPILER'] = sys.argv[4]
+        while True:
-    # Get CONFIG_DEBUG from command line if specified
+            options = []
-    if len(sys.argv) >= 6:
+            opt2row = {}
+            position = None
+            cnt = 0
-        defaults['CONFIG_DEBUG'] = sys.argv[5]
+            for varname, vartype, name, choices, cond in ask_names:
-    # Get MACHINE/IMAGE from command line if specified
+                if ((cond) and (not check_condition(cond, defaults, ask_names))):
+                    continue
-    if len(sys.argv) >= 7:
+                if (varname == selname):
+                    position = cnt
-        defaults['MACHINE'] = sys.argv[6]
+                if (not defaults.has_key(varname)):
+                    default = None
+                else:
-        defaults['IMAGE'] = sys.argv[6]
+                    default = defaults[varname]
-    # Dry run only with defaults
+                if (vartype == 'choice'):
-    varnames = parse_config(INPUT, TMPOUTPUT, DefaultDialog(dlg), defaults)
+                    # Check if the default is an acceptable value
-    # If not in default mode, present selection of all possibilities
+                    if ((default) and (not default in [choice[0] for choice in choices])):
-    if not defmode:
+                        default = None
+                        defaults.pop(varname)
-        defopt = 0
+                    # If there is just one option, use it
-        while 1:
+                    if (len(choices) == 1):
+                        default = choices[0][0]
+                        defaults[varname] = default
-            # varnames contains variable names that were in the
+                    options.append("     %s [%s] --> " % (name, default))
+                elif (vartype == 'y/n'):
-            # last question set
+                    if (default == None):
+                        default = 'y'
-            choices = [ (x[1],defaults[x[0]]) for x in varnames ]
+                        defaults[varname] = default
-            res = dlg.menu('Configuration',choices,('save','Save'),defopt)
+                    options.append(" <%s> %s " % (yes_no(default), name))
-            if res == 'save':
+                elif (vartype == 'n/y'):
+                    if (default == None):
+                        default = 'n'
+                        defaults[varname] = default
-                parse_config(INPUT, TMPOUTPUT, DefaultDialog(dlg), defaults)
+                    options.append(" <%s> %s " % (yes_no(default), name))
-                break
+                else:
-            # transfer description back to varname
+                    raise RuntimeError("Unknown variable type: %s" % vartype)
-            for i,(vname,descr) in enumerate(varnames):
+                opt2row[cnt] = (varname, vartype, name, choices)
+                cnt += 1
+            (button, value) = xtui.choice_window(screen, 'HelenOS configuration', 'Choose configuration option', options, position)
-                if res == descr:
+            if (button == 'cancel'):
-                    defopt = i
+                return 'Configuration canceled'
-                    break
+            if (not opt2row.has_key(value)):
-            # Ask the user a simple question, produce output
+                raise RuntimeError("Error selecting value: %s" % value)
-            # as if the user answered all the other questions
+            (selname, seltype, name, choices) = opt2row[value]
+            if (not defaults.has_key(selname)):
+                    default = None
+            else:
-            # with default answer
+                default = defaults[selname]
-            varnames = parse_config(INPUT, TMPOUTPUT, dlg, defaults,
+            if (button == 'done'):
-                                    askonly=varnames[i][0])
+                if (check_choices(defaults, ask_names)):
+                    break
+                else:
+                    xtui.error_dialog(screen, 'Error', 'Some options have still undefined values.')
+                    continue
-    if os.path.exists(OUTPUT):
+            if (seltype == 'choice'):
+                defaults[selname] = subchoice(screen, name, choices, default)
+            elif ((seltype == 'y/n') or (seltype == 'n/y')):
-        os.unlink(OUTPUT)
+                if (defaults[selname] == 'y'):
-    os.rename(TMPOUTPUT, OUTPUT)
+                    defaults[selname] = 'n'
+                else:
-    if not defmode and dlg.yesno('Rebuild everything?') == 'y':
+                    defaults[selname] = 'y'
+    finally:
+        xtui.screen_done(screen)
-        os.execlp('make','make','clean','build')
+    create_output(OUTPUT, defaults, ask_names)
+    return 0
 if __name__ == '__main__':
-    main()
+    exit(main())

Subversion Repositories HelenOS

(root)/branches/dynload/tools/config.py – Rev 3107 → 4340