summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-09-11 14:42:15 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-09-11 14:42:15 +0200
commit55c6a30f1ebdf6becbad274f38e951ca13f0a785 (patch)
treec8202c9d491a559931fb41a5dacfe7f32447c036
parent0f6c4cf95e31b5bb2755bd56afc0763c7fcf6305 (diff)
downloadkstreamripper-55c6a30f.tar.gz
kstreamripper-55c6a30f.zip
scons: Replace deprecated Options with Variables.HEADorigin/masterorigin/HEADmaster
This resolves FTBFS with SCons >= 3.0.2. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--admin/generic.py6
-rw-r--r--admin/kde.py6
-rw-r--r--kde.py6
3 files changed, 9 insertions, 9 deletions
diff --git a/admin/generic.py b/admin/generic.py
index e0fa6b1..1897bf0 100644
--- a/admin/generic.py
+++ b/admin/generic.py
@@ -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'])
# load the options
- from SCons.Options import Options, PathOption
+ from SCons.Variables import Variables
cachefile=env['CACHEDIR']+'generic.cache.py'
- opts = Options(cachefile)
- opts.AddOptions(
+ opts = Variables(cachefile)
+ opts.AddVariables(
( 'KDECCFLAGS', 'C flags' ),
( 'KDECXXFLAGS', 'debug level for the project : full or just anything' ),
( 'KDELINKFLAGS', 'additional link flags' ),
diff --git a/admin/kde.py b/admin/kde.py
index 8a70106..c1d2edf 100644
--- a/admin/kde.py
+++ b/admin/kde.py
@@ -312,10 +312,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
# 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'
- opts = Options(cachefile)
- opts.AddOptions(
+ opts = Variables(cachefile)
+ opts.AddVariables(
( 'QTDIR', 'root of qt directory' ),
( 'QTLIBPATH', 'path to the qt libraries' ),
( 'QTINCLUDEPATH', 'path to the qt includes' ),
diff --git a/kde.py b/kde.py
index caac511..02a7644 100644
--- a/kde.py
+++ b/kde.py
@@ -412,10 +412,10 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
Builder = SCons.Builder.Builder
# 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'
- opts = Options(cachefile)
- opts.AddOptions(
+ opts = Variables(cachefile)
+ opts.AddVariables(
('PREFIX', 'root of the program installation'),
('TQTDIR', 'root of qt directory'),