From e4daee0d8f5b1ab7d62f9c4c40a49c56a87ae0af Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Mon, 21 Oct 2024 21:52:07 +0200 Subject: [PATCH 1/5] wscript: Address some pyflakes warnings Keep it tidy. --- libs/aaf/wscript | 1 - libs/appleutility/wscript | 1 - libs/surfaces/console1/wscript | 1 - 3 files changed, 3 deletions(-) diff --git a/libs/aaf/wscript b/libs/aaf/wscript index 491c3b8c97e..b8b10e4093f 100644 --- a/libs/aaf/wscript +++ b/libs/aaf/wscript @@ -1,6 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -import os # Version of this package (even if built as a child) LIBAAF_VERSION = '0.0.0' diff --git a/libs/appleutility/wscript b/libs/appleutility/wscript index 6136aafc719..ff8af1e8e49 100644 --- a/libs/appleutility/wscript +++ b/libs/appleutility/wscript @@ -1,6 +1,5 @@ #!/usr/bin/env python from waflib.extras import autowaf as autowaf -from waflib import Options import os libappleutility_sources = [ diff --git a/libs/surfaces/console1/wscript b/libs/surfaces/console1/wscript index ac26bf386f2..dbf685c895f 100644 --- a/libs/surfaces/console1/wscript +++ b/libs/surfaces/console1/wscript @@ -1,5 +1,4 @@ #!/usr/bin/env python -from waflib.extras import autowaf as autowaf import os def options(opt): From 0c7dad63c0db9a5b8625e0de76443106be541c58 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Thu, 19 May 2022 21:57:57 +0200 Subject: [PATCH 2/5] wscript: Rename lwrcase_dirname (with values like "ardourX") to INTERNAL_NAME The build system does a lot all over to keep ardour8 (almost) without file name conflicts if installed next to ardour9. Often by appending MAJOR in lots of places. lwrcase_dirname was just 'ardour' + MAJOR. The naming of lwrcase_dirname did not say much about what it was, and it was only defined locally in build(). We set INTERNAL_NAME globally in configure(), exactly like MAJOR is set. INTERNAL_NAME is similar to the existing PROGRAM_NAME, which contains the visible name. INTERNAL_NAME is however more intended to be used for namespacing installed files. We will soon use it in a lot of places where MAJOR used to be used. The end goal is to make sure there only is one place where the "ardour"+major naming policy is hardcoded. And to make it configurable instead of hardcoded. Things should not be repeated so they are hard to change, and they should not be hardcoded. The policy of including the major version in the internal name is not necessarily relevant when always using latest version. Most programs don't do that. But also, if there for some reason should be a need to install several minor versions side by side, then it would be relevant to include both the major and the minor number. --- gtk2_ardour/wscript | 10 +++++----- libs/ardour/wscript | 2 +- libs/auscan/wscript | 2 +- libs/fst/wscript | 4 ++-- wscript | 11 ++++------- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 505876e172a..04e29ad407d 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -881,8 +881,8 @@ def build(bld): # Freedesktop freedesktop_subst_dict = { - 'ARDOUR_EXEC' : bld.env['lwrcase_dirname'], - 'ARDOUR_ICON' : bld.env['lwrcase_dirname'], + 'ARDOUR_EXEC' : bld.env['INTERNAL_NAME'], + 'ARDOUR_ICON' : bld.env['INTERNAL_NAME'], 'VERSION': bld.env['VERSION'], 'DATE': bld.env['DATE'], } @@ -890,7 +890,7 @@ def build(bld): if bld.env['FREEDESKTOP']: obj = bld(features = 'subst') obj.source = 'ardour.desktop.in' - obj.target = bld.env['lwrcase_dirname'] + '.desktop' + obj.target = bld.env['INTERNAL_NAME'] + '.desktop' obj.chmod = Utils.O644 obj.dict = freedesktop_subst_dict set_subst_dict(obj, freedesktop_subst_dict) @@ -907,14 +907,14 @@ def build(bld): appdata_i18n_xmlin(bld) obj = bld(features = 'subst') obj.source = 'ardour.appdata.xml.in' - obj.target = bld.env['lwrcase_dirname'] + '.appdata.xml' + obj.target = bld.env['INTERNAL_NAME'] + '.appdata.xml' obj.chmod = Utils.O644 obj.dict = freedesktop_subst_dict set_subst_dict(obj, freedesktop_subst_dict) bld.install_files (os.path.join (bld.env['PREFIX'], 'share/appdata'), obj.target) # install desktop icon files - icon_file_name = bld.env['lwrcase_dirname'] + '.png' + icon_file_name = bld.env['INTERNAL_NAME'] + '.png' bld.install_as('${PREFIX}/share/icons/hicolor/16x16/apps/' + icon_file_name, 'resources/Ardour-icon_16px.png') bld.install_as('${PREFIX}/share/icons/hicolor/22x22/apps/'+ icon_file_name, 'resources/Ardour-icon_22px.png') bld.install_as('${PREFIX}/share/icons/hicolor/32x32/apps/'+ icon_file_name, 'resources/Ardour-icon_32px.png') diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 780d5f876a4..a197fc03348 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -425,7 +425,7 @@ def build(bld): 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', - 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"' + 'LIBARDOUR="' + bld.env['INTERNAL_NAME'] + '"' ] if bld.is_defined('HAVE_SOUNDTOUCH'): diff --git a/libs/auscan/wscript b/libs/auscan/wscript index 3564f3c2b27..d8b67c76e73 100644 --- a/libs/auscan/wscript +++ b/libs/auscan/wscript @@ -20,7 +20,7 @@ def build(bld): 'AU_SCANNER_APP', 'VERSIONSTRING="' + bld.env['VERSION'] + '"', 'PACKAGE="' + I18N_PACKAGE + bld.env['MAJOR'] + '"', - 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"', + 'LIBARDOUR="' + bld.env['INTERNAL_NAME'] + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', ] obj.use = [ 'libpbd', 'libappleutility', 'libtemporal', 'libevoral' ] diff --git a/libs/fst/wscript b/libs/fst/wscript index d0d0ee72a0b..b2bdab1bff0 100644 --- a/libs/fst/wscript +++ b/libs/fst/wscript @@ -23,7 +23,7 @@ def build(bld): 'VST3_SCANNER_APP', 'VERSIONSTRING="' + bld.env['VERSION'] + '"', 'PACKAGE="' + I18N_PACKAGE + bld.env['MAJOR'] + '"', - 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"', + 'LIBARDOUR="' + bld.env['INTERNAL_NAME'] + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', ] obj.use = [ 'libpbd' ] @@ -65,7 +65,7 @@ def build(bld): 'USE_WS_PREFIX', 'VST_SCANNER_APP', 'PACKAGE="' + I18N_PACKAGE + bld.env['MAJOR'] + '"', - 'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"', + 'LIBARDOUR="' + bld.env['INTERNAL_NAME'] + '"', 'VERSIONSTRING="' + bld.env['VERSION'] + '"', ] if re.search ("bsd", sys.platform) != None: diff --git a/wscript b/wscript index 44702d2e9b2..018ecca82ae 100644 --- a/wscript +++ b/wscript @@ -971,6 +971,7 @@ def configure(conf): conf.env['MAJOR'] = MAJOR conf.env['MINOR'] = MINOR conf.env['MICRO'] = MICRO + conf.env['INTERNAL_NAME'] = 'ardour' + MAJOR conf.line_just = 52 autowaf.set_recursive() autowaf.configure(conf) @@ -1590,18 +1591,14 @@ def build(bld): #if bld.is_defined('YTK'): # bld.path.find_dir ('libs/tk/ztkmm') - # set up target directories - lwrcase_dirname = 'ardour' + bld.env['MAJOR'] - # configuration files go here - bld.env['CONFDIR'] = os.path.join(bld.env['SYSCONFDIR'], lwrcase_dirname) + bld.env['CONFDIR'] = os.path.join(bld.env['SYSCONFDIR'], bld.env['INTERNAL_NAME']) # data files loaded at run time go here - bld.env['DATADIR'] = os.path.join(bld.env['DATADIR'], lwrcase_dirname) + bld.env['DATADIR'] = os.path.join(bld.env['DATADIR'], bld.env['INTERNAL_NAME']) # shared objects loaded at runtime go here (two aliases) - bld.env['DLLDIR'] = os.path.join(bld.env['LIBDIR'], lwrcase_dirname) + bld.env['DLLDIR'] = os.path.join(bld.env['LIBDIR'], bld.env['INTERNAL_NAME']) bld.env['LIBDIR'] = bld.env['DLLDIR'] bld.env['LOCALEDIR'] = os.path.join(bld.env['DATADIR'], 'locale') - bld.env['lwrcase_dirname'] = lwrcase_dirname autowaf.set_recursive() From d4891db6c1eb763d3a20885a618fd967b1798b08 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Thu, 19 May 2022 19:38:15 +0200 Subject: [PATCH 3/5] wscript: Use INTERNAL_NAME instead of 'ardour' + MAJOR Replace repeated hardcoded appending of MAJOR with reuse of the existing computed name, which is as available in env, exactly as MAJOR was. Note: INTERNAL_NAME will sometimes be used with a prefix like 'gtk2_' or 'lib', or a suffix like '-lua'. --- gtk2_ardour/wscript | 12 ++++++------ libs/ardour/wscript | 22 ++++++++++------------ luasession/wscript | 4 ++-- wscript | 2 +- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 04e29ad407d..ba138e7f378 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -520,7 +520,7 @@ def configure(conf): conf.env['define_key'] = bak def build(bld): - I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + I18N_PACKAGE = 'gtk2_' + bld.env['INTERNAL_NAME'] # Tool to dump lua-bindings (of gtk2ardour + libs) if re.search ("linux", sys.platform) != None and bld.env['LUABINDINGDOC']: @@ -754,7 +754,7 @@ def build(bld): obj = bld(features = 'subst') obj.source = 'ardour.sh.in' - obj.target = 'ardour' + bld.env['MAJOR'] + obj.target = bld.env['INTERNAL_NAME'] obj.chmod = Utils.O755 obj.dict = wrapper_subst_dict obj.install_path = bld.env['BINDIR'] @@ -969,7 +969,7 @@ def build(bld): mo) def i18n_func(bld): - I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + I18N_PACKAGE = 'gtk2_' + bld.env['INTERNAL_NAME'] autowaf.build_i18n(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, 'Paul Davis') appdata_i18n_pot(bld) @@ -977,19 +977,19 @@ def i18n_func(bld): appdata_i18n_mo(bld) def i18n_pot_func(bld): - I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + I18N_PACKAGE = 'gtk2_' + bld.env['INTERNAL_NAME'] autowaf.build_i18n_pot(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, 'Paul Davis') appdata_i18n_pot(bld) def i18n_po_func(bld): - I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + I18N_PACKAGE = 'gtk2_' + bld.env['INTERNAL_NAME'] autowaf.build_i18n_po(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, 'Paul Davis') appdata_i18n_po(bld) def i18n_mo_func(bld): - I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + I18N_PACKAGE = 'gtk2_' + bld.env['INTERNAL_NAME'] autowaf.build_i18n_mo(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, 'Paul Davis') diff --git a/libs/ardour/wscript b/libs/ardour/wscript index a197fc03348..ba9da6469b3 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -7,8 +7,6 @@ import re # default state file version for this build CURRENT_SESSION_FILE_VERSION = 7003 -I18N_PACKAGE = 'ardour' - libardour_sources = [ 'amp.cc', 'analyser.cc', @@ -421,7 +419,7 @@ def build(bld): obj.vnum = LIBARDOUR_LIB_VERSION obj.install_path = bld.env['LIBDIR'] obj.defines += [ - 'PACKAGE="' + I18N_PACKAGE + bld.env['MAJOR'] + '"', + 'PACKAGE="' + bld.env['INTERNAL_NAME'] + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', @@ -592,7 +590,7 @@ def build(bld): mo_files = bld.path.ant_glob('po/*.mo') for mo in mo_files: lang = os.path.basename(mo.srcpath()).replace('.mo', '') - bld.install_as(os.path.join(bld.env['LOCALEDIR'], lang, 'LC_MESSAGES', I18N_PACKAGE + bld.env['MAJOR'] + '.mo'), + bld.install_as(os.path.join(bld.env['LOCALEDIR'], lang, 'LC_MESSAGES', bld.env['INTERNAL_NAME'] + '.mo'), mo) if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): @@ -610,7 +608,7 @@ def build(bld): else: testcommon.use.extend(['libltc', 'librubberband', 'libfluidsynth']) testcommon.defines = [ - 'PACKAGE="libardour' + bld.env['MAJOR'] + 'test"', + 'PACKAGE="lib' + bld.env['INTERNAL_NAME'] + 'test"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', @@ -686,7 +684,7 @@ def build(bld): load_save_session.target = 'load-save-session' load_save_session.install_path = '' load_save_session.defines = [ - 'PACKAGE="libardour' + bld.env['MAJOR'] + 'profile"', + 'PACKAGE="lib' + bld.env['INTERNAL_NAME'] + 'profile"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', @@ -712,7 +710,7 @@ def build(bld): profilingobj.target = p profilingobj.install_path = '' profilingobj.defines = [ - 'PACKAGE="libardour' + bld.env['MAJOR'] + 'profile"', + 'PACKAGE="lib' + bld.env['INTERNAL_NAME'] + 'profile"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', @@ -730,24 +728,24 @@ def create_ardour_test_program(bld, includes, name, target, sources): # not sure about install path testobj.install_path = bld.env['LIBDIR'] testobj.defines = [ - 'PACKAGE="libardour' + bld.env['MAJOR'] + 'test"', + 'PACKAGE="lib' + bld.env['INTERNAL_NAME'] + 'test"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', ] def i18n_func(bld): - autowaf.build_i18n(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources, + autowaf.build_i18n(bld, '.', 'libs/ardour', bld.env['INTERNAL_NAME'], libardour_sources, 'Paul Davis') def i18n_pot_func(bld): - autowaf.build_i18n_pot(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources, + autowaf.build_i18n_pot(bld, '.', 'libs/ardour', bld.env['INTERNAL_NAME'], libardour_sources, 'Paul Davis') def i18n_po_func(bld): - autowaf.build_i18n_po(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources, + autowaf.build_i18n_po(bld, '.', 'libs/ardour', bld.env['INTERNAL_NAME'], libardour_sources, 'Paul Davis') def i18n_mo_func(bld): - autowaf.build_i18n_mo(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources, + autowaf.build_i18n_mo(bld, '.', 'libs/ardour', bld.env['INTERNAL_NAME'], libardour_sources, 'Paul Davis') diff --git a/luasession/wscript b/luasession/wscript index 0180f87b987..b6eee0fc56e 100644 --- a/luasession/wscript +++ b/luasession/wscript @@ -22,7 +22,7 @@ def build(bld): if bld.env['build_target'] != 'mingw': obj = bld(features = 'subst') obj.source = 'ardour-lua.sh.in' - obj.target = 'ardour' + bld.env['MAJOR'] + '-lua' + obj.target = bld.env['INTERNAL_NAME'] + '-lua' obj.chmod = Utils.O755 obj.install_path = bld.env['BINDIR'] obj.LIBDIR = os.path.normpath(bld.env['DLLDIR']) @@ -75,6 +75,6 @@ def build(bld): if bld.env['build_target'] == 'mingw': obj.install_path = bld.env['BINDIR'] - obj.target = 'ardour' + bld.env['MAJOR'] + '-lua' + obj.target = bld.env['INTERNAL_NAME'] + '-lua' else: obj.install_path = bld.env['DLLDIR'] diff --git a/wscript b/wscript index 018ecca82ae..dd67382b07d 100644 --- a/wscript +++ b/wscript @@ -1032,7 +1032,7 @@ def configure(conf): if Options.options.lv2dir: conf.env['LV2DIR'] = Options.options.lv2dir else: - conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], 'ardour' + conf.env['MAJOR'], 'LV2') + conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], conf.env['INTERNAL_NAME'], 'LV2') conf.env['LV2DIR'] = os.path.normpath(conf.env['LV2DIR']) From ca7abae1bc26bb01b87e5de79fe703a82c85e2c8 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Thu, 19 May 2022 19:38:15 +0200 Subject: [PATCH 4/5] wscript: Use INTERNAL_NAME instead of session_utils pgmprefix Replace a redundant custom computation with the existing computed name. --- session_utils/wscript | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/session_utils/wscript b/session_utils/wscript index e15a4bb5ed2..12423e6bb0d 100644 --- a/session_utils/wscript +++ b/session_utils/wscript @@ -16,14 +16,12 @@ def configure(conf): autowaf.display_msg(conf, 'build session-utils', 'yes') def build_ardour_util(bld, util): - pgmprefix = bld.env['PROGRAM_NAME'].lower() + bld.env['MAJOR'] - # just the normal executable version of the GTK GUI obj = bld (features = 'cxx c cxxprogram') # this program does not do the whole hidden symbols thing obj.cxxflags = [ '-fvisibility=default' ] obj.source = ['common.cc', util + '.cc' ] - obj.target = pgmprefix + '-' + util + obj.target = bld.env['INTERNAL_NAME'] + '-' + util obj.includes = ['.'] obj.use = [ 'libpbd', 'libardour', @@ -33,7 +31,7 @@ def build_ardour_util(bld, util): ] obj.defines = [ 'VERSIONSTRING="' + bld.env['VERSION'] + '"', - 'UTILNAME="' + str(pgmprefix + '-' + util) + '"', + 'UTILNAME="' + bld.env['INTERNAL_NAME'] + '-' + util + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', @@ -69,15 +67,13 @@ def build(bld): if not "dummy" in bld.env['BACKENDS']: return - pgmprefix = bld.env['PROGRAM_NAME'].lower() + bld.env['MAJOR'] - utils = bld.path.ant_glob('[a-z]*.cc', excl=['example.cc', 'common.cc']) for util in utils: fn = os.path.splitext(os.path.basename(str(util)))[0] build_ardour_util(bld, fn) if bld.env['build_target'] != 'mingw': - bld.symlink_as(bld.env['BINDIR'] + '/' + pgmprefix + "-" + fn, bld.env['LIBDIR'] + '/utils/ardour-util.sh') + bld.symlink_as(bld.env['BINDIR'] + '/' + bld.env['INTERNAL_NAME'] + "-" + fn, bld.env['LIBDIR'] + '/utils/ardour-util.sh') if bld.env['build_target'] == 'mingw': return From df529780c65db437f9176399e3a4ffb5581a1252 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Wed, 23 Oct 2024 22:55:29 +0200 Subject: [PATCH 5/5] wscript: Use INTERNAL_NAME instead of setting I18N_PACKAGE = 'ardour' and appending MAJOR --- libs/auscan/wscript | 5 +---- libs/fst/wscript | 7 ++----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/libs/auscan/wscript b/libs/auscan/wscript index d8b67c76e73..07ba73cd5bf 100644 --- a/libs/auscan/wscript +++ b/libs/auscan/wscript @@ -1,9 +1,6 @@ #!/usr/bin/env python import os -# needed for code used from libardour -I18N_PACKAGE = 'ardour' - def options(opt): pass @@ -19,7 +16,7 @@ def build(bld): obj.defines = [ 'AU_SCANNER_APP', 'VERSIONSTRING="' + bld.env['VERSION'] + '"', - 'PACKAGE="' + I18N_PACKAGE + bld.env['MAJOR'] + '"', + 'PACKAGE="' + bld.env['INTERNAL_NAME'] + '"', 'LIBARDOUR="' + bld.env['INTERNAL_NAME'] + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', ] diff --git a/libs/fst/wscript b/libs/fst/wscript index b2bdab1bff0..4b67a15f552 100644 --- a/libs/fst/wscript +++ b/libs/fst/wscript @@ -3,9 +3,6 @@ import os import sys import re -# needed for code used from libardour -I18N_PACKAGE = 'ardour' - def options(opt): pass @@ -22,7 +19,7 @@ def build(bld): obj.defines = [ 'VST3_SCANNER_APP', 'VERSIONSTRING="' + bld.env['VERSION'] + '"', - 'PACKAGE="' + I18N_PACKAGE + bld.env['MAJOR'] + '"', + 'PACKAGE="' + bld.env['INTERNAL_NAME'] + '"', 'LIBARDOUR="' + bld.env['INTERNAL_NAME'] + '"', 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', ] @@ -64,7 +61,7 @@ def build(bld): '_POSIX_SOURCE', 'USE_WS_PREFIX', 'VST_SCANNER_APP', - 'PACKAGE="' + I18N_PACKAGE + bld.env['MAJOR'] + '"', + 'PACKAGE="' + bld.env['INTERNAL_NAME'] + '"', 'LIBARDOUR="' + bld.env['INTERNAL_NAME'] + '"', 'VERSIONSTRING="' + bld.env['VERSION'] + '"', ]