Merge lp://staging/~oif-team/ginn/trunk.autotools_and_xml into lp://staging/ginn
Proposed by
Henrik Rydberg
| Status: | Merged |
|---|---|
| Merged at revision: | 14 |
| Proposed branch: | lp://staging/~oif-team/ginn/trunk.autotools_and_xml |
| Merge into: | lp://staging/ginn |
| Diff against target: |
8382 lines (+1140/-7033) 32 files modified
.bzrignore (+79/-0) COPYING (+676/-0) INSTALL (+229/-0) Makefile.am (+14/-0) README (+0/-10) autogen.sh (+11/-0) configure.ac (+30/-0) etc/wishes.xml (+11/-0) gestTest/COPYING (+0/-676) gestTest/COPYING.xcbgen (+0/-32) gestTest/INSTALL (+0/-229) gestTest/Makefile.am (+0/-5) gestTest/autogen.sh (+0/-12) gestTest/configure.ac (+0/-93) gestTest/src/Makefile.am (+0/-20) gestTest/src/c-client.xsl (+0/-1551) gestTest/src/c_client.py (+0/-1041) gestTest/src/gesture.c (+0/-467) gestTest/src/gesture.h (+0/-547) gestTest/src/gesture.xml.in (+0/-99) gestTest/src/gesturetest.pod (+0/-32) gestTest/src/ink.main.c (+0/-545) gestTest/src/main.c (+0/-533) ginn.pc.in (+8/-0) keySymbols (+0/-432) src/Makefile (+0/-13) src/Makefile.am (+5/-0) src/cJSON.c (+0/-490) src/cJSON.h (+0/-123) src/config.c (+57/-0) src/ginn.c (+20/-62) src/wishes.conf (+0/-21) |
| To merge this branch: | bzr merge lp://staging/~oif-team/ginn/trunk.autotools_and_xml |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mohamed IKBEL Boulabiar (community) | Approve | ||
| Stephen M. Webb (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch contains a number of changes, but still only preparatory.
1. Remove gestTest, to avoid confusion
2. Use xml2 instead of json - the config file is not really functional, but it seemed to be the same with the one in place right now
3. Use auto tools - this one to aid in the building of debian packages later on
The configuration checks for geis, configures and compiles properly. However, it does not run yet, and does not do anything yet.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This looks good from a technical point of view.