mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wscripts for python3

This commit is contained in:
Jonathan Moore Liles 2012-11-16 17:20:20 -08:00
parent 47b82f0c9a
commit d97d1556d6
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mixer/wscript
View File

@ -29,9 +29,9 @@ def configure(conf):
atleast_version='0.4.0', mandatory=True) atleast_version='0.4.0', mandatory=True)
conf.define('VERSION', PACKAGE_VERSION) conf.define('VERSION', PACKAGE_VERSION)
conf.define('SYSTEM_PATH', string.join( [ conf.env.DATADIR, APPNAME ], '/' ) ) conf.define('SYSTEM_PATH', '/'.join( [ conf.env.DATADIR, APPNAME ] ) )
conf.define('DOCUMENT_PATH', string.join( [ conf.env.DATADIR, 'doc' ], '/' ) ) conf.define('DOCUMENT_PATH', '/'.join( [ conf.env.DATADIR, 'doc' ] ) )
conf.define('PIXMAP_PATH', string.join( [ conf.env.DATADIR, 'pixmaps' ], '/' ) ) conf.define('PIXMAP_PATH', '/'.join( [ conf.env.DATADIR, 'pixmaps' ] ) )
conf.write_config_header('config.h', remove=False) conf.write_config_header('config.h', remove=False)
@ -75,6 +75,6 @@ src/main.C
bld.install_as('${DATADIR}/pixmaps/' + APPNAME + '/icon-256x256.png', 'icons/hicolor/256x256/apps/' + APPNAME + '.png') 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 ) bld.symlink_as( '${BINDIR}/' + APPNAME + '-noui', APPNAME )

10
sequencer/wscript
View File

@ -29,9 +29,9 @@ def configure(conf):
atleast_version='2.0.0', args="--cflags --libs", mandatory=True) atleast_version='2.0.0', args="--cflags --libs", mandatory=True)
conf.define('VERSION', PACKAGE_VERSION) conf.define('VERSION', PACKAGE_VERSION)
conf.define('SYSTEM_PATH', string.join( [ conf.env.DATADIR, APPNAME ], '/' ) ) conf.define('SYSTEM_PATH', '/'.join( [ conf.env.DATADIR, APPNAME ] ) )
conf.define('DOCUMENT_PATH', string.join( [ conf.env.DATADIR, 'doc' ], '/' ) ) conf.define('DOCUMENT_PATH', '/'.join( [ conf.env.DATADIR, 'doc' ] ) )
conf.define('PIXMAP_PATH', string.join( [ conf.env.DATADIR, 'pixmaps' ], '/' ) ) conf.define('PIXMAP_PATH', '/'.join( [ conf.env.DATADIR, 'pixmaps' ] ) )
conf.write_config_header('config.h', remove=False) conf.write_config_header('config.h', remove=False)
@ -72,7 +72,7 @@ src/transport.C
uselib = [ 'JACK', 'SIGCPP', 'LIBLO', 'XPM', 'NTK', 'NTK_IMAGES'], uselib = [ 'JACK', 'SIGCPP', 'LIBLO', 'XPM', 'NTK', 'NTK_IMAGES'],
install_path = '${BINDIR}') 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' ) 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_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' ) )

8
session-manager/wscript
View File

@ -26,9 +26,9 @@ def configure(conf):
conf.load('gnu_dirs') conf.load('gnu_dirs')
conf.define('VERSION', PACKAGE_VERSION) conf.define('VERSION', PACKAGE_VERSION)
conf.define('SYSTEM_PATH', string.join( [ conf.env.DATADIR, APPNAME ], '/' ) ) conf.define('SYSTEM_PATH', '/'.join( [ conf.env.DATADIR, APPNAME ] ) )
conf.define('DOCUMENT_PATH', string.join( [ conf.env.DATADIR, 'doc' ], '/' ) ) conf.define('DOCUMENT_PATH', '/'.join( [ conf.env.DATADIR, 'doc' ] ) )
conf.define('PIXMAP_PATH', string.join( [ conf.env.DATADIR, 'pixmaps' ], '/' ) ) conf.define('PIXMAP_PATH', '/'.join( [ conf.env.DATADIR, 'pixmaps' ] ) )
conf.write_config_header('config.h', remove=False) conf.write_config_header('config.h', remove=False)
@ -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_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' ) )

8
timeline/wscript
View File

@ -34,9 +34,9 @@ def configure(conf):
atleast_version='1.0.17', mandatory=True) atleast_version='1.0.17', mandatory=True)
conf.define('VERSION', PACKAGE_VERSION) conf.define('VERSION', PACKAGE_VERSION)
conf.define('SYSTEM_PATH', string.join( [ conf.env.DATADIR, APPNAME ], '/' ) ) conf.define('SYSTEM_PATH', '/'.join( [ conf.env.DATADIR, APPNAME ] ) )
conf.define('DOCUMENT_PATH', string.join( [ conf.env.DATADIR, 'doc' ], '/' ) ) conf.define('DOCUMENT_PATH', '/'.join( [ conf.env.DATADIR, 'doc' ] ) )
conf.define('PIXMAP_PATH', string.join( [ conf.env.DATADIR, 'pixmaps' ], '/' ) ) conf.define('PIXMAP_PATH', '/'.join( [ conf.env.DATADIR, 'pixmaps' ] ) )
conf.write_config_header('config.h', remove=False) conf.write_config_header('config.h', remove=False)
@ -101,5 +101,5 @@ src/main.C
bld.install_as('${DATADIR}/pixmaps/' + APPNAME + '/icon-256x256.png', 'icons/hicolor/256x256/apps/' + APPNAME + '.png') 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' ) )

2
wscript
View File

@ -20,7 +20,7 @@ def options(opt):
opt.add_option('--enable-debug', action='store_true', default=False, dest='debug', opt.add_option('--enable-debug', action='store_true', default=False, dest='debug',
help='Build for debugging') help='Build for debugging')
opt.add_option('--project', action='store', default=False, dest='project', 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: for i in projects:
opt.recurse(i) opt.recurse(i)