[Telepathy] merge: telepathy-gabble
Merge Monkey
monkey at collabora.co.uk
Thu Apr 19 08:21:01 PDT 2007
Merge to:
telepathy-gabble
From:
/home/smcv/public_html/darcs/tpglib-misc
Changes:
Simon McVittie <simon.mcvittie at collabora.co.uk>
Move svc-unstable interfaces to their own section in the docs
Simon McVittie <simon.mcvittie at collabora.co.uk>
Don't duplicate signals marshallers and error handling in -unstable
Simon McVittie <simon.mcvittie at collabora.co.uk>
lib/tools/identity.xsl: Add an XSLT identity transformation
Simon McVittie <simon.mcvittie at collabora.co.uk>
Move the unstable interfaces' names and enums to svc-unstable documentation
Simon McVittie <simon.mcvittie at collabora.co.uk>
Regenerate spec-gen.am with ContactInfo marked as unstable
Simon McVittie <simon.mcvittie at collabora.co.uk>
Add a comment explaining why lib/docs/reference/Makefile.am cares about out-of-tree builds
Simon McVittie <simon.mcvittie at collabora.co.uk>
If doing an out of tree build, scan the build directory for generated source as gtkdoc input too
Simon McVittie <simon.mcvittie at collabora.co.uk>
Regenerate lib/spec/spec-gen.am
Simon McVittie <simon.mcvittie at collabora.co.uk>
Allow docstrings to contain < and > without breaking gtkdoc (in a very hackish way)
Simon McVittie <simon.mcvittie at collabora.co.uk>
update-spec-gen-am.sh.in: If no generated-code directory is given, don't output variables for code generation. If no stable-interfaces whitelist is given, don't split stable and unstable interfaces
Simon McVittie <simon.mcvittie at collabora.co.uk>
Add comment noting that the "stable" libtelepathy-glib has all the signal marshallers for both itself and -unstable
Simon McVittie <simon.mcvittie at collabora.co.uk>
Fix variable reference in generation of _gen/svc-unstable.h
Simon McVittie <simon.mcvittie at collabora.co.uk>
Include stable-interfaces.txt in CLEANFILES
Simon McVittie <simon.mcvittie at collabora.co.uk>
Add a .pc file for libtelepathy-glib-unstable.a
Simon McVittie <simon.mcvittie at collabora.co.uk>
Improve build system for unstable interfaces:
* Remove unstable interfaces from svc-* public headers.
* Generate stable interfaces whitelist from those public headers.
* Separate out the generation of that whitelist into a separate .mk that
can be invoked from autogen.sh, or otherwise used to start off the process.
* Produce a svc-unstable.h as a public header for the unstable API.
* Remove unstable enums and interface name #defines from main header too.
Put them in svc-unstable.h.
* Install unstable headers to ${includedir}/telepathy-unstable.
* Remove --disable-unstable - the unstable part is easy for packagers to omit
if desired (/usr/include/telepathy-unstable,
/usr/lib/libtelepathy-glib-unstable.a,
/usr/lib/pkgconfig/telepathy-glib-unstable.pc) and having it optional will
get gtkdoc confused.
Simon McVittie <simon.mcvittie at collabora.co.uk>
Install the right unstable headers to the right places
Simon McVittie <simon.mcvittie at collabora.co.uk>
Remove lib/stable-interfaces.txt (no longer used)
Simon McVittie <simon.mcvittie at collabora.co.uk>
Adapt genginterface.py to remove all the Telepathy-specific bits. Put them in its command-line options instead.
Simon McVittie <simon.mcvittie at collabora.co.uk>
Regenerate lib/telepathy-glib/spec-gen.am
Simon McVittie <simon.mcvittie at collabora.co.uk>
Actually include interfaces and enums in the docs
More information about the Telepathy
mailing list