The Birdfont Source Code


All Repositories / birdfont.git / commitdiff – RSS feed

Fix travis build

These changes was commited to the Birdfont repository Thu, 07 Jul 2016 15:25:33 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
[Thu, 07 Jul 2016 15:25:33 +0000]

Updated Files

build.py
dodo.py
diff --git a/build.py b/build.py
--- a/build.py +++ b/build.py @@ -9,8 +9,9 @@ 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 @@ 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',
diff --git a/dodo.py b/dodo.py
--- a/dodo.py +++ b/dodo.py @@ -389,7 +389,7 @@ --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 @@ 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 + """\