Changes in tools/config.py [28f4adb:fe12f9f4] in mainline

File:

• tools/config.py (modified) (17 diffs)

tools/config.py

@@ -28 +28 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-
 """
 HelenOS configuration system
 """
-
 import sys
 import os
@@ -43 +41 @@
 MAKEFILE = 'Makefile.config'
 MACROS = 'config.h'
+DEFS = 'config.defs'
 PRECONF = 'defaults'
 
@@ -48 +47 @@
         "Read saved values from last configuration run"
         
-        inf = open(fname, 'r')
+        inf = file(fname, 'r')
         
         for line in inf:
@@ -103 +102 @@
                 condval = res.group(3)
                 
-                if (not condname in defaults):
+                if (not defaults.has_key(condname)):
                         varval = ''
                 else:
@@ -131 +130 @@
         "Parse configuration file"
         
-        inf = open(fname, 'r')
+        inf = file(fname, 'r')
         
         name = ''
@@ -219 +218 @@
                         continue
                 
-                if (not varname in defaults):
+                if (not defaults.has_key(varname)):
                         return False
         
         return True
 
-def create_output(mkname, mcname, defaults, ask_names):
+def create_output(mkname, mcname, dfname, defaults, ask_names):
         "Create output configuration"
         
@@ -230 +229 @@
         
         sys.stderr.write("Fetching current revision identifier ... ")
-        
-        try:
-                version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].decode().split(':')
-                sys.stderr.write("ok\n")
-        except:
-                version = [1, "unknown", "unknown"]
-                sys.stderr.write("failed\n")
+        version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].split(':')
+        sys.stderr.write("OK\n")
         
         if (len(version) == 3):
@@ -246 +240 @@
                 revision = None
         
-        outmk = open(mkname, 'w')
-        outmc = open(mcname, 'w')
+        outmk = file(mkname, 'w')
+        outmc = file(mcname, 'w')
+        outdf = file(dfname, 'w')
         
         outmk.write('#########################################\n')
@@ -257 +252 @@
         outmc.write(' ***************************************/\n\n')
         
-        defs = 'CONFIG_DEFS ='
+        outdf.write('#########################################\n')
+        outdf.write('## AUTO-GENERATED FILE, DO NOT EDIT!!! ##\n')
+        outdf.write('#########################################\n\n')
+        outdf.write('CONFIG_DEFS =')
         
         for varname, vartype, name, choices, cond in ask_names:
@@ -263 +261 @@
                         continue
                 
-                if (not varname in defaults):
+                if (not defaults.has_key(varname)):
                         default = ''
                 else:
@@ -275 +273 @@
                         if (default == "y"):
                                 outmc.write('/* %s */\n#define %s\n\n' % (name, varname))
-                                defs += ' -D%s' % varname
+                                outdf.write(' -D%s' % varname)
                 else:
                         outmc.write('/* %s */\n#define %s %s\n#define %s_%s\n\n' % (name, varname, default, varname, default))
-                        defs += ' -D%s=%s -D%s_%s' % (varname, default, varname, default)
+                        outdf.write(' -D%s=%s -D%s_%s' % (varname, default, varname, default))
         
         if (revision is not None):
                 outmk.write('REVISION = %s\n' % revision)
                 outmc.write('#define REVISION %s\n' % revision)
-                defs += ' "-DREVISION=%s"' % revision
+                outdf.write(' "-DREVISION=%s"' % revision)
         
         outmk.write('TIMESTAMP = %s\n' % timestamp)
         outmc.write('#define TIMESTAMP %s\n' % timestamp)
-        defs += ' "-DTIMESTAMP=%s"\n' % timestamp
-        
-        outmk.write(defs)
+        outdf.write(' "-DTIMESTAMP=%s"\n' % timestamp)
         
         outmk.close()
         outmc.close()
+        outdf.close()
 
 def sorted_dir(root):
@@ -351 +348 @@
         if ((len(sys.argv) >= 3) and (sys.argv[2] == 'default')):
                 if (check_choices(defaults, ask_names)):
-                        create_output(MAKEFILE, MACROS, defaults, ask_names)
+                        create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
                         return 0
         
@@ -368 +365 @@
                         # Cancel out all defaults which have to be deduced
                         for varname, vartype, name, choices, cond in ask_names:
-                                if ((vartype == 'y') and (varname in defaults) and (defaults[varname] == '*')):
+                                if ((vartype == 'y') and (defaults.has_key(varname)) and (defaults[varname] == '*')):
                                         defaults[varname] = None
                         
@@ -385 +382 @@
                                         position = cnt
                                 
-                                if (not varname in defaults):
+                                if (not defaults.has_key(varname)):
                                         default = None
                                 else:
@@ -428 +425 @@
                                 cnt += 1
                         
-                        if (position != None) and (position >= len(options)):
+                        if (position >= options):
                                 position = None
                         
@@ -449 +446 @@
                         
                         position = None
-                        if (not value in opt2row):
+                        if (not opt2row.has_key(value)):
                                 raise RuntimeError("Error selecting value: %s" % value)
                         
                         (selname, seltype, name, choices) = opt2row[value]
                         
-                        if (not selname in defaults):
+                        if (not defaults.has_key(selname)):
                                         default = None
                         else:
@@ -469 +466 @@
                 xtui.screen_done(screen)
         
-        create_output(MAKEFILE, MACROS, defaults, ask_names)
+        create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
         return 0