Changeset 84266669 in mainline

Timestamp:

2009-02-12T20:10:22Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fcd7053

Parents:

6da1013f

Message:

generate header file and preprocessor switches
introduce new option "y" for pure conditional assignments

File:

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

tools/config.py

@@ -38 +38 @@
 
 INPUT = sys.argv[1]
-OUTPUT = 'Makefile.config'
+MAKEFILE = 'Makefile.config'
+MACROS = 'config.h'
+DEFS = 'config.defs'
 
 def read_defaults(fname, defaults):
         "Read saved values from last configuration run"
         
-        inf = file(fname,'r')
+        inf = file(fname, 'r')
         
         for line in inf:
@@ -217 +219 @@
         return True
 
-def create_output(fname, defaults, ask_names):
+def create_output(mkname, mcname, dfname, defaults, ask_names):
         "Create output configuration"
         
-        outf = file(fname, 'w')
-        
-        outf.write('#########################################\n')
-        outf.write('## AUTO-GENERATED FILE, DO NOT EDIT!!! ##\n')
-        outf.write('#########################################\n\n')
+        revision = commands.getoutput('svnversion . 2> /dev/null')
+        timestamp = commands.getoutput('date "+%Y-%m-%d %H:%M:%S"')
+        
+        outmk = file(mkname, 'w')
+        outmc = file(mcname, 'w')
+        outdf = file(dfname, 'w')
+        
+        outmk.write('#########################################\n')
+        outmk.write('## AUTO-GENERATED FILE, DO NOT EDIT!!! ##\n')
+        outmk.write('#########################################\n\n')
+        
+        outmc.write('/***************************************\n')
+        outmc.write(' * AUTO-GENERATED FILE, DO NOT EDIT!!! *\n')
+        outmc.write(' ***************************************/\n\n')
+        
+        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:
@@ -235 +251 @@
                         default = defaults[varname]
                 
-                outf.write('# %s\n%s = %s\n\n' % (name, varname, default))
-        
-        outf.write('REVISION = %s\n' % commands.getoutput('svnversion . 2> /dev/null'))
-        outf.write('TIMESTAMP = %s\n' % commands.getoutput('date "+%Y-%m-%d %H:%M:%S"'))
-        outf.close()
+                outmk.write('# %s\n%s = %s\n\n' % (name, varname, default))
+                
+                if ((vartype == "y") or (vartype == "y/n") or (vartype == "n/y")):
+                        if (default == "y"):
+                                outmc.write('/* %s */\n#define %s\n\n' % (name, varname))
+                                outdf.write(' -D%s' % varname)
+                else:
+                        outmc.write('/* %s */\n#define %s %s\n\n' % (name, varname, default))
+                        outdf.write(' -D%s=%s' % (varname, default))
+        
+        outmk.write('REVISION = %s\n' % revision)
+        outmk.write('TIMESTAMP = %s\n' % timestamp)
+        
+        outmc.write('#define REVISION %s\n' % revision)
+        outmc.write('#define TIMESTAMP %s\n' % timestamp)
+        
+        outdf.write(' "-DREVISION=%s" "-DTIMESTAMP=%s"\n' % (revision, timestamp))
+        
+        outmk.close()
+        outmc.close()
+        outdf.close()
 
 def main():
@@ -249 +281 @@
         
         # Read defaults from previous run
-        if os.path.exists(OUTPUT):
-                read_defaults(OUTPUT, defaults)
+        if os.path.exists(MAKEFILE):
+                read_defaults(MAKEFILE, defaults)
         
         # Default mode: only check defaults and regenerate configuration
         if ((len(sys.argv) >= 3) and (sys.argv[2] == 'default')):
                 if (check_choices(defaults, ask_names)):
-                        create_output(OUTPUT, defaults, ask_names)
+                        create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
                         return 0
         
@@ -294 +326 @@
                                         # If there is just one option, use it
                                         if (len(choices) == 1):
-                                                default = choices[0][0]
-                                                defaults[varname] = default
+                                                defaults[varname] = choices[0][0]
+                                                continue
                                         
                                         options.append("     %s [%s] --> " % (name, default))
+                                elif (vartype == 'y'):
+                                        defaults[varname] = 'y'
+                                        continue
                                 elif (vartype == 'y/n'):
                                         if (default == None):
@@ -347 +382 @@
                 xtui.screen_done(screen)
         
-        create_output(OUTPUT, defaults, ask_names)
+        create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
         return 0