smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

correct install location for .mo files (i18n) and cleanup LOCALEDIR use a bit

Browse source
This commit is contained in:
Paul Davis 2014-12-09 08:19:11 -05:00
parent 1648b94905
commit 246a4f3018
5 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gtk2_ardour/wscript
View file

@ -430,7 +430,7 @@ def build(bld):
'PACKAGE="' + I18N_PACKAGE + '"', 'PACKAGE="' + I18N_PACKAGE + '"',
'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.normpath(bld.env['LOCALEDIR']) + '"',
] ]
obj.install_path = bld.env['DLLDIR'] obj.install_path = bld.env['DLLDIR']
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL' obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
@ -674,9 +674,8 @@ def build(bld):
mo_files = bld.path.ant_glob('po/*.mo') mo_files = bld.path.ant_glob('po/*.mo')
for mo in mo_files: for mo in mo_files:
lang = os.path.basename(mo.srcpath()).replace('.mo', '') lang = os.path.basename(mo.srcpath()).replace('.mo', '')
bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale', bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'), mo)
mo)
def i18n(bld): def i18n(bld):
autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,

17
libs/ardour/wscript
View file

@ -369,7 +369,7 @@ def build(bld):
'PACKAGE="' + I18N_PACKAGE + '"', 'PACKAGE="' + I18N_PACKAGE + '"',
'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.normpath(bld.env['LOCALEDIR']) + '"',
'EVORAL_MIDI_XML=1', 'EVORAL_MIDI_XML=1',
] ]
@ -416,8 +416,7 @@ def build(bld):
mo_files = bld.path.ant_glob('po/*.mo') mo_files = bld.path.ant_glob('po/*.mo')
for mo in mo_files: for mo in mo_files:
lang = os.path.basename(mo.srcpath()).replace('.mo', '') lang = os.path.basename(mo.srcpath()).replace('.mo', '')
bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale', bld.install_as(os.path.join(bld.env['LOCALEDIR'], lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
mo) mo)
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'): if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
@ -439,8 +438,7 @@ def build(bld):
'PACKAGE="libardour3test"', 'PACKAGE="libardour3test"',
'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( 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
] ]
testcommon.name = 'testcommon' testcommon.name = 'testcommon'
@ -519,8 +517,7 @@ def build(bld):
'PACKAGE="libardour3profile"', 'PACKAGE="libardour3profile"',
'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( 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
] ]
if bld.env['FPU_OPTIMIZATION']: if bld.env['FPU_OPTIMIZATION']:
session_load_tester.source += [ 'sse_functions_xmm.cc' ] session_load_tester.source += [ 'sse_functions_xmm.cc' ]
@ -552,8 +549,7 @@ def build(bld):
'PACKAGE="libardour3profile"', 'PACKAGE="libardour3profile"',
'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( 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
] ]
if bld.env['FPU_OPTIMIZATION']: if bld.env['FPU_OPTIMIZATION']:
profilingobj.source += [ 'sse_functions_xmm.cc' ] profilingobj.source += [ 'sse_functions_xmm.cc' ]
@ -584,8 +580,7 @@ def create_ardour_test_program(bld, includes, name, target, sources):
'PACKAGE="libardour3test"', 'PACKAGE="libardour3test"',
'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( 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
] ]
def shutdown(): def shutdown():

7
libs/gtkmm2ext/wscript
View file

@ -118,10 +118,9 @@ def build(bld):
mo_files = bld.path.ant_glob('po/*.mo') mo_files = bld.path.ant_glob('po/*.mo')
for mo in mo_files: for mo in mo_files:
lang = os.path.basename(mo.srcpath()).replace('.mo', '') lang = os.path.basename(mo.srcpath()).replace('.mo', '')
bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale', bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'), mo)
mo)
def i18n(bld): def i18n(bld):
autowaf.build_i18n(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources, autowaf.build_i18n(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
'Paul Davis') 'Paul Davis')

2
libs/pbd/wscript
View file

@ -173,6 +173,6 @@ def build(bld):
testobj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"' ] testobj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw': if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw':
testobj.linkflags = ['-lrt'] testobj.linkflags = ['-lrt']
def shutdown(): def shutdown():
autowaf.shutdown() autowaf.shutdown()

1
wscript
View file

@ -918,6 +918,7 @@ def build(bld):
# shared objects loaded at runtime go here (two aliases) # 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'], lwrcase_dirname)
bld.env['LIBDIR'] = bld.env['DLLDIR'] bld.env['LIBDIR'] = bld.env['DLLDIR']
bld.env['LOCALEDIR'] = os.path.join(bld.env['DATADIR'], 'locale')
autowaf.set_recursive() autowaf.set_recursive()