Changeset 561

Show
Ignore:
Timestamp:
08/24/07 10:53:24 (13 years ago)
Author:
arnonym
Message:

Merge the scons-branch to trunk.

This basicly adds scons as a buildsystem. This does not mean that auto* is dropped instantly (the added files should not collide) but allows for some testing in the transition-process. The auto*-files are deleted later on...

Due to this, the config.h.in (which gets built by autogen.sh) is copied from config.h.in.scons using scons. When dropping make this file should be moved to config.h.in.

The scons-system is probably missing a lot of things you are used to in make. But at least here it does build a usable libffado. :-)

To use scons, simply do a "scons". If you want to know about configuration, "scons -h" allows you to view and set parameters, which are saved from there on. What do I mean with this? "scons -h PREFIX=$HOME" sets the install-prefix to $HOME and shows the helptext that already incorporates the changed option. Another "scons -h" will show the same help-text and scons remembers the changed prefix. "scons" now builds the libs and apps and "scons install" installs everything into the prefix. "scons -c install" cleans the local dir and uninstalls the package while "scons -c" just cleans the local dir.

BTW: I also set several more ignores, I am just to lazy to split these two commits. ;-)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado

    • Property svn:ignore changed from
      .cvsignore
      Makefile
      Makefile.in
      aclocal.m4
      autom4te.cache
      config.*
      configure
      libfreebob.pc
      libtool
      stamp*
      libfreebob-*.tar.gz
      to
      .cvsignore
      Makefile
      Makefile.in
      aclocal.m4
      autom4te.cache
      config.*
      configure
      libffado.pc
      libtool
      stamp*
      libfreebob-*.tar.gz
      .*.swp
      cache
      .scons*
  • trunk/libffado/SConstruct

    r553 r561  
    1818        PathOption( "PREFIX", "The prefix where ffado will be installed to.", "/usr/local" ), 
    1919        BoolOption( "ENABLE_BEBOB", "Enable/Disable the bebob part.", True ), 
     20        BoolOption( "ENABLE_GENERIC_AVC", "Enable/Disable the generic avc part (apple).", True ), 
    2021        BoolOption( "ENABLE_MOTU", "Enable/Disable the Motu part.", False ), 
    2122        BoolOption( "ENABLE_DICE", "Enable/Disable the DICE part.", False ), 
     
    8990if env['ENABLE_ALL']: 
    9091        env['ENABLE_BEBOB'] = True 
     92        env['ENABLE_GENERIC_AVC'] = True 
    9193        env['ENABLE_MOTU'] = True 
    9294        env['ENABLE_DICE'] = True 
     
    9799if env['ENABLE_BEBOB']: 
    98100        env.AppendUnique( CCFLAGS=["-DENABLE_BEBOB"] ) 
     101if env['ENABLE_GENERIC_AVC']: 
     102        env.AppendUnique( CCFLAGS=["-DENABLE_GENERIC_AVC"] ) 
    99103if env['ENABLE_MOTU']: 
    100104        env.AppendUnique( CCFLAGS=["-DENABLE_MOTU"] ) 
     
    137141# 
    138142 
     143env.Command( "config.h.in", "config.h.in.scons", "cp $SOURCE $TARGET" ) 
     144 
    139145env.ScanReplace( "config.h.in" ) 
    140146pkgconfig = env.ScanReplace( "libffado.pc.in" ) 
  • trunk/libffado/src

    • Property svn:ignore changed from
      .cvsignore
      Makefile
      Makefile.in
      .deps
      .libs
      *.lo
      *.la
      to
      .cvsignore
      Makefile
      Makefile.in
      .deps
      .libs
      *.lo
      *.la
      *.os
      libffado.so
      test-debugmodule
      test-dll
      test-unittests-util
      test-unittests-osc
      bridgeco-downloader
      bebob-sync
      .*.swp
  • trunk/libffado/src/bebob

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/bebob/bebob_avdevice.cpp

    r560 r561  
    2222 */ 
    2323 
     24#include "config.h" 
     25 
    2426#include "bebob/bebob_avdevice.h" 
    2527#include "bebob/bebob_avdevice_subunit.h" 
  • trunk/libffado/src/bebob/vendorspecific

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/debugmodule

    • Property svn:ignore changed from
      .cvsignore
      Makefile
      Makefile.in
      .deps
      .libs
      *.lo
      *.la
      test_debugmodule
      to
      .cvsignore
      Makefile
      Makefile.in
      .deps
      .libs
      *.lo
      *.la
      test_debugmodule
      *.os
  • trunk/libffado/src/genericavc

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/libavc

    • Property svn:ignore changed from
      .cvsignore
      Makefile
      Makefile.in
      .deps
      .libs
      *.lo
      *.la
      to
      .cvsignore
      Makefile
      Makefile.in
      .deps
      .libs
      *.lo
      *.os
      *.la
  • trunk/libffado/src/libavc/audiosubunit

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/libavc/ccm

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/libavc/descriptors

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/libavc/general

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/libavc/musicsubunit

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/libavc/streamformat

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/libavc/util

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/libieee1394

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/libosc

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/libstreaming

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/libutil

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/maudio

    • Property svn:ignore set to
      *.os
  • trunk/libffado/src/SConscript

    r549 r561  
    1313        ffado.cpp \ 
    1414        ffado_streaming.cpp \ 
    15         iavdevice.cpp \ 
     15        ffadodevice.cpp \ 
    1616        debugmodule/debugmodule.cpp \ 
    17         libavc/avc_connect.cpp \ 
     17        libavc/streamformat/avc_extended_stream_format.cpp \ 
     18        libavc/util/avc_serialize.cpp \ 
     19        libavc/musicsubunit/avc_descriptor_music.cpp \ 
     20        libavc/musicsubunit/avc_musicsubunit.cpp \ 
     21        libavc/audiosubunit/avc_audiosubunit.cpp \ 
     22        libavc/audiosubunit/avc_function_block.cpp \ 
     23        libavc/descriptors/avc_descriptor_cmd.cpp \ 
     24        libavc/descriptors/avc_descriptor.cpp \ 
     25        libavc/general/avc_extended_subunit_info.cpp \ 
     26        libavc/general/avc_unit_info.cpp \ 
     27        libavc/general/avc_generic.cpp \ 
     28        libavc/general/avc_subunit_info.cpp \ 
     29        libavc/general/avc_connect.cpp \ 
     30        libavc/general/avc_signal_format.cpp \ 
     31        libavc/general/avc_extended_cmd_generic.cpp \ 
     32        libavc/general/avc_extended_plug_info.cpp \ 
     33        libavc/general/avc_plug_info.cpp \ 
     34        libavc/general/avc_unit.cpp \ 
     35        libavc/general/avc_subunit.cpp \ 
     36        libavc/general/avc_plug.cpp \ 
     37        libavc/general/avc_vendor_dependent_cmd.cpp \ 
    1838        libavc/avc_definitions.cpp \ 
    19         libavc/avc_extended_cmd_generic.cpp \ 
    20         libavc/avc_extended_plug_info.cpp \ 
    21         libavc/avc_extended_stream_format.cpp \ 
    22         libavc/avc_extended_subunit_info.cpp \ 
    23         libavc/avc_function_block.cpp \ 
    24         libavc/avc_generic.cpp \ 
    25         libavc/avc_plug_info.cpp \ 
    26         libavc/avc_serialize.cpp \ 
    27         libavc/avc_signal_source.cpp \ 
    28         libavc/avc_subunit_info.cpp \ 
    29         libavc/avc_unit_info.cpp \ 
     39        libavc/ccm/avc_signal_source.cpp \ 
    3040        libieee1394/ARMHandler.cpp \ 
    3141        libieee1394/configrom.cpp \ 
     
    6979        bebob/bebob_functionblock.cpp \ 
    7080        bebob/GenericMixer.cpp \ 
     81        bebob/vendorspecific/focusrite.cpp \ 
     82        bebob/vendorspecific/terratec.cpp \ 
    7183        maudio/maudio_avdevice.cpp \ 
    7284' ) 
     
    7587        maudio/fw410.xml \ 
    7688        maudio/fwap.xml \ 
     89' ) 
     90 
     91genericavc_source =  env.Split( '\ 
     92        genericavc/avc_avdevice.cpp \ 
     93        genericavc/avc_vendormodel.cpp \ 
    7794' ) 
    7895 
     
    110127source = ffado_source 
    111128if env['ENABLE_BEBOB']: 
    112         source += bebob_source + amdtp_source 
     129        source += bebob_source 
     130if env['ENABLE_GENERIC_AVC']: 
     131        source += genericavc_source 
    113132if env['ENABLE_MOTU']: 
    114133        source += motu_source 
     
    121140if env['ENABLE_BOUNCE']: 
    122141        source += bounce_source 
     142 
     143if env['ENABLE_BEBOB'] or env['ENABLE_GENERIC_AVC'] or env['ENABLE_DICE'] or env['ENABLE_BOUNCE']: 
     144        source += amdtp_source 
     145 
     146env1.MergeFlags( "-lrt" ) 
    123147 
    124148#env1.AppendUnique( LINKFLAGS = env.Split("-Wl,-rpath $libdir -Wl,-soname -Wl,libffado.so.1 --version-info=1:0:0") ) 
  • trunk/libffado/tests

    • Property svn:ignore changed from
      .cvsignore
      Makefile
      Makefile.in
      .deps
      .libs
      *.lo
      *.la
      test-extplugcmd
      test-freebob
      to
      .cvsignore
      Makefile
      Makefile.in
      .deps
      .libs
      *.lo
      *.la
      .*.swp
      test-extplugcmd
      test-freebob
      test-cycletimer
      test-fw410
      test-timestampedbuffer
      test-ieee1394service
      test-ffado
      test-streamdump
      test-sytmonitor
  • trunk/libffado/tests/SConscript

    r538 r561  
    99env.PrependUnique( LIBS=["ffado"] ) 
    1010 
    11 for app in ["test-ffado", "test-extplugcmd", "test-fw410", "test-volume", "test-mixer", "test-cycletimer", "test-timestampedbuffer", "test-ieee1394service", "test-streamdump"]: 
     11
     12# deactivate as they don't seem ported to the new api: test-extplugcmd, test-mixer, test-volume 
     13
     14#for app in ["test-ffado", "test-extplugcmd", "test-fw410", "test-volume", "test-mixer", "test-cycletimer", "test-timestampedbuffer", "test-ieee1394service", "test-streamdump"]: 
     15for app in ["test-ffado", "test-fw410", "test-cycletimer", "test-timestampedbuffer", "test-ieee1394service", "test-streamdump"]: 
    1216        env.Program( target=app, source = app+".cpp" ) 
    1317 
  • trunk/libffado/tests/streaming

    • Property svn:ignore set to
      .*.swp
      teststreaming
      teststreaming2
      teststreaming3
      testmidistreaming1