ardour/livetrax
13
0
Fork 0
Code

wscript: drop str() on VERSION

Browse Source 
It will already have been converted to str in sanitize(), and even
python2 is fine without the extra str.
This commit is contained in:
Mads Kiilerich 2022-10-15 14:05:36 +02:00 committed by Paul Davis
parent 2bb311f99b
commit 0e3e51d958
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/wscript
View File

@ -479,7 +479,7 @@ def configure(conf):
conf.write_config_header('gtk2ardour-config.h', remove=False) conf.write_config_header('gtk2ardour-config.h', remove=False)
bak = conf.env['define_key'] bak = conf.env['define_key']
conf.define('VERSIONSTRING', str (conf.env['VERSION'])) conf.define('VERSIONSTRING', conf.env['VERSION'])
conf.define('CODENAME', enoify(int(conf.env['MAJOR']), int(conf.env['MINOR']))) conf.define('CODENAME', enoify(int(conf.env['MAJOR']), int(conf.env['MINOR'])))
conf.env['define_key'] = ['VERSIONSTRING', 'CODENAME' ] conf.env['define_key'] = ['VERSIONSTRING', 'CODENAME' ]
conf.write_config_header('gtk2ardour-version.h') conf.write_config_header('gtk2ardour-version.h')
@ -575,7 +575,7 @@ def build(bld):
# operate on copy to avoid adding sources twice # operate on copy to avoid adding sources twice
obj.source = list(gtk2_ardour_sources) obj.source = list(gtk2_ardour_sources)
obj.target = 'ardour-' + str (bld.env['VERSION']) obj.target = 'ardour-' + bld.env['VERSION']
obj.includes = ['.'] obj.includes = ['.']
if bld.is_defined('WINDOWS_VST_SUPPORT'): if bld.is_defined('WINDOWS_VST_SUPPORT'):
@ -678,8 +678,8 @@ def build(bld):
'DATADIR' : os.path.normpath(bld.env['DATADIR']), 'DATADIR' : os.path.normpath(bld.env['DATADIR']),
'CONFDIR' : os.path.normpath(bld.env['CONFDIR']), 'CONFDIR' : os.path.normpath(bld.env['CONFDIR']),
'LIBS' : 'build/libs', 'LIBS' : 'build/libs',
'VERSION' : str (bld.env['VERSION']), 'VERSION' : bld.env['VERSION'],
'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + str (bld.env['VERSION']) 'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION']
} }
def set_subst_dict(obj, dict): def set_subst_dict(obj, dict):
@ -829,7 +829,7 @@ def build(bld):
freedesktop_subst_dict = { freedesktop_subst_dict = {
'ARDOUR_EXEC' : str (bld.env['lwrcase_dirname']), 'ARDOUR_EXEC' : str (bld.env['lwrcase_dirname']),
'ARDOUR_ICON' : str (bld.env['lwrcase_dirname']), 'ARDOUR_ICON' : str (bld.env['lwrcase_dirname']),
'VERSION': str (bld.env['VERSION']), 'VERSION': bld.env['VERSION'],
'DATE': str (bld.env['DATE']), 'DATE': str (bld.env['DATE']),
} }

4
headless/wscript
View File

@ -19,7 +19,7 @@ def build(bld):
# this program does not do the whole hidden symbols thing # this program does not do the whole hidden symbols thing
obj.cxxflags = [ '-fvisibility=default' ] obj.cxxflags = [ '-fvisibility=default' ]
obj.source = hardour_sources obj.source = hardour_sources
obj.target = 'hardour-' + str (bld.env['VERSION']) obj.target = 'hardour-' + bld.env['VERSION']
obj.includes = ['.'] obj.includes = ['.']
obj.use = [ 'libpbd', obj.use = [ 'libpbd',
'libardour', 'libardour',
@ -29,7 +29,7 @@ def build(bld):
] ]
obj.defines = [ obj.defines = [
'VERSIONSTRING="' + str(bld.env['VERSION']) + '"', 'VERSIONSTRING="' + bld.env['VERSION'] + '"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',

2
libs/auscan/wscript
View File

@ -18,7 +18,7 @@ def build(bld):
obj.includes = [ '../pbd/', '../ardour/', '..' ] obj.includes = [ '../pbd/', '../ardour/', '..' ]
obj.defines = [ obj.defines = [
'AU_SCANNER_APP', 'AU_SCANNER_APP',
'VERSIONSTRING="' + str(bld.env['VERSION']) + '"', 'VERSIONSTRING="' + bld.env['VERSION'] + '"',
'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"', 'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"',
'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"', 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',

4
libs/fst/wscript
View File

@ -21,7 +21,7 @@ def build(bld):
obj.includes = [ '../pbd/', '../ardour/', '../vst3/', '..' ] obj.includes = [ '../pbd/', '../ardour/', '../vst3/', '..' ]
obj.defines = [ obj.defines = [
'VST3_SCANNER_APP', 'VST3_SCANNER_APP',
'VERSIONSTRING="' + str(bld.env['VERSION']) + '"', 'VERSIONSTRING="' + bld.env['VERSION'] + '"',
'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"', 'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"',
'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"', 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
@ -66,7 +66,7 @@ def build(bld):
'VST_SCANNER_APP', 'VST_SCANNER_APP',
'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"', 'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"',
'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"', 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"',
'VERSIONSTRING="' + str(bld.env['VERSION']) + '"', 'VERSIONSTRING="' + bld.env['VERSION'] + '"',
] ]
if re.search ("bsd", sys.platform) != None: if re.search ("bsd", sys.platform) != None:
obj.defines.append('_POSIX_C_SOURCE=200809') obj.defines.append('_POSIX_C_SOURCE=200809')

2
luasession/wscript
View File

@ -42,7 +42,7 @@ def build(bld):
'libmidipp', 'libmidipp',
] ]
obj.defines = [ obj.defines = [
'VERSIONSTRING="' + str(bld.env['VERSION']) + '"', 'VERSIONSTRING="' + bld.env['VERSION'] + '"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',

2
session_utils/wscript
View File

@ -32,7 +32,7 @@ def build_ardour_util(bld, util):
'libmidipp', 'libmidipp',
] ]
obj.defines = [ obj.defines = [
'VERSIONSTRING="' + str(bld.env['VERSION']) + '"', 'VERSIONSTRING="' + bld.env['VERSION'] + '"',
'UTILNAME="' + str(pgmprefix + '-' + util) + '"', 'UTILNAME="' + str(pgmprefix + '-' + util) + '"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',

2
tools/bb/wscript
View File

@ -23,7 +23,7 @@ def build(bld):
'DATADIR' : os.path.normpath(bld.env['DATADIR']), 'DATADIR' : os.path.normpath(bld.env['DATADIR']),
'CONFDIR' : os.path.normpath(bld.env['CONFDIR']), 'CONFDIR' : os.path.normpath(bld.env['CONFDIR']),
'LIBS' : 'build/libs', 'LIBS' : 'build/libs',
'VERSION' : str (bld.env['VERSION']), 'VERSION' : bld.env['VERSION'],
'EXECUTABLE' : 'build/tools/bb/bb' 'EXECUTABLE' : 'build/tools/bb/bb'
} }