Changeset 1298
- Timestamp:
- 07/13/08 15:37:08 (16 years ago)
- Files:
-
- branches/libffado-2.0/SConstruct (modified) (7 diffs)
- branches/libffado-2.0/support/mixer-qt4 (added)
- branches/libffado-2.0/support/mixer-qt4/ffadomixer.in (added)
- branches/libffado-2.0/support/mixer-qt4/ffadomixer_config.py.in (added)
- branches/libffado-2.0/support/mixer-qt4/ffado_dbus_util.py (added)
- branches/libffado-2.0/support/mixer-qt4/ffado_panelmanager.py (added)
- branches/libffado-2.0/support/mixer-qt4/ffado_panelmanagerstatus.ui (added)
- branches/libffado-2.0/support/mixer-qt4/ffado_regdialog.py (added)
- branches/libffado-2.0/support/mixer-qt4/ffado_regdialog.ui (added)
- branches/libffado-2.0/support/mixer-qt4/ffado_registration.py (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_audiofire.py (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_audiofire_settings.ui (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_audiofire_strip.ui (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_dummy.py (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_dummy.ui (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_global.py (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_global.ui (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_nodevice.py (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_nodevice.ui (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_saffire.py (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_saffirele_large.ui (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_saffirele_small.ui (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_saffirepro.py (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_saffirepro_large.ui (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_saffirepro_small.ui (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_saffire_base.py (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_saffire_mono.ui (added)
- branches/libffado-2.0/support/mixer-qt4/mixer_saffire_stereo.ui (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/libffado-2.0/SConstruct
r1252 r1298 98 98 buildenv[var]='' 99 99 100 env = Environment( tools=['default','scanreplace','pyuic',' dbus','doxygen','pkgconfig'], toolpath=['admin'], ENV = buildenv, options=opts )100 env = Environment( tools=['default','scanreplace','pyuic','pyuic4','dbus','doxygen','pkgconfig'], toolpath=['admin'], ENV = buildenv, options=opts ) 101 101 102 102 if os.environ.has_key('CC'): … … 181 181 tests.update( env['PKGCONFIG_TESTS'] ) 182 182 tests.update( env['PYUIC_TESTS'] ) 183 tests.update( env['PYUIC4_TESTS'] ) 183 184 184 185 conf = Configure( env, … … 279 280 280 281 # PyQT checks 282 build_mixer = False 281 283 if conf.CheckForApp( "which pyuic" ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'qt' ): 282 284 env['PYUIC'] = True 285 build_mixer = True 286 287 if conf.CheckForApp( "xdg-desktop-menu --help" ): 288 env['XDG_TOOLS'] = True 289 else: 290 print """ 291 I couldn't find the program 'xdg-desktop-menu'. Together with xdg-icon-resource 292 this is needed to add the fancy entry to your menu. But the mixer will be installed, you can start it by executing "ffadomixer". 293 """ 294 elif conf.CheckForApp( "which pyuic4" ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ): 295 env['PYUIC4'] = True 296 build_mixer = True 283 297 284 298 if conf.CheckForApp( "xdg-desktop-menu --help" ): … … 290 304 """ 291 305 292 else:306 if not build_mixer: 293 307 print """ 294 I couldn't find all the prerequisites ('pyuic' and the python-modules 'dbus' and308 I couldn't find all the prerequisites ('pyuic' / 'pyuic4' and the python-modules 'dbus' and 295 309 'qt', the packages could be named like dbus-python and PyQt) to build the mixer. 296 310 Therefor the mixer won't get installed. … … 491 505 env['CACHEDIR'] = "~/.ffado" 492 506 507 env['USER_CONFIG_FILE'] = env['CONFIGDIR'] + "/configuration" 508 env['SYSTEM_CONFIG_FILE'] = env['SHAREDIR'] + "/configuration" 509 493 510 env['REGISTRATION_URL'] = "http://ffado.org/deviceregistration/register.php?action=register" 494 511 … … 513 530 pkgconfig = env.ScanReplace( "libffado.pc.in" ) 514 531 env.Install( env['libdir'] + '/pkgconfig', pkgconfig ) 532 533 env.Install( env['SYSTEM_CONFIG_FILE'], 'configuration' ) 515 534 516 535 subdirs=['external','src','libffado','tests','support','doc'] … … 570 589 env.Command( "TAGS", "", findcommand + " |xargs etags" ) 571 590 env.AlwaysBuild( "tags", "TAGS" ) 572 env.NoCache( "tags", "TAGS" ) 573 591 if 'NoCache' in dir(env): 592 env.NoCache( "tags", "TAGS" ) 593