Changeset 1897

Show
Ignore:
Timestamp:
09/12/10 13:27:15 (10 years ago)
Author:
arnonym
Message:

Fix #214: Replace Options by Variables and thus remove the deprecation warnings. I think it is save to do this now. Packagers for distros where scons is to old "simply" need to apply the reverse of this patch. but I don't think there are that many distros/distro-versions using that old scons and still maintaining current copies of ffado...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/SConstruct

    r1895 r1897  
    3737        os.makedirs( "cache" ) 
    3838 
    39 opts = Options( "cache/options.cache" ) 
    40  
    41 opts.AddOptions( 
    42     BoolOption( "DEBUG", """\ 
     39opts = Variables( "cache/options.cache" ) 
     40 
     41opts.AddVariables( 
     42    BoolVariable( "DEBUG", """\ 
    4343Toggle debug-build. DEBUG means \"-g -Wall\" and more, otherwise we will use 
    4444  \"-O2\" to optimize.""", True ), 
    45     BoolOption( "PROFILE", "Build with symbols and other profiling info", False ), 
    46     PathOption( "PREFIX", "The prefix where ffado will be installed to.", "/usr/local", PathOption.PathAccept ), 
    47     PathOption( "BINDIR", "Overwrite the directory where apps are installed to.", "$PREFIX/bin", PathOption.PathAccept ), 
    48     PathOption( "LIBDIR", "Overwrite the directory where libs are installed to.", "$PREFIX/lib", PathOption.PathAccept ), 
    49     PathOption( "INCLUDEDIR", "Overwrite the directory where headers are installed to.", "$PREFIX/include", PathOption.PathAccept ), 
    50     PathOption( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathOption.PathAccept ), 
    51     PathOption( "PYPKGDIR", "The directory where the python modules get installed.", 
    52         distutils.sysconfig.get_python_lib( prefix="$PREFIX" ), PathOption.PathAccept ), 
    53     BoolOption( "ENABLE_BEBOB", "Enable/Disable support for the BeBoB platform.", True ), 
    54     BoolOption( "ENABLE_FIREWORKS", "Enable/Disable support for the ECHO Audio FireWorks platform.", True ), 
    55     BoolOption( "ENABLE_OXFORD", "Enable/Disable support for the Oxford Semiconductor FW platform.", True ), 
    56     BoolOption( "ENABLE_MOTU", "Enable/Disable support for the MOTU platform.", True ), 
    57     BoolOption( "ENABLE_DICE", "Enable/Disable support for the TCAT DICE platform.", True ), 
    58     BoolOption( "ENABLE_METRIC_HALO", "Enable/Disable support for the Metric Halo platform.", False ), 
    59     BoolOption( "ENABLE_RME", "Enable/Disable support for the RME platform.", False ), 
    60     BoolOption( "ENABLE_MAUDIO", "Enable/Disable support for the M-Audio custom BeBoB devices.", False ), 
    61     BoolOption( "ENABLE_BOUNCE", "Enable/Disable the BOUNCE device.", False ), 
    62     BoolOption( "ENABLE_GENERICAVC", """\ 
     45    BoolVariable( "PROFILE", "Build with symbols and other profiling info", False ), 
     46    PathVariable( "PREFIX", "The prefix where ffado will be installed to.", "/usr/local", PathVariable.PathAccept ), 
     47    PathVariable( "BINDIR", "Overwrite the directory where apps are installed to.", "$PREFIX/bin", PathVariable.PathAccept ), 
     48    PathVariable( "LIBDIR", "Overwrite the directory where libs are installed to.", "$PREFIX/lib", PathVariable.PathAccept ), 
     49    PathVariable( "INCLUDEDIR", "Overwrite the directory where headers are installed to.", "$PREFIX/include", PathVariable.PathAccept ), 
     50    PathVariable( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathVariable.PathAccept ), 
     51    PathVariable( "PYPKGDIR", "The directory where the python modules get installed.", 
     52        distutils.sysconfig.get_python_lib( prefix="$PREFIX" ), PathVariable.PathAccept ), 
     53    BoolVariable( "ENABLE_BEBOB", "Enable/Disable support for the BeBoB platform.", True ), 
     54    BoolVariable( "ENABLE_FIREWORKS", "Enable/Disable support for the ECHO Audio FireWorks platform.", True ), 
     55    BoolVariable( "ENABLE_OXFORD", "Enable/Disable support for the Oxford Semiconductor FW platform.", True ), 
     56    BoolVariable( "ENABLE_MOTU", "Enable/Disable support for the MOTU platform.", True ), 
     57    BoolVariable( "ENABLE_DICE", "Enable/Disable support for the TCAT DICE platform.", True ), 
     58    BoolVariable( "ENABLE_METRIC_HALO", "Enable/Disable support for the Metric Halo platform.", False ), 
     59    BoolVariable( "ENABLE_RME", "Enable/Disable support for the RME platform.", False ), 
     60    BoolVariable( "ENABLE_MAUDIO", "Enable/Disable support for the M-Audio custom BeBoB devices.", False ), 
     61    BoolVariable( "ENABLE_BOUNCE", "Enable/Disable the BOUNCE device.", False ), 
     62    BoolVariable( "ENABLE_GENERICAVC", """\ 
    6363Enable/Disable the the generic avc part (mainly used by apple). 
    6464  Note that disabling this option might be overwritten by other devices needing 
    6565  this code.""", False ), 
    66     BoolOption( "ENABLE_ALL", "Enable/Disable support for all devices.", False ), 
    67     BoolOption( "SERIALIZE_USE_EXPAT", "Use libexpat for XML serialization.", False ), 
    68     BoolOption( "BUILD_TESTS", """\ 
     66    BoolVariable( "ENABLE_ALL", "Enable/Disable support for all devices.", False ), 
     67    BoolVariable( "SERIALIZE_USE_EXPAT", "Use libexpat for XML serialization.", False ), 
     68    BoolVariable( "BUILD_TESTS", """\ 
    6969Build the tests in their directory. As some contain quite some functionality, 
    7070  this is on by default. 
    7171  If you just want to use ffado with jack without the tools, you can disable this.\ 
    7272""", True ), 
    73     BoolOption( "BUILD_STATIC_TOOLS", "Build a statically linked version of the FFADO tools.", False ), 
    74     EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'powerpc64', 'none' ), ignorecase=2), 
    75     BoolOption( "ENABLE_OPTIMIZATIONS", "Enable optimizations and the use of processor specific extentions (MMX/SSE/...).", False ), 
    76     BoolOption( "PEDANTIC", "Enable -Werror and more pedantic options during compile.", False ), 
     73    BoolVariable( "BUILD_STATIC_TOOLS", "Build a statically linked version of the FFADO tools.", False ), 
     74    EnumVariable('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'powerpc64', 'none' ), ignorecase=2), 
     75    BoolVariable( "ENABLE_OPTIMIZATIONS", "Enable optimizations and the use of processor specific extentions (MMX/SSE/...).", False ), 
     76    BoolVariable( "PEDANTIC", "Enable -Werror and more pedantic options during compile.", False ), 
    7777    ( "COMPILE_FLAGS", "Add additional flags to the environment.\nOnly meant for distributors and gentoo-users who want to over-optimize their built.\n Using this is not supported by the ffado-devs!" ), 
    7878