Commit 52e91ac
Fix travis build
Changed files (2)
Diff
@@ -9,8 +9,9 @@ from scripts.translations import compile_translations from scripts import version if platform == 'msys':- process_tasks(dodo.make_libbirdgems('libbirdgems.dll', [])) process_tasks(dodo.make_libbirdgems('libsvgbird.dll', []))+ process_tasks(dodo.task_svgbird_vapi())+ process_tasks(dodo.make_libbirdgems('libbirdgems.dll', [])) process_tasks(dodo.make_libbirdfont('libbirdfont.dll', ['libbirdgems.dll', 'libsvgbird.dll'])) process_tasks(dodo.make_libbirdfont('libbirdfont.dll', ['libbirdgems.dll', 'libsvgbird.dll'])) process_tasks(dodo.make_birdfont_test('birdfont-test.exe', @@ -20,11 +21,14 @@ elif platform == 'darwin': bird = "libbirdfont." + str(version.SO_VERSION) + '.dylib'; svg = "libsvgbird." + str(version.LIBSVGBIRD_SO_VERSION) + '.dylib'; process_tasks(dodo.make_libsvgbird(svg, []))+ process_tasks(dodo.task_svgbird_vapi()) process_tasks(dodo.make_libbirdgems(gems, [])) process_tasks(dodo.make_libbirdfont(bird, [gems])) process_tasks(dodo.task_man()) else: process_tasks(dodo.task_libsvgbird())+ process_tasks(dodo.task_svgbird_vapi())+ process_tasks(dodo.task_svgbird_vapi()) process_tasks(dodo.task_libbirdgems()) process_tasks(dodo.task_libbirdfont()) process_tasks(dodo.make_birdfont_test('birdfont-test', @@ -389,7 +389,7 @@ def make_libsvgbird(target_binary, deps): --pkg gio-2.0 \ --pkg cairo \ --pkg xmlbird \- --vapi=./svgbird.vapi \+ --vapi=./svgbird_generated.vapi \ """ cc_command = config.CC + " " + config.CFLAGS.get("libsvgbird", "") + """ \@@ -450,7 +450,8 @@ def task_svgbird_vapi(): yield { 'name': 'merge svgbird vapi', 'file_dep': ['build/libsvgbird/Object.c'],- 'actions': ['cat svgbirdpoint.vapi >> svgbird.vapi'],+ 'actions': ['cat svgbirdpoint.vapi > svgbird.vapi && cat svgbird_generated.vapi >> svgbird.vapi'],+ 'targets': ['svgbird vapi'] } def make_libbirdgems(target_binary, deps): valac_command = config.VALAC + """\