Browse Source

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 1 year ago
parent
commit
55c6a30f1e
3 changed files with 9 additions and 9 deletions
  1. +3
    -3
      admin/generic.py
  2. +3
    -3
      admin/kde.py
  3. +3
    -3
      kde.py

+ 3
- 3
admin/generic.py View File

@@ -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' ),


+ 3
- 3
admin/kde.py View File

@@ -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' ),


+ 3
- 3
kde.py View File

@@ -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'),


Loading…
Cancel
Save