Changes in tools/config.py [4e9aaf5:fe12f9f4] in mainline


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/config.py

    r4e9aaf5 rfe12f9f4  
    2828# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929#
    30 
    3130"""
    3231HelenOS configuration system
    3332"""
    34 
    3533import sys
    3634import os
     
    4341MAKEFILE = 'Makefile.config'
    4442MACROS = 'config.h'
     43DEFS = 'config.defs'
    4544PRECONF = 'defaults'
    4645
     
    224223        return True
    225224
    226 def create_output(mkname, mcname, defaults, ask_names):
     225def create_output(mkname, mcname, dfname, defaults, ask_names):
    227226        "Create output configuration"
    228227       
     
    230229       
    231230        sys.stderr.write("Fetching current revision identifier ... ")
    232        
    233         try:
    234                 version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].split(':')
    235                 sys.stderr.write("ok\n")
    236         except:
    237                 version = [1, "unknown", "unknown"]
    238                 sys.stderr.write("failed\n")
     231        version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].split(':')
     232        sys.stderr.write("OK\n")
    239233       
    240234        if (len(version) == 3):
     
    248242        outmk = file(mkname, 'w')
    249243        outmc = file(mcname, 'w')
     244        outdf = file(dfname, 'w')
    250245       
    251246        outmk.write('#########################################\n')
     
    257252        outmc.write(' ***************************************/\n\n')
    258253       
    259         defs = 'CONFIG_DEFS ='
     254        outdf.write('#########################################\n')
     255        outdf.write('## AUTO-GENERATED FILE, DO NOT EDIT!!! ##\n')
     256        outdf.write('#########################################\n\n')
     257        outdf.write('CONFIG_DEFS =')
    260258       
    261259        for varname, vartype, name, choices, cond in ask_names:
     
    275273                        if (default == "y"):
    276274                                outmc.write('/* %s */\n#define %s\n\n' % (name, varname))
    277                                 defs += ' -D%s' % varname
     275                                outdf.write(' -D%s' % varname)
    278276                else:
    279277                        outmc.write('/* %s */\n#define %s %s\n#define %s_%s\n\n' % (name, varname, default, varname, default))
    280                         defs += ' -D%s=%s -D%s_%s' % (varname, default, varname, default)
     278                        outdf.write(' -D%s=%s -D%s_%s' % (varname, default, varname, default))
    281279       
    282280        if (revision is not None):
    283281                outmk.write('REVISION = %s\n' % revision)
    284282                outmc.write('#define REVISION %s\n' % revision)
    285                 defs += ' "-DREVISION=%s"' % revision
     283                outdf.write(' "-DREVISION=%s"' % revision)
    286284       
    287285        outmk.write('TIMESTAMP = %s\n' % timestamp)
    288286        outmc.write('#define TIMESTAMP %s\n' % timestamp)
    289         defs += ' "-DTIMESTAMP=%s"\n' % timestamp
    290        
    291         outmk.write(defs)
     287        outdf.write(' "-DTIMESTAMP=%s"\n' % timestamp)
    292288       
    293289        outmk.close()
    294290        outmc.close()
     291        outdf.close()
    295292
    296293def sorted_dir(root):
     
    351348        if ((len(sys.argv) >= 3) and (sys.argv[2] == 'default')):
    352349                if (check_choices(defaults, ask_names)):
    353                         create_output(MAKEFILE, MACROS, defaults, ask_names)
     350                        create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
    354351                        return 0
    355352       
     
    469466                xtui.screen_done(screen)
    470467       
    471         create_output(MAKEFILE, MACROS, defaults, ask_names)
     468        create_output(MAKEFILE, MACROS, DEFS, defaults, ask_names)
    472469        return 0
    473470
Note: See TracChangeset for help on using the changeset viewer.