diff --git a/mixer/wscript b/mixer/wscript index d855c53..c6cb16e 100644 --- a/mixer/wscript +++ b/mixer/wscript @@ -29,12 +29,12 @@ def configure(conf): atleast_version='0.4.0', mandatory=True) conf.define('VERSION', PACKAGE_VERSION) - conf.define('SYSTEM_PATH', string.join( [ conf.env.DATADIR, APPNAME ], '/' ) ) - conf.define('DOCUMENT_PATH', string.join( [ conf.env.DATADIR, 'doc' ], '/' ) ) - conf.define('PIXMAP_PATH', string.join( [ conf.env.DATADIR, 'pixmaps' ], '/' ) ) + conf.define('SYSTEM_PATH', '/'.join( [ conf.env.DATADIR, APPNAME ] ) ) + conf.define('DOCUMENT_PATH', '/'.join( [ conf.env.DATADIR, 'doc' ] ) ) + conf.define('PIXMAP_PATH', '/'.join( [ conf.env.DATADIR, 'pixmaps' ] ) ) conf.write_config_header('config.h', remove=False) - + print('') def build(bld): @@ -75,6 +75,6 @@ src/main.C bld.install_as('${DATADIR}/pixmaps/' + APPNAME + '/icon-256x256.png', 'icons/hicolor/256x256/apps/' + APPNAME + '.png') - bld.install_files( string.join( [ '${DATADIR}/doc', APPNAME ], '/' ), bld.path.ant_glob( 'doc/*.html doc/*.png' ) ) + bld.install_files( '/'.join( [ '${DATADIR}/doc', APPNAME ] ), bld.path.ant_glob( 'doc/*.html doc/*.png' ) ) bld.symlink_as( '${BINDIR}/' + APPNAME + '-noui', APPNAME ) diff --git a/sequencer/wscript b/sequencer/wscript index 8a461c9..67b89a1 100644 --- a/sequencer/wscript +++ b/sequencer/wscript @@ -29,9 +29,9 @@ def configure(conf): atleast_version='2.0.0', args="--cflags --libs", mandatory=True) conf.define('VERSION', PACKAGE_VERSION) - conf.define('SYSTEM_PATH', string.join( [ conf.env.DATADIR, APPNAME ], '/' ) ) - conf.define('DOCUMENT_PATH', string.join( [ conf.env.DATADIR, 'doc' ], '/' ) ) - conf.define('PIXMAP_PATH', string.join( [ conf.env.DATADIR, 'pixmaps' ], '/' ) ) + conf.define('SYSTEM_PATH', '/'.join( [ conf.env.DATADIR, APPNAME ] ) ) + conf.define('DOCUMENT_PATH', '/'.join( [ conf.env.DATADIR, 'doc' ] ) ) + conf.define('PIXMAP_PATH', '/'.join( [ conf.env.DATADIR, 'pixmaps' ] ) ) conf.write_config_header('config.h', remove=False) @@ -72,7 +72,7 @@ src/transport.C uselib = [ 'JACK', 'SIGCPP', 'LIBLO', 'XPM', 'NTK', 'NTK_IMAGES'], install_path = '${BINDIR}') - bld.install_files(string.join( [ '${DATADIR}', APPNAME, 'instruments'], '/' ), bld.path.ant_glob('instruments/*')) + bld.install_files('/'.join( [ '${DATADIR}', APPNAME, 'instruments'] ), bld.path.ant_glob('instruments/*')) start_dir = bld.path.find_dir( 'icons/hicolor' ) @@ -81,4 +81,4 @@ src/transport.C bld.install_as('${DATADIR}/pixmaps/' + APPNAME + '/icon-256x256.png', 'icons/hicolor/256x256/apps/' + APPNAME + '.png') - bld.install_files( string.join( [ '${DATADIR}/doc', APPNAME ], '/' ), bld.path.ant_glob( 'doc/*.html doc/*.png' ) ) + bld.install_files( '/'.join( [ '${DATADIR}/doc', APPNAME ] ), bld.path.ant_glob( 'doc/*.html doc/*.png' ) ) diff --git a/session-manager/wscript b/session-manager/wscript index 1902251..d891a81 100644 --- a/session-manager/wscript +++ b/session-manager/wscript @@ -26,12 +26,12 @@ def configure(conf): conf.load('gnu_dirs') conf.define('VERSION', PACKAGE_VERSION) - conf.define('SYSTEM_PATH', string.join( [ conf.env.DATADIR, APPNAME ], '/' ) ) - conf.define('DOCUMENT_PATH', string.join( [ conf.env.DATADIR, 'doc' ], '/' ) ) - conf.define('PIXMAP_PATH', string.join( [ conf.env.DATADIR, 'pixmaps' ], '/' ) ) + conf.define('SYSTEM_PATH', '/'.join( [ conf.env.DATADIR, APPNAME ] ) ) + conf.define('DOCUMENT_PATH', '/'.join( [ conf.env.DATADIR, 'doc' ] ) ) + conf.define('PIXMAP_PATH', '/'.join( [ conf.env.DATADIR, 'pixmaps' ] ) ) conf.write_config_header('config.h', remove=False) - + print('') def build(bld): @@ -100,4 +100,4 @@ src/send_osc.C bld.install_as('${DATADIR}/pixmaps/' + APPNAME + '/icon-256x256.png', 'icons/hicolor/256x256/apps/' + APPNAME + '.png') - bld.install_files( string.join( [ '${DATADIR}/doc', APPNAME ], '/' ), bld.path.ant_glob( 'doc/*.html doc/*.png' ) ) + bld.install_files( '/'.join( [ '${DATADIR}/doc', APPNAME ] ), bld.path.ant_glob( 'doc/*.html doc/*.png' ) ) diff --git a/timeline/wscript b/timeline/wscript index 05b5bf7..63c6216 100644 --- a/timeline/wscript +++ b/timeline/wscript @@ -34,12 +34,12 @@ def configure(conf): atleast_version='1.0.17', mandatory=True) conf.define('VERSION', PACKAGE_VERSION) - conf.define('SYSTEM_PATH', string.join( [ conf.env.DATADIR, APPNAME ], '/' ) ) - conf.define('DOCUMENT_PATH', string.join( [ conf.env.DATADIR, 'doc' ], '/' ) ) - conf.define('PIXMAP_PATH', string.join( [ conf.env.DATADIR, 'pixmaps' ], '/' ) ) + conf.define('SYSTEM_PATH', '/'.join( [ conf.env.DATADIR, APPNAME ] ) ) + conf.define('DOCUMENT_PATH', '/'.join( [ conf.env.DATADIR, 'doc' ] ) ) + conf.define('PIXMAP_PATH', '/'.join( [ conf.env.DATADIR, 'pixmaps' ] ) ) conf.write_config_header('config.h', remove=False) - + print('') def build(bld): @@ -101,5 +101,5 @@ src/main.C bld.install_as('${DATADIR}/pixmaps/' + APPNAME + '/icon-256x256.png', 'icons/hicolor/256x256/apps/' + APPNAME + '.png') - bld.install_files( string.join( [ '${DATADIR}/doc', APPNAME ], '/' ), bld.path.ant_glob( 'doc/*.html doc/*.png' ) ) - + bld.install_files( '/'.join( [ '${DATADIR}/doc', APPNAME ] ), bld.path.ant_glob( 'doc/*.html doc/*.png' ) ) + diff --git a/wscript b/wscript index c9ae448..9a552fc 100644 --- a/wscript +++ b/wscript @@ -20,7 +20,7 @@ def options(opt): opt.add_option('--enable-debug', action='store_true', default=False, dest='debug', help='Build for debugging') opt.add_option('--project', action='store', default=False, dest='project', - help='Limit build to a single project (' + string.join( projects, ', ' ) + ')') + help='Limit build to a single project (' + ', '.join( projects ) + ')') for i in projects: opt.recurse(i)