libappindicator

Merge lp://qastaging/~charlesk/libappindicator/lp-1083425 into lp://qastaging/libappindicator/13.04

  1. lp-1083425
  2. Merge into trunk.13.04
Proposed by Charles Kerr
Status: Merged
Merged at revision: 248
Proposed branch: lp://qastaging/~charlesk/libappindicator/lp-1083425
Merge into: lp://qastaging/libappindicator/13.04
Diff against target: 306 lines (+11/-248)
5 files modified
autogen.sh (+1/-0)
configure.ac (+1/-1)
docs/reference/Makefile.am (+9/-11)
docs/reference/tmpl/libappindicator-unused.sgml (+0/-42)
gtk-doc.local.make (+0/-194)
To merge this branch: bzr merge lp://qastaging/~charlesk/libappindicator/lp-1083425
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Needs Fixing
Ted Gould (community) Needs Fixing
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+137267@code.qastaging.launchpad.net

Commit message

Fix bug #1083399 by updating our use of gtk-doc.

Description of the change

Fix bug #1083425 by updating our use of gtk-doc from 1.9 to the the way gtk-doc's manual recommends 1.18 be used.

  1. Don't keep a local copy of gtk-doc.make. gtk-doc's manual recommends using gtkdocize ensure an up-to-date version gets copied into our directory at configure time. Also, the older version that we had been keeping in our repo contributed to bug #1083425.

  2. Use the --no-template mode of gtk-doc.

  3. Update our sanity checks in docs/references/Makefile.am from gtk-doc 1.18's examples/Makefile.am.

Some more background on the issue:

During our existing build rules, three copies of libappindicator-docs.sgml are created:

> build-area/libappindicator-12.10.1/build/gtk2/docs/reference/libappindicator-docs.sgml
> build-area/libappindicator-12.10.1/build/gtk3/docs/reference/libappindicator-docs.sgml
> build-area/libappindicator-12.10.1/build/docs/reference/libappindicator-docs.sgml

Where the first two are generated by our configure script from libappindicator-docs.sgml.in as we want, but the third is created by gtkdoc-mkdb from its own template because the older gtk-doc makefile rules looked in the srcdir.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=raring,flavor=amd64/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=raring,flavor=i386/7/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/7//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

This is failing in CI because this bug is blocking inline packaging from landing in libappindicator...

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

looks good to me, you can get it landing before inlining I guess :)

Revision history for this message
Allan LeSage (allanlesage) wrote :

Approving over Jenkins' objection, have reverted job to pre-inline in order to land this.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/./build=pbuilder,distribution=raring,flavor=i386/3/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

Snagged on missing gtk-doc; attempting to run autogen.sh.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libappindicator-autolanding/./build=pbuilder,distribution=raring,flavor=i386/4/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

I'm finding the packaging at lp:ubuntu/libappindicator to be broken with our recipe, and need to consult with cyphermox and didrocks the best fix. This may be the last painful reminder of what it's like to manage separate packaging and source branches? Also it maybe most efficient to just fix the inline branch first.

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

Removes the testing of the documentation:

+#TESTS = $(GTKDOC_CHECK)

That line needs to be uncommented.

review: Needs Fixing
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

With the above line uncommented; still getting erros in the build about undocumented symbols:
make check-TESTS
make[5]: entrant dans le répertoire « /home/mtrudel/Public/upstream/build-area/libappindicator-12.10.1/build/gtk2/docs/reference »
Running suite(s): gtk-doc-libappindicator
libappindicator-undocumented.txt:1:E: 49 undocumented or incomplete symbols
/home/mtrudel/Public/upstream/build-area/libappindicator-12.10.1/build/gtk2/docs/reference/libappindicator-undeclared.txt:1:E: 47 undeclared symbols
50.0%: Checks 4, Failures: 2
FAIL: /usr/bin/gtkdoc-check
==========================================================
1 of 1 test failed
Please report to http://bugs.launchpad.net/libappindicator
==========================================================
make[5]: *** [check-TESTS] Erreur 1
make[5]: quittant le répertoire « /home/mtrudel/Public/upstream/build-area/libappindicator-12.10.1/build/gtk2/docs/reference »
make[4]: *** [check-am] Erreur 2
make[4]: quittant le répertoire « /home/mtrudel/Public/upstream/build-area/libappindicator-12.10.1/build/gtk2/docs/reference »
make[3]: *** [check-recursive] Erreur 1
make[3]: quittant le répertoire « /home/mtrudel/Public/upstream/build-area/libappindicator-12.10.1/build/gtk2/docs »
make[2]: *** [check-recursive] Erreur 1
make[2]: quittant le répertoire « /home/mtrudel/Public/upstream/build-area/libappindicator-12.10.1/build/gtk2 »
dh_auto_test: make -j1 check returned exit code 2
make[1]: *** [dotestgtk2-python2.7] Erreur 29

review: Needs Fixing

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