Skip to content

Commit 5fea940

Browse files
committed
wscript: the i18n worker functions doesn't 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 02d0cab commit 5fea940

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
@@ -962,26 +962,26 @@ def build(bld):
962962
bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
963963
mo)
964964

965-
def i18n(bld):
965+
def i18n_func(bld):
966966
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
967967
autowaf.build_i18n(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
968968
'Paul Davis')
969969
appdata_i18n_pot(bld)
970970
appdata_i18n_po(bld)
971971

972-
def i18n_pot(bld):
972+
def i18n_pot_func(bld):
973973
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
974974
autowaf.build_i18n_pot(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
975975
'Paul Davis')
976976
appdata_i18n_pot(bld)
977977

978-
def i18n_po(bld):
978+
def i18n_po_func(bld):
979979
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
980980
autowaf.build_i18n_po(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
981981
'Paul Davis')
982982
appdata_i18n_po(bld)
983983

984-
def i18n_mo(bld):
984+
def i18n_mo_func(bld):
985985
I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR']
986986
autowaf.build_i18n_mo(bld, '.', 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,
987987
'Paul Davis')

libs/appleutility/wscript

-3
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,3 @@ def build(bld):
5151
obj.name = 'libappleutility'
5252
obj.target = 'appleutility'
5353
obj.install_path = os.path.join(bld.env['LIBDIR'], 'appleutility')
54-
55-
def i18n(bld):
56-
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
@@ -1677,31 +1677,30 @@ def build(bld):
16771677

16781678
class _i18n_build_context(BuildContext):
16791679
cmd = 'i18n'
1680-
fun = 'i18n'
1680+
fun = 'i18n_func'
16811681

1682-
def i18n(bld):
1683-
print(bld.env)
1682+
def i18n_func(bld):
16841683
bld.recurse (i18n_children)
16851684

16861685
class _i18n_pot_build_context(BuildContext):
16871686
cmd = 'i18n_pot'
1688-
fun = 'i18n_pot'
1687+
fun = 'i18n_pot_func'
16891688

1690-
def i18n_pot(bld):
1689+
def i18n_pot_func(bld):
16911690
bld.recurse (i18n_children)
16921691

16931692
class _i18n_po_build_context(BuildContext):
16941693
cmd = 'i18n_po'
1695-
fun = 'i18n_po'
1694+
fun = 'i18n_po_func'
16961695

1697-
def i18n_po(bld):
1696+
def i18n_po_func(bld):
16981697
bld.recurse (i18n_children)
16991698

17001699
class _i18n_mo_build_context(BuildContext):
17011700
cmd = 'i18n_mo'
1702-
fun = 'i18n_mo'
1701+
fun = 'i18n_mo_func'
17031702

1704-
def i18n_mo(bld):
1703+
def i18n_mo_func(bld):
17051704
bld.recurse (i18n_children)
17061705

17071706
def tarball(bld):

0 commit comments

Comments
 (0)