Mesa (master): scons: Don't use deprecated Options.

[Keith Whitwell]

Module: Mesa
Branch: master
Commit: e9fb90ab8889136f788a3d9dc395b0f4d46cfdcc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e9fb90ab8889136f788a3d9dc395b0f4d46cfdcc

Author: José Fonseca <jfonseca at vmware.com>
Date:   Fri May  1 16:12:17 2009 +0100

scons: Don't use deprecated Options.

---

 SConstruct |   10 +++++-----
 common.py  |    8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/SConstruct b/SConstruct
index 1e5fd71..89144f7 100644
--- 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 f1c6372..e57429e 100644
--- 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'))