summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2008-07-21 13:58:58 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2008-07-21 13:58:58 +0000
commit62f87b469af61168bebd5e128784140042393863 (patch)
tree42a45c991578943aebf04770065efd24c35b028f /extensions
parentf6541affe996d10bd1c76dde014a7d3819287f77 (diff)
Update code-gen tools from telepathy-glib 0.7.12
Diffstat (limited to 'extensions')
-rw-r--r--extensions/Makefile.am23
-rw-r--r--extensions/all.xml5
2 files changed, 11 insertions, 17 deletions
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 11751df70..5c25c99ad 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -70,26 +70,15 @@ _gen/signals-marshal.c: _gen/signals-marshal.list Makefile.am
{ echo '#include "_gen/signals-marshal.h"' && \
$(GLIB_GENMARSHAL) --body --prefix=_gabble_ext_marshal $< ; } > $@
-_gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-generator.xsl \
+_gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-gen.py \
Makefile.am
- $(XSLTPROC) $(XSLTPROCFLAGS) \
- --stringparam mixed-case-prefix Gabble \
- $(tools_dir)/c-constants-generator.xsl \
- $< > $@
+ $(PYTHON) $(tools_dir)/c-constants-gen.py Gabble $< > $@
-_gen/interfaces.h: _gen/all.xml $(tools_dir)/glib-interfaces-generator.xsl \
+_gen/interfaces.h _gen/interfaces-body.h: _gen/all.xml \
+ $(tools_dir)/glib-interfaces-gen.py \
Makefile.am
- $(XSLTPROC) $(XSLTPROCFLAGS) \
- --stringparam mixed-case-prefix Gabble \
- $(tools_dir)/glib-interfaces-generator.xsl \
- $< > $@
-
-_gen/interfaces-body.h: _gen/all.xml \
- $(tools_dir)/glib-interfaces-body-generator.xsl Makefile.am
- $(XSLTPROC) $(XSLTPROCFLAGS) \
- --stringparam mixed-case-prefix Gabble \
- $(tools_dir)/glib-interfaces-body-generator.xsl \
- $< > $@
+ $(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
+ Gabble _gen/interfaces-body.h _gen/interfaces.h $<
_gen/gtypes.h _gen/gtypes-body.h: _gen/all.xml \
$(tools_dir)/glib-gtypes-generator.py Makefile.am
diff --git a/extensions/all.xml b/extensions/all.xml
index c2c6a030e..62e7e97f5 100644
--- a/extensions/all.xml
+++ b/extensions/all.xml
@@ -25,4 +25,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p>
<xi:include href="OLPC_Buddy_Info.xml"/>
<xi:include href="OLPC_Activity_Properties.xml"/>
+<tp:generic-types>
+ <tp:external-type name="Contact_Handle" type="u"
+ from="Telepathy specification"/>
+</tp:generic-types>
+
</tp:spec>