scons: Replace deprecated Options with Variables.

This resolves FTBFS with SCons >= 3.0.2.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 5 years ago
parent 0f6c4cf95e
commit 55c6a30f1e

@ -56,10 +56,10 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/
print(CYAN+'** Enabling DESTDIR for the project ** ' + NORMAL + env['DESTDIR']) print(CYAN+'** Enabling DESTDIR for the project ** ' + NORMAL + env['DESTDIR'])
# load the options # load the options
from SCons.Options import Options, PathOption from SCons.Variables import Variables
cachefile=env['CACHEDIR']+'generic.cache.py' cachefile=env['CACHEDIR']+'generic.cache.py'
opts = Options(cachefile) opts = Variables(cachefile)
opts.AddOptions( opts.AddVariables(
( 'KDECCFLAGS', 'C flags' ), ( 'KDECCFLAGS', 'C flags' ),
( 'KDECXXFLAGS', 'debug level for the project : full or just anything' ), ( 'KDECXXFLAGS', 'debug level for the project : full or just anything' ),
( 'KDELINKFLAGS', 'additional link flags' ), ( 'KDELINKFLAGS', 'additional link flags' ),

@ -312,10 +312,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
# Detect the environment - replaces ./configure implicitely # Detect the environment - replaces ./configure implicitely
# and store the options into a cache # and store the options into a cache
from SCons.Options import Options from SCons.Variables import Variables
cachefile=env['CACHEDIR']+'/kde.cache.py' cachefile=env['CACHEDIR']+'/kde.cache.py'
opts = Options(cachefile) opts = Variables(cachefile)
opts.AddOptions( opts.AddVariables(
( 'QTDIR', 'root of qt directory' ), ( 'QTDIR', 'root of qt directory' ),
( 'QTLIBPATH', 'path to the qt libraries' ), ( 'QTLIBPATH', 'path to the qt libraries' ),
( 'QTINCLUDEPATH', 'path to the qt includes' ), ( 'QTINCLUDEPATH', 'path to the qt includes' ),

@ -412,10 +412,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
Builder = SCons.Builder.Builder Builder = SCons.Builder.Builder
# Detect the environment - replaces ./configure implicitely and store the options into a cache # Detect the environment - replaces ./configure implicitely and store the options into a cache
from SCons.Options import Options from SCons.Variables import Variables
cachefile=env['CACHEDIR']+'kde.cache.py' cachefile=env['CACHEDIR']+'kde.cache.py'
opts = Options(cachefile) opts = Variables(cachefile)
opts.AddOptions( opts.AddVariables(
('PREFIX', 'root of the program installation'), ('PREFIX', 'root of the program installation'),
('TQTDIR', 'root of qt directory'), ('TQTDIR', 'root of qt directory'),

Loading…
Cancel
Save