Merge lp://staging/~3v1n0/libappindicator/vala-bindings-fixes into lp://staging/libappindicator

Proposed by Marco Trevisan (Treviño)
Status: Merged
Merged at revision: 184
Proposed branch: lp://staging/~3v1n0/libappindicator/vala-bindings-fixes
Merge into: lp://staging/libappindicator
Diff against target: 528 lines (+352/-29)
11 files modified
bindings/Makefile.am (+5/-2)
bindings/vala/Makefile.am (+36/-0)
bindings/vala/examples/Makefile.am (+14/-0)
bindings/vala/examples/indicator-example.vala (+64/-0)
configure.ac (+10/-0)
example/Makefile.am (+28/-1)
example/simple-client-vala.vala (+170/-0)
example/simple-client.c (+9/-0)
src/AppIndicator-0.1.metadata.in (+2/-0)
src/AppIndicator3-0.1.metadata.in (+3/-0)
src/Makefile.am (+11/-26)
To merge this branch: bzr merge lp://staging/~3v1n0/libappindicator/vala-bindings-fixes
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+48486@code.staging.launchpad.net

Description of the change

I've added proper support for vala bindings, fixing the gir include path, then now they are built in the bindings/vala subfolder and they include a *.deps file (so automatizing the inclusion of the proper gtk binding, when just using --pkg "appindicator-0.1" vala command line).

Plus, I've also added a small example (that is built only if valac is found in the system).

To post a comment you must log in.
184. By Marco Trevisan (Treviño)

Vala example: adding copyright message.

185. By Marco Trevisan (Treviño)

Vala example: indentation fixes

186. By Marco Trevisan (Treviño)

Vala example, changed copyright year

187. By Marco Trevisan (Treviño)

vala bindings makefile: just use deps file for dependencies

Revision history for this message
Ted Gould (ted) wrote :

I can't get this to run in "make distcheck" I get this error:

make[4]: Entering directory `/home/ted/Development/libappindicator/vala-bindings-fixes/libappindicator-0.2.92/_build/bindings/vala/examples'
/usr/bin/valac --pkg appindicator-0.1 --vapidir=../../../bindings/vala --save-temps ../../../../bindings/vala/examples/indicator-example.vala
../../../../bindings/vala/examples/indicator-example.vala:21.7-21.18: error: The namespace name `AppIndicator' could not be found
using AppIndicator;
      ^^^^^^^^^^^^
Compilation failed: 1 error(s), 0 warning(s)
make[4]: *** [indicator-example] Error 1

Which seems to be from the vapi file having the "App" namespace instead of the "AppIndicator" one when built in a separate directory. Can't figure out why though.

review: Needs Fixing
188. By Marco Trevisan (Treviño)

Include gir metadata file in built_sources

Now make distcheck will work ;)

189. By Marco Trevisan (Treviño)

Vala bindings: add metadata as build dependencies, support for gtk3

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks, I didn't test to build it in another builddir, I've fixed the issue using a workaround (basically vapigen needs a *.metadata file to be in the same directory of the *.gir file, and building it in a separate dir caused it not to be imported, using *.in files and copying them works as expected), plus I've added proper gtk3 support...
Is this fine?

review: Needs Resubmitting
190. By Marco Trevisan (Treviño)

Always check if vapigen is available when building VAPI

191. By Marco Trevisan (Treviño)

Examples, added simple-client-vala

A rewrite of the simple-client.c version in Vala as example.

Added a workaround for compiling it.

192. By Marco Trevisan (Treviño)

simple-client-vala: indentation fixes

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve
193. By Marco Trevisan (Treviño)

Vala simple client, compile workaround improved.

194. By Marco Trevisan (Treviño)

Merge against new trunk

195. By Marco Trevisan (Treviño)

examples, added scroll-event demo.

196. By Marco Trevisan (Treviño)

examples, vala: check for valac

197. By Marco Trevisan (Treviño)

example makefile code cleanup

Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches