Changeset e2b73d4f in mainline for tools/config.py

Timestamp:

2010-03-21T09:25:29Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

19f857a

Parents:

facebd56 (diff), 4e9aaf5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

tools/config.py

@@ -28 +28 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+
 """
 HelenOS configuration system
 """
+
 import sys
 import os
@@ -41 +43 @@
 MAKEFILE = 'Makefile.config'
 MACROS = 'config.h'
-DEFS = 'config.defs'
 PRECONF = 'defaults'
 
@@ -223 +224 @@
         return True
 
-def create_output(mkname, mcname, dfname, defaults, ask_names):
+def create_output(mkname, mcname, defaults, ask_names):
         "Create output configuration"
         
@@ -229 +230 @@
         
         sys.stderr.write("Fetching current revision identifier ... ")
-        version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].split(':')
-        sys.stderr.write("OK\n")
+        
+        try:
+                version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].split(':')
+                sys.stderr.write("ok\n")
+        except:
+                version = [1, "unknown", "unknown"]
+                sys.stderr.write("failed\n")
         
         if (len(version) == 3):
@@ -242 +248 @@
         outmk = file(mkname, 'w')
         outmc = file(mcname, 'w')
-        outdf = file(dfname, 'w')
         
         outmk.write('#########################################\n')
@@ -252 +257 @@
         outmc.write(' ***************************************/\n\n')
         
-        outdf.write('#########################################\n')
-        outdf.write('## AUTO-GENERATED FILE, DO NOT EDIT!!! ##\n')
-        outdf.write('#########################################\n\n')
-        outdf.write('CONFIG_DEFS =')
+        defs = 'CONFIG_DEFS ='
         
         for varname, vartype, name, choices, cond in ask_names:
@@ -273 +275 @@
                         if (default == "y"):
                                 outmc.write('/* %s */\n#define %s\n\n' % (name, varname))
-                                outdf.write(' -D%s' % varname)
+                                defs += ' -D%s' % varname
                 else:
                         outmc.write('/* %s */\n#define %s %s\n#define %s_%s\n\n' % (name, varname, default, varname, default))
-                        outdf.write(' -D%s=%s -D%s_%s' % (varname, default, varname, default))
+                        defs += ' -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)
-                outdf.write(' "-DREVISION=%s"' % revision)
+                defs += ' "-DREVISION=%s"' % revision
         
         outmk.write('TIMESTAMP = %s\n' % timestamp)
         outmc.write('#define TIMESTAMP %s\n' % timestamp)
-        outdf.write(' "-DTIMESTAMP=%s"\n' % timestamp)
+        defs += ' "-DTIMESTAMP=%s"\n' % timestamp
+        
+        outmk.write(defs)
         
         outmk.close()
         outmc.close()
-        outdf.close()
 
 def sorted_dir(root):
@@ -348 +351 @@
         if ((len(sys.argv) >= 3) and (sys.argv[2] == 'default')):
                 if (check_choices(defaults, ask_names)):
-                        create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
+                        create_output(MAKEFILE, MACROS, defaults, ask_names)
                         return 0
         
@@ -466 +469 @@
                 xtui.screen_done(screen)
         
-        create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
+        create_output(MAKEFILE, MACROS, defaults, ask_names)
         return 0