ardour/livetrax
13
0
Fork 0
Code

wscript: inline top = '.' for build_i18n

Browse Source 
'top' was a constant that was set to '.', even when inside
subdirectories. It is thus not really top.

I don't know if the intent was to use the actual top (which is available
as bld.top_dir), but for now we make it explicit what we have and do.
This commit is contained in:
Mads Kiilerich 2022-01-24 22:24:13 +01:00 committed by Paul Davis
parent 5d5aa61e0f
commit 69e987909e
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/wscript
View File

@ -9,7 +9,6 @@ import subprocess
import glob import glob
# Mandatory variables # Mandatory variables
top = '.'
out = 'build' out = 'build'
@TaskGen.extension('.m') @TaskGen.extension('.m')
@ -921,26 +920,26 @@ def build(bld):
def i18n(bld): def i18n(bld):
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, autowaf.build_i18n(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
'Paul Davis') 'Paul Davis')
appdata_i18n_pot(bld) appdata_i18n_pot(bld)
appdata_i18n_po(bld) appdata_i18n_po(bld)
def i18n_pot(bld): def i18n_pot(bld):
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, autowaf.build_i18n_pot(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
'Paul Davis') 'Paul Davis')
appdata_i18n_pot(bld) appdata_i18n_pot(bld)
def i18n_po(bld): def i18n_po(bld):
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, autowaf.build_i18n_po(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
'Paul Davis') 'Paul Davis')
appdata_i18n_po(bld) appdata_i18n_po(bld)
def i18n_mo(bld): def i18n_mo(bld):
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, autowaf.build_i18n_mo(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
'Paul Davis') 'Paul Davis')
def appdata_i18n_pot(bld): def appdata_i18n_pot(bld):

9
libs/ardour/wscript
View File

@ -10,7 +10,6 @@ CURRENT_SESSION_FILE_VERSION = 7002
I18N_PACKAGE = 'ardour' I18N_PACKAGE = 'ardour'
# Mandatory variables # Mandatory variables
top = '.'
out = 'build' out = 'build'
path_prefix = 'libs/ardour/' path_prefix = 'libs/ardour/'
@ -728,17 +727,17 @@ def shutdown():
autowaf.shutdown() autowaf.shutdown()
def i18n(bld): def i18n(bld):
autowaf.build_i18n(bld, top, 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources, autowaf.build_i18n(bld, '.', 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources,
'Paul Davis') 'Paul Davis')
def i18n_pot(bld): def i18n_pot(bld):
autowaf.build_i18n(bld, top, 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources, autowaf.build_i18n(bld, '.', 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources,
'Paul Davis') 'Paul Davis')
def i18n_po(bld): def i18n_po(bld):
autowaf.build_i18n_po(bld, top, 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources, autowaf.build_i18n_po(bld, '.', 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources,
'Paul Davis') 'Paul Davis')
def i18n_mo(bld): def i18n_mo(bld):
autowaf.build_i18n_mo(bld, top, 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources, autowaf.build_i18n_mo(bld, '.', 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources,
'Paul Davis') 'Paul Davis')

9
libs/gtkmm2ext/wscript
View File

@ -48,7 +48,6 @@ gtkmm2ext_sources = [
] ]
# Mandatory variables # Mandatory variables
top = '.'
out = 'build' out = 'build'
path_prefix = 'libs/gtkmm2ext/' path_prefix = 'libs/gtkmm2ext/'
@ -100,19 +99,19 @@ def build(bld):
mo) mo)
def i18n(bld): def i18n(bld):
autowaf.build_i18n(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources, autowaf.build_i18n(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
'Paul Davis') 'Paul Davis')
def i18n_pot(bld): def i18n_pot(bld):
autowaf.build_i18n_pot(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources, autowaf.build_i18n_pot(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
'Paul Davis') 'Paul Davis')
def i18n_po(bld): def i18n_po(bld):
autowaf.build_i18n_po(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources, autowaf.build_i18n_po(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
'Paul Davis') 'Paul Davis')
def i18n_mo(bld): def i18n_mo(bld):
autowaf.build_i18n_mo(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources, autowaf.build_i18n_mo(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
'Paul Davis') 'Paul Davis')
def shutdown(): def shutdown():