scons: Don't use deprecated Options.

diff --git a/SConstruct b/SConstruct
index 1e5fd71adcebb588462f520910d90bc983b6ac4d..89144f7579da4637098f24a50a4c70183a033357 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -41,16 +41,16 @@ else:
        default_drivers = 'all'
        default_winsys = 'all'
 
-opts = Options('config.py')
+opts = Variables('config.py')
 common.AddOptions(opts)
-opts.Add(ListOption('statetrackers', 'state trackers to build', default_statetrackers,
+opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
                      ['mesa', 'python']))
-opts.Add(ListOption('drivers', 'pipe drivers to build', default_drivers,
+opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
                      ['softpipe', 'failover', 'i915simple', 'i965simple', 'cell', 'trace', 'r300']))
-opts.Add(ListOption('winsys', 'winsys drivers to build', default_winsys,
+opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
                      ['xlib', 'intel', 'gdi', 'radeon']))
 
-opts.Add(EnumOption('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
+opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', None, allowed_values=('7.1', '8.0', '9.0')))
 
 env = Environment(
        options = opts,

diff --git a/common.py b/common.py
index f1c6372abde8df5442866f689f895fbe8bd8a5ee..e57429eb75e1a3f6bdfef80531ed1846b8f1e4e6 100644 (file)
--- a/common.py
+++ b/common.py
@@ -46,13 +46,13 @@ else:
 
 def AddOptions(opts):
        try:
-               from SCons.Options.BoolOption import BoolOption
-       except ImportError:
                from SCons.Variables.BoolVariable import BoolVariable as BoolOption
-       try:
-               from SCons.Options.EnumOption import EnumOption
        except ImportError:
+               from SCons.Options.BoolOption import BoolOption
+       try:
                from SCons.Variables.EnumVariable import EnumVariable as EnumOption
+       except ImportError:
+               from SCons.Options.EnumOption import EnumOption
        opts.Add(BoolOption('debug', 'debug build', 'no'))
        opts.Add(BoolOption('profile', 'profile build', 'no'))
        #opts.Add(BoolOption('quiet', 'quiet command lines', 'no'))