Menu
▾
▴
[Gtk2hs-commit] gtk2hs/tools/apiGen atk-sources.xml,NONE,1.1 gnomecanvas-sources.xml,NONE,1.1 Makefile,1.1,1.2 README,1.3,1.4 format-docs.xsl,1.7,1.8 gdk-sources.xml,1.1,1.2 glade-sources.xml,1.1,1.2 gtk-sources.xml,1.1,1.2 pango-sources.xml,1.1,1.2
|
From: Duncan C. <dun...@us...> - 2005-01-26 12:13:38
|
Update of /cvsroot/gtk2hs/gtk2hs/tools/apiGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16204/tools/apiGen Modified Files: Makefile README format-docs.xsl gdk-sources.xml glade-sources.xml gtk-sources.xml pango-sources.xml Added Files: atk-sources.xml gnomecanvas-sources.xml Log Message: format-docs.xsl: Extract documentation of properties. Makefile: include parent api files to scan for types. README: note some todo items. *-sources.xml: add and update sources spec files. Index: README =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- README 24 Jan 2005 01:54:03 -0000 1.3 +++ README 26 Jan 2005 12:13:28 -0000 1.4 @@ -57,3 +57,7 @@ Some improvements that would be good: * Complete marshaling code for more types * Emit signal and property bindings with documentation + * Deal with Enums, Flags, and Interfaces properly + - make objects instances of interfaces they implement + - make a note of structs and boxed types + - allow import of parent api files for reference to known types Index: gtk-sources.xml =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/gtk-sources.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gtk-sources.xml 24 Jan 2005 01:40:09 -0000 1.1 +++ gtk-sources.xml 26 Jan 2005 12:13:28 -0000 1.2 @@ -1,6 +1,6 @@ <gapi-parser-input> <api filename="gtk-api.xml"> - <library name="libgtk"> + <library name="gtk"> <namespace name="Gtk"> <dir>gtk+-2.2.2/gtk</dir> </namespace> Index: gdk-sources.xml =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/gdk-sources.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gdk-sources.xml 24 Jan 2005 01:40:09 -0000 1.1 +++ gdk-sources.xml 26 Jan 2005 12:13:28 -0000 1.2 @@ -1,11 +1,11 @@ <gapi-parser-input> <api filename="gdk-api.xml"> - <library name="libgdk"> + <library name="gdk"> <namespace name="Gdk"> <dir>gtk+-2.2.2/gdk</dir> </namespace> </library> - <library name="libgdk-pixbuf"> + <library name="gdk_pixbuf"> <namespace name="Gdk"> <dir>gtk+-2.2.2/gdk-pixbuf</dir> </namespace> Index: pango-sources.xml =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/pango-sources.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pango-sources.xml 24 Jan 2005 01:40:09 -0000 1.1 +++ pango-sources.xml 26 Jan 2005 12:13:28 -0000 1.2 @@ -1,6 +1,6 @@ <gapi-parser-input> <api filename="pango-api.xml"> - <library name="libpango"> + <library name="pango"> <namespace name="Pango"> <dir>pango-1.2.3/pango</dir> <exclude>pango-1.2.3/pango/pangox-fontcache.c</exclude> --- NEW FILE: atk-sources.xml --- <gapi-parser-input> <api filename="atk-api.xml"> <library name="atk"> <namespace name="Atk"> <dir>atk-1.2.4/atk</dir> </namespace> </library> </api> </gapi-parser-input> Index: glade-sources.xml =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/glade-sources.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- glade-sources.xml 24 Jan 2005 01:40:09 -0000 1.1 +++ glade-sources.xml 26 Jan 2005 12:13:28 -0000 1.2 @@ -1,6 +1,6 @@ <gapi-parser-input> <api filename="glade-api.xml"> - <library name="libglade"> + <library name="glade"> <namespace name="Glade"> <dir>libglade-2.0.0/glade</dir> </namespace> Index: format-docs.xsl =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/format-docs.xsl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- format-docs.xsl 25 Jan 2005 18:19:37 -0000 1.7 +++ format-docs.xsl 26 Jan 2005 12:13:28 -0000 1.8 @@ -123,6 +123,17 @@ </params> </function> </xsl:for-each> + <xsl:for-each select="refentry/refsect1[title='Properties']/variablelist/varlistentry"> + <property> + <name><xsl:value-of select="term/literal"/></name> + <since> + <xsl:value-of select="normalize-space(substring-after(listitem/para[starts-with(text(),'Since')], 'Since'))"/> + </since> + <doc> + <xsl:apply-templates select="listitem/para[not(starts-with(text(),'Since')) and normalize-space(text())!='']"/> + </doc> + </property> + </xsl:for-each> </module> </xsl:for-each> </apidoc> Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 24 Jan 2005 01:35:51 -0000 1.1 +++ Makefile 26 Jan 2005 12:13:28 -0000 1.2 @@ -26,7 +26,7 @@ @echo "make prep-pango-docs pango-modules" @echo " as above but for Pango" @echo - @echo "make prep-glade-docs glade-modules" + @echo "make glade-modules" @echo " as above but for libglade" ######################## @@ -67,12 +67,13 @@ prep-gtk-docs : gtk+-$(GTK_VERSION) cd $< && ./configure --enable-gtk-doc && make -gtk-docs.xml : gtk+-$(GTK_VERSION)/docs/reference/gtk/xml +gtk-docs.xml : gtk+-$(GTK_VERSION)/docs/reference/gtk/xml format-docs.xsl ./mkdocxml.sh $< | xsltproc format-docs.xsl - > $@ -gtk-modules : gtk-api.xml gtk-docs.xml Template.chs ApiGen +gtk-modules : gtk-api.xml gtk-docs.xml Template.chs ApiGen gdk-api.xml pango-api.xml @mkdir -p $@ - ./ApiGen $< Template.chs --doc=gtk-docs.xml --outdir=$@ + ./ApiGen $< Template.chs --doc=gtk-docs.xml --outdir=$@ \ + --includeapi=gdk-api.xml --includeapi=pango-api.xml --includeapi=atk-api.xml ################### @@ -80,7 +81,8 @@ # Gdk modules # gdk-docs.xml : gtk+-$(GTK_VERSION)/docs/reference/gdk/xml \ - gtk+-$(GTK_VERSION)/docs/reference/gdk-pixbuf/xml + gtk+-$(GTK_VERSION)/docs/reference/gdk-pixbuf/xml \ + format-docs.xsl ./mkdocxml.sh $< | xsltproc format-docs.xsl - > $@ gdk-modules : gdk-api.xml gdk-docs.xml Template.chs ApiGen @@ -95,7 +97,7 @@ prep-pango-docs : pango-$(PANGO_VERSION) cd $< && ./configure --enable-gtk-doc && make -pango-docs.xml : pango-$(PANGO_VERSION)/docs/xml +pango-docs.xml : pango-$(PANGO_VERSION)/docs/xml format-docs.xsl ./mkdocxml.sh $< | xsltproc format-docs.xsl - > $@ pango-modules : pango-api.xml pango-docs.xml Template.chs ApiGen @@ -107,9 +109,6 @@ # # libglade modules # -prep-glade-docs : libglade-$(GLADE_VERSION) - cd $< && ./configure --enable-gtk-doc && make - glade-modules : glade-api.xml Template.chs ApiGen @mkdir -p $@ ./ApiGen $< Template.chs --outdir=$@ @@ -117,6 +116,15 @@ ######################## # +# gnomecanvas modules +# +gnomecanvas-modules : gnomecanvas-api.xml Template.chs ApiGen + @mkdir -p $@ + ./ApiGen $< Template.chs --outdir=$@ + + +######################## +# # tools # ApiGen : ApiGen.hs --- NEW FILE: gnomecanvas-sources.xml --- <gapi-parser-input> <api filename="gnomecanvas-api.xml"> <library name="gnomecanvas"> <namespace name="Gnome"> <dir>libgnomecanvas-2.2.1/libgnomecanvas</dir> </namespace> </library> </api> </gapi-parser-input> |
