Changeset 368

Show
Ignore:
Timestamp:
10/30/06 11:36:43 (2 years ago)
Author:
dshipton
Message:

Enable users to specify an options file via the commandline.
This was buildbot specific but we figured other users may want
acces to this functionality.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/SConstruct

    r302 r368  
    186186opensg_version_string = file("VERSION").readline().strip() 
    187187 
    188 # Figure out what version of CppDom we're using 
    189188print "Building OpenSG ", opensg_version_string 
    190189 
    …… 
    194193option_filename = "option.cache." + platform 
    195194 
    196 if ARGUMENTS.has_key("buildbot_slave"): 
    197    print "Buildbot slave build initiated" 
    198    build_slave_filename = "buildbot.options" 
    199    if ARGUMENTS["buildbot_slave"] not in ["true", "1", "yes"]: 
    200       build_slave_filename = ARGUMENTS["buildbot_slave"] 
    201    buildbot_options_file = os.path.abspath(os.path.join(os.getcwd(), "..", "..", build_slave_filename)) 
    202    if os.path.exists(buildbot_options_file): 
    203       print "Buildbot slave:" 
    204       print "      found options file: %s" % str(buildbot_options_file) 
    205       execfile(buildbot_options_file, ARGUMENTS) 
    206       print "      finished processing options" 
     195if ARGUMENTS.has_key("options_file"): 
     196   opt_file = ARGUMENTS["options_file"] 
     197   if os.path.exists(opt_file): 
     198      print "Reading options from: %s" % str(opt_file) 
     199      option_filename = opt_file 
    207200   else: 
    208       print "Buildbot slave: Options file not found.. will continue with defaults" 
     201      print "Options file '%s' not found.. will continue with default '%s'" % \ 
     202      (opt_file, option_filename) 
    209203 
    210204# Create base environment to use for option processing 
    …… 
    245239 
    246240# Create option objects 
    247 boost_options = sca_opts.Boost.Boost("boost","1.31.0",libs=['filesystem'],required=True) 
     241boost_options = sca_opts.Boost.Boost("boost","1.31.0",required=True) 
    248242 
    249243glut_libname = "glut"