Skip to content

Commit afac25c

Browse files
committed
wscript: the i18n worker functions do not define the i18n waf commands
Rename the worker functions to make it clear that their name in this case isn't magic. These functions "are not" the waf commands. It is the custom build context class definitions that define the i18n commands ... which will invoke these top level worker functions which in turn invoke the others recursively. The bare printing of the build environment in the top level i18n command seems to be old debug code that safely can be removed.
1 parent 4ef72df commit afac25c

File tree

5 files changed

+20
-24
lines changed

5 files changed

+20
-24
lines changed

gtk2_ardour/wscript

+4-4
Original file line numberDiff line numberDiff line change
@@ -968,26 +968,26 @@ def build(bld):
968968
bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
969969
mo)
970970

971-
def i18n(bld):
971+
def i18n_func(bld):
972972
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
973973
autowaf.build_i18n(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
974974
'Paul Davis')
975975
appdata_i18n_pot(bld)
976976
appdata_i18n_po(bld)
977977

978-
def i18n_pot(bld):
978+
def i18n_pot_func(bld):
979979
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
980980
autowaf.build_i18n_pot(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
981981
'Paul Davis')
982982
appdata_i18n_pot(bld)
983983

984-
def i18n_po(bld):
984+
def i18n_po_func(bld):
985985
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
986986
autowaf.build_i18n_po(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
987987
'Paul Davis')
988988
appdata_i18n_po(bld)
989989

990-
def i18n_mo(bld):
990+
def i18n_mo_func(bld):
991991
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
992992
autowaf.build_i18n_mo(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
993993
'Paul Davis')

libs/appleutility/wscript

-3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,3 @@ def build(bld):
4242
obj.name = 'libappleutility'
4343
obj.target = 'appleutility'
4444
obj.install_path = os.path.join(bld.env['LIBDIR'], 'appleutility')
45-
46-
def i18n(bld):
47-
pass

libs/ardour/wscript

+4-4
Original file line numberDiff line numberDiff line change
@@ -736,18 +736,18 @@ def create_ardour_test_program(bld, includes, name, target, sources):
736736
'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
737737
]
738738

739-
def i18n(bld):
739+
def i18n_func(bld):
740740
autowaf.build_i18n(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources,
741741
'Paul Davis')
742742

743-
def i18n_pot(bld):
743+
def i18n_pot_func(bld):
744744
autowaf.build_i18n(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources,
745745
'Paul Davis')
746746

747-
def i18n_po(bld):
747+
def i18n_po_func(bld):
748748
autowaf.build_i18n_po(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources,
749749
'Paul Davis')
750750

751-
def i18n_mo(bld):
751+
def i18n_mo_func(bld):
752752
autowaf.build_i18n_mo(bld, '.', 'libs/ardour', I18N_PACKAGE + bld.env['MAJOR'], libardour_sources,
753753
'Paul Davis')

libs/gtkmm2ext/wscript

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,18 @@ def build(bld):
9999
bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
100100
mo)
101101

102-
def i18n(bld):
102+
def i18n_func(bld):
103103
autowaf.build_i18n(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
104104
'Paul Davis')
105105

106-
def i18n_pot(bld):
106+
def i18n_pot_func(bld):
107107
autowaf.build_i18n_pot(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
108108
'Paul Davis')
109109

110-
def i18n_po(bld):
110+
def i18n_po_func(bld):
111111
autowaf.build_i18n_po(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
112112
'Paul Davis')
113113

114-
def i18n_mo(bld):
114+
def i18n_mo_func(bld):
115115
autowaf.build_i18n_mo(bld, '.', 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
116116
'Paul Davis')

wscript

+8-9
Original file line numberDiff line numberDiff line change
@@ -1638,31 +1638,30 @@ def build(bld):
16381638

16391639
class _i18n_build_context(BuildContext):
16401640
cmd = 'i18n'
1641-
fun = 'i18n'
1641+
fun = 'i18n_func'
16421642

1643-
def i18n(bld):
1644-
print(bld.env)
1643+
def i18n_func(bld):
16451644
bld.recurse (i18n_children)
16461645

16471646
class _i18n_pot_build_context(BuildContext):
16481647
cmd = 'i18n_pot'
1649-
fun = 'i18n_pot'
1648+
fun = 'i18n_pot_func'
16501649

1651-
def i18n_pot(bld):
1650+
def i18n_pot_func(bld):
16521651
bld.recurse (i18n_children)
16531652

16541653
class _i18n_po_build_context(BuildContext):
16551654
cmd = 'i18n_po'
1656-
fun = 'i18n_po'
1655+
fun = 'i18n_po_func'
16571656

1658-
def i18n_po(bld):
1657+
def i18n_po_func(bld):
16591658
bld.recurse (i18n_children)
16601659

16611660
class _i18n_mo_build_context(BuildContext):
16621661
cmd = 'i18n_mo'
1663-
fun = 'i18n_mo'
1662+
fun = 'i18n_mo_func'
16641663

1665-
def i18n_mo(bld):
1664+
def i18n_mo_func(bld):
16661665
bld.recurse (i18n_children)
16671666

16681667
def tarball(bld):

0 commit comments

Comments
 (0)