Menu
▾
▴
[Gtk2hs-commit] gtk2hs/tools/apiGen Makefile,1.7,1.8 atk-sources.xml,1.2,1.3 gdk-sources.xml,1.3,1.4 glade-sources.xml,1.3,1.4 gnomecanvas-sources.xml,1.3,1.4 gtk-sources.xml,1.3,1.4 pango-sources.xml,1.3,1.4
Update of /cvsroot/gtk2hs/gtk2hs/tools/apiGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30366/tools/apiGen Modified Files: Makefile atk-sources.xml gdk-sources.xml glade-sources.xml gnomecanvas-sources.xml gtk-sources.xml pango-sources.xml Log Message: Made Mogul's TreePath which is [Int] the only TreePath, even in TreeModel. Completed DrawWindow (gdk_window). Make apiGen Makefile work with different versions. Index: gdk-sources.xml =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/gdk-sources.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gdk-sources.xml 27 Jan 2005 23:10:15 -0000 1.3 +++ gdk-sources.xml 17 Feb 2005 00:13:21 -0000 1.4 @@ -2,12 +2,12 @@ <api filename="gdk-api.xml"> <library name="gdk"> <namespace name="Gdk"> - <dir>gtk+-2.4.14/gdk</dir> + <dir>gtk+/gdk</dir> </namespace> </library> <library name="gdk_pixbuf"> <namespace name="Gdk"> - <dir>gtk+-2.4.14/gdk-pixbuf</dir> + <dir>gtk+/gdk-pixbuf</dir> </namespace> </library> </api> Index: atk-sources.xml =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/atk-sources.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- atk-sources.xml 27 Jan 2005 23:10:15 -0000 1.2 +++ atk-sources.xml 17 Feb 2005 00:13:21 -0000 1.3 @@ -2,7 +2,7 @@ <api filename="atk-api.xml"> <library name="atk"> <namespace name="Atk"> - <dir>atk-1.6.1/atk</dir> + <dir>atk/atk</dir> </namespace> </library> </api> Index: pango-sources.xml =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/pango-sources.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pango-sources.xml 27 Jan 2005 23:10:15 -0000 1.3 +++ pango-sources.xml 17 Feb 2005 00:13:21 -0000 1.4 @@ -2,16 +2,16 @@ <api filename="pango-api.xml"> <library name="pango"> <namespace name="Pango"> - <dir>pango-1.4.1/pango</dir> - <exclude>pango-1.4.1/pango/pangox-fontcache.c</exclude> - <exclude>pango-1.4.1/pango/pangox-fontmap.c</exclude> - <exclude>pango-1.4.1/pango/pangox-private.h</exclude> - <exclude>pango-1.4.1/pango/pangox.h</exclude> - <exclude>pango-1.4.1/pango/pangox.c</exclude> - <exclude>pango-1.4.1/pango/pangoxft.h</exclude> - <exclude>pango-1.4.1/pango/pangoxft-font.h</exclude> - <exclude>pango-1.4.1/pango/pangoxft-fontmap.h</exclude> - <exclude>pango-1.4.1/pango/pangoxft-private.h</exclude> + <dir>pango/pango</dir> + <exclude>pango/pango/pangox-fontcache.c</exclude> + <exclude>pango/pango/pangox-fontmap.c</exclude> + <exclude>pango/pango/pangox-private.h</exclude> + <exclude>pango/pango/pangox.h</exclude> + <exclude>pango/pango/pangox.c</exclude> + <exclude>pango/pango/pangoxft.h</exclude> + <exclude>pango/pango/pangoxft-font.h</exclude> + <exclude>pango/pango/pangoxft-fontmap.h</exclude> + <exclude>pango/pango/pangoxft-private.h</exclude> </namespace> </library> </api> Index: glade-sources.xml =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/glade-sources.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- glade-sources.xml 27 Jan 2005 23:10:15 -0000 1.3 +++ glade-sources.xml 17 Feb 2005 00:13:21 -0000 1.4 @@ -2,7 +2,7 @@ <api filename="glade-api.xml"> <library name="glade"> <namespace name="Glade"> - <dir>libglade-2.3.6/glade</dir> + <dir>libglade/glade</dir> </namespace> </library> </api> Index: gtk-sources.xml =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/gtk-sources.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gtk-sources.xml 27 Jan 2005 23:10:15 -0000 1.3 +++ gtk-sources.xml 17 Feb 2005 00:13:21 -0000 1.4 @@ -2,73 +2,73 @@ <api filename="gtk-api.xml"> <library name="gtk"> <namespace name="Gtk"> - <dir>gtk+-2.4.14/gtk</dir> + <dir>gtk+/gtk</dir> <!-- Internal stuff --> - <exclude>gtk+-2.4.14/gtk/gtkfilechooserdefault.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilechooserdefault.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilechooserentry.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilechooserentry.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilechooserutils.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilechooserutils.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilesystem.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilesystem.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilesystemmodel.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilesystemmodel.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilesystemunix.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilesystemunix.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilesystemwin32.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkfilesystemwin32.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkiconcache.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkiconcache.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkiconthemeparser.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkpathbar.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkpathbar.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkrbtree.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkrbtree.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtksequence.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtksequence.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtktextbtree.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtktextbtree.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtktextsegment.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtktextsegment.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtktexttypes.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtktexttypes.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtktextutil.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtktextutil.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkthemes.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkthemes.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtktreedatalist.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtktreedatalist.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkwindow-decorate.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkwindow-decorate.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkxembed.h</exclude> - <exclude>gtk+-2.4.14/gtk/xembed.h</exclude> + <exclude>gtk+/gtk/gtkfilechooserdefault.c</exclude> + <exclude>gtk+/gtk/gtkfilechooserdefault.h</exclude> + <exclude>gtk+/gtk/gtkfilechooserentry.c</exclude> + <exclude>gtk+/gtk/gtkfilechooserentry.h</exclude> + <exclude>gtk+/gtk/gtkfilechooserutils.c</exclude> + <exclude>gtk+/gtk/gtkfilechooserutils.h</exclude> + <exclude>gtk+/gtk/gtkfilesystem.c</exclude> + <exclude>gtk+/gtk/gtkfilesystem.h</exclude> + <exclude>gtk+/gtk/gtkfilesystemmodel.c</exclude> + <exclude>gtk+/gtk/gtkfilesystemmodel.h</exclude> + <exclude>gtk+/gtk/gtkfilesystemunix.c</exclude> + <exclude>gtk+/gtk/gtkfilesystemunix.h</exclude> + <exclude>gtk+/gtk/gtkfilesystemwin32.c</exclude> + <exclude>gtk+/gtk/gtkfilesystemwin32.h</exclude> + <exclude>gtk+/gtk/gtkiconcache.c</exclude> + <exclude>gtk+/gtk/gtkiconcache.h</exclude> + <exclude>gtk+/gtk/gtkiconthemeparser.h</exclude> + <exclude>gtk+/gtk/gtkpathbar.c</exclude> + <exclude>gtk+/gtk/gtkpathbar.h</exclude> + <exclude>gtk+/gtk/gtkrbtree.c</exclude> + <exclude>gtk+/gtk/gtkrbtree.h</exclude> + <exclude>gtk+/gtk/gtksequence.c</exclude> + <exclude>gtk+/gtk/gtksequence.h</exclude> + <exclude>gtk+/gtk/gtktextbtree.c</exclude> + <exclude>gtk+/gtk/gtktextbtree.h</exclude> + <exclude>gtk+/gtk/gtktextsegment.c</exclude> + <exclude>gtk+/gtk/gtktextsegment.h</exclude> + <exclude>gtk+/gtk/gtktexttypes.c</exclude> + <exclude>gtk+/gtk/gtktexttypes.h</exclude> + <exclude>gtk+/gtk/gtktextutil.c</exclude> + <exclude>gtk+/gtk/gtktextutil.h</exclude> + <exclude>gtk+/gtk/gtkthemes.c</exclude> + <exclude>gtk+/gtk/gtkthemes.h</exclude> + <exclude>gtk+/gtk/gtktreedatalist.c</exclude> + <exclude>gtk+/gtk/gtktreedatalist.h</exclude> + <exclude>gtk+/gtk/gtkwindow-decorate.c</exclude> + <exclude>gtk+/gtk/gtkwindow-decorate.h</exclude> + <exclude>gtk+/gtk/gtkxembed.h</exclude> + <exclude>gtk+/gtk/xembed.h</exclude> <!-- Exclude all pre gtk+-2.2 deprecated widgets --> <!-- on second thoughts don't exclude them - <exclude>gtk+-2.4.14/gtk/gtkclist.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkclist.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkctree.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkctree.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtklist.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtklist.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtklistitem.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtklistitem.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkoldeditable.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkoldeditable.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkpixmap.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkpixmap.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkpreview.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkpreview.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtkprogress.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtkprogress.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtktext.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtktext.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtktipsquery.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtktipsquery.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtktree.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtktree.h</exclude> - <exclude>gtk+-2.4.14/gtk/gtktreeitem.c</exclude> - <exclude>gtk+-2.4.14/gtk/gtktreeitem.h</exclude> + <exclude>gtk+/gtk/gtkclist.c</exclude> + <exclude>gtk+/gtk/gtkclist.h</exclude> + <exclude>gtk+/gtk/gtkctree.c</exclude> + <exclude>gtk+/gtk/gtkctree.h</exclude> + <exclude>gtk+/gtk/gtklist.c</exclude> + <exclude>gtk+/gtk/gtklist.h</exclude> + <exclude>gtk+/gtk/gtklistitem.c</exclude> + <exclude>gtk+/gtk/gtklistitem.h</exclude> + <exclude>gtk+/gtk/gtkoldeditable.c</exclude> + <exclude>gtk+/gtk/gtkoldeditable.h</exclude> + <exclude>gtk+/gtk/gtkpixmap.c</exclude> + <exclude>gtk+/gtk/gtkpixmap.h</exclude> + <exclude>gtk+/gtk/gtkpreview.c</exclude> + <exclude>gtk+/gtk/gtkpreview.h</exclude> + <exclude>gtk+/gtk/gtkprogress.c</exclude> + <exclude>gtk+/gtk/gtkprogress.h</exclude> + <exclude>gtk+/gtk/gtktext.c</exclude> + <exclude>gtk+/gtk/gtktext.h</exclude> + <exclude>gtk+/gtk/gtktipsquery.c</exclude> + <exclude>gtk+/gtk/gtktipsquery.h</exclude> + <exclude>gtk+/gtk/gtktree.c</exclude> + <exclude>gtk+/gtk/gtktree.h</exclude> + <exclude>gtk+/gtk/gtktreeitem.c</exclude> + <exclude>gtk+/gtk/gtktreeitem.h</exclude> --> </namespace> </library> Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile 14 Feb 2005 02:10:49 -0000 1.7 +++ Makefile 17 Feb 2005 00:13:21 -0000 1.8 @@ -32,23 +32,27 @@ PANGO_VERSION = 1.4.1 ATK_VERSION = 1.6.1 GTK_VERSION = 2.4.14 -GLADE_VERSION = 2.3.6 +GLADE_VERSION = 2.0.1 DOWNLOADS = \ - ftp://ftp.gtk.org/pub/gtk/v2.4/glib-$(GLIB_VERSION).tar.gz \ - ftp://ftp.gtk.org/pub/gtk/v2.4/pango-$(PANGO_VERSION).tar.gz \ - ftp://ftp.gtk.org/pub/gtk/v2.4/atk-$(ATK_VERSION).tar.gz \ - ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-$(GTK_VERSION).tar.gz \ - http://ftp.gnome.org/pub/GNOME/desktop/2.6/2.6.2/sources/libglade-$(GLADE_VERSION).tar.gz\ - http://ftp.gnome.org/pub/GNOME/desktop/2.6/2.6.2/sources/libgnomecanvas-2.6.1.1.tar.gz + ftp://ftp.gtk.org/pub/gtk/v2.4/glib-$(GLIB_VERSION).tar.bz2 \ + ftp://ftp.gtk.org/pub/gtk/v2.4/pango-$(PANGO_VERSION).tar.bz2 \ + ftp://ftp.gtk.org/pub/gtk/v2.4/atk-$(ATK_VERSION).tar.bz2 \ + ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-$(GTK_VERSION).tar.bz2 \ + http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.2/sources/libglade-$(GLADE_VERSION).tar.bz2\ + http://ftp.gnome.org/pub/GNOME/desktop/2.4/2.4.2/sources/libgnomecanvas-2.4.0.tar.bz2 get-source-code: - for i in $(DOWNLOADS); do \ - wget $$i --output-document=- | tar -xz ; \ + for i in $(DOWNLOADS); do \ + UNPACKDIR=`echo $$i | sed 's:.*/\([a-z+]*\)-\([0-9.]*\).tar.bz2:\1-\2:'`;\ + FINALDIR=`echo $$i | sed 's:.*/\([a-z+]*\)-\([0-9.]*\).tar.bz2:\1:'`;\ + if ! test -d $$FINALDIR ; then \ + wget $$i --output-document=- | tar -xj && mv $$UNPACKDIR $$FINALDIR; \ + fi; \ done; # following fixes borrowed from Gtk# - ln -f -s gtkfilechooserprivate.h gtk+-$(GTK_VERSION)/gtk/gtkfilechooserpriv.h - sed -i 's:( \*link_activated):(\* link_activated):' atk-1.6.1/atk/atkhyperlink.h + ln -f -s gtkfilechooserprivate.h gtk+/gtk/gtkfilechooserpriv.h + sed -i 's:( \*link_activated):(\* link_activated):' atk/atk/atkhyperlink.h ############################# # @@ -69,7 +73,7 @@ #prep-gtk-docs : gtk+-$(GTK_VERSION) # cd $< && ./configure --enable-gtk-doc && make -gtk-docs.xml : gtk+-$(GTK_VERSION)/docs/reference/gtk/xml format-docs.xsl +gtk-docs.xml : gtk+/docs/reference/gtk/xml format-docs.xsl ./mkdocxml.sh $< | xsltproc format-docs.xsl - > $@ gtk-modules : gtk-api.xml gtk-docs.xml Template.chs ApiGen \ @@ -86,8 +90,8 @@ # # Gdk modules # -gdk-docs.xml : gtk+-$(GTK_VERSION)/docs/reference/gdk/xml \ - gtk+-$(GTK_VERSION)/docs/reference/gdk-pixbuf/xml \ +gdk-docs.xml : gtk+/docs/reference/gdk/xml \ + gtk+/docs/reference/gdk-pixbuf/xml \ format-docs.xsl ./mkdocxml.sh $< | xsltproc format-docs.xsl - > $@ @@ -103,7 +107,7 @@ #prep-pango-docs : pango-$(PANGO_VERSION) # cd $< && ./configure --enable-gtk-doc && make -pango-docs.xml : pango-$(PANGO_VERSION)/docs/xml format-docs.xsl +pango-docs.xml : pango/docs/xml format-docs.xsl ./mkdocxml.sh $< | xsltproc format-docs.xsl - > $@ pango-modules : pango-api.xml pango-docs.xml Template.chs ApiGen Index: gnomecanvas-sources.xml =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/tools/apiGen/gnomecanvas-sources.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gnomecanvas-sources.xml 14 Feb 2005 02:10:49 -0000 1.3 +++ gnomecanvas-sources.xml 17 Feb 2005 00:13:21 -0000 1.4 @@ -2,7 +2,7 @@ <api filename="gnomecanvas-api.xml"> <library name="gnomecanvas"> <namespace name="Gnome"> - <dir>libgnomecanvas-2.6.1.1/libgnomecanvas</dir> + <dir>libgnomecanvas/libgnomecanvas</dir> </namespace> </library> </api> |
