Teach doxygen about python/*-py.c files.

Make sure that automake includes the python/test/* files.

CVS patchset: 5461
CVS date: 2002/06/03 23:27:05

diff --git a/Doxyfile.in b/Doxyfile.in
index 9f55bdd7959ddbac42af3f9e12c0132d6233cab2..18e51051b0e2be2aa85c4745643a7800db3bfb35 100644 (file)
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -449,13 +449,30 @@ INPUT                  = \
        @top_srcdir@/popt/popthelp.c \
        @top_srcdir@/popt/poptint.h \
        @top_srcdir@/popt/poptparse.c \
-       @top_srcdir@/python/db-py.c \
-       @top_srcdir@/python/db-py.h \
+       @top_srcdir@/python/_rpmdb.c \
        @top_srcdir@/python/hash.c \
        @top_srcdir@/python/hash.h \
        @top_srcdir@/python/header-py.c \
        @top_srcdir@/python/header-py.h \
+       @top_srcdir@/python/rpmal-py.c \
+       @top_srcdir@/python/rpmal-py.h \
+       @top_srcdir@/python/rpmdb-py.c \
+       @top_srcdir@/python/rpmdb-py.h \
+       @top_srcdir@/python/rpmds-py.c \
+       @top_srcdir@/python/rpmds-py.h \
+       @top_srcdir@/python/rpmfd-py.c \
+       @top_srcdir@/python/rpmfd-py.h \
+       @top_srcdir@/python/rpmfi-py.c \
+       @top_srcdir@/python/rpmfi-py.h \
+       @top_srcdir@/python/rpmmi-py.c \
+       @top_srcdir@/python/rpmmi-py.h \
        @top_srcdir@/python/rpmmodule.c \
+       @top_srcdir@/python/rpmrc-py.c \
+       @top_srcdir@/python/rpmrc-py.h \
+       @top_srcdir@/python/rpmte-py.c \
+       @top_srcdir@/python/rpmte-py.h \
+       @top_srcdir@/python/rpmts-py.c \
+       @top_srcdir@/python/rpmts-py.h \
        @top_srcdir@/python/upgrade.c \
        @top_srcdir@/python/upgrade.h \
        @top_srcdir@/tools/dump.c \

diff --git a/configure.in b/configure.in
index de1a4ff6e078b1443cf0691ea033ea4ed01117dd..af89359b1f499998ae6bffceb3490357358b30f8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1162,7 +1162,7 @@ AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
        misc/Makefile intl/Makefile po/Makefile.in
        doc/Makefile doc/manual/Makefile
        doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
-       python/Makefile python/rpmdb/Makefile ],
+       python/Makefile python/rpmdb/Makefile python/test/Makefile ],
   [    echo timestamp > popt/stamp-h.in
        echo timestamp > beecrypt/stamp-h.in
        echo timestamp > stamp-h.in

diff --git a/python/Makefile.am b/python/Makefile.am
index 8baa903b3518d89fcf1ae89d6da022503fb6ac24..534c5fb85c4a33823b75b924cc7102443e8fe443 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 PYVER= @WITH_PYTHON_VERSION@
 
-SUBDIRS = rpmdb
+SUBDIRS = rpmdb test
 
 INCLUDES = -I. \
        -I$(top_srcdir)/lib \

diff --git a/python/Makefile.in b/python/Makefile.in
index ecdfb52a7a2db18bc291a092b74549530ae20c3b..b42140d5dd220d8242fa44b10849b4f7ea75e540 100644 (file)
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -198,7 +198,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 PYVER = @WITH_PYTHON_VERSION@
 
-SUBDIRS = rpmdb
+SUBDIRS = rpmdb test
 
 INCLUDES = -I. \
        -I$(top_srcdir)/lib \

diff --git a/python/_rpmdb.c b/python/_rpmdb.c
index b91b7fcb3610c3af243243560c14e3bce98c1d25..5097dd3a9573227b873bc9cad01df4176bdcf2cf 100644 (file)
--- a/python/_rpmdb.c
+++ b/python/_rpmdb.c
@@ -1,3 +1,7 @@
+/** \ingroup python
+ * \file python/_rpmdb.c
+ */
+
 /*----------------------------------------------------------------------
   Copyright (c) 1999-2001, Digital Creations, Fredericksburg, VA, USA
   and Andrew Kuchling. All rights reserved.
@@ -88,7 +92,7 @@
 
 #define PY_BSDDB_VERSION "3.3.1"
 
-static char *rcs_id = "$Id: _rpmdb.c,v 1.2 2002/06/03 20:44:08 jbj Exp $";
+static char *rcs_id = "$Id: _rpmdb.c,v 1.3 2002/06/03 23:27:05 jbj Exp $";
 
 
 #ifdef WITH_THREAD

diff --git a/python/header-py.c b/python/header-py.c
index 0418e897314dafbe44ba3f3ed4fcf29554f88135..e97c075d4219b705a5b4c34c1c0ca94ccad397fd 100644 (file)
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -23,7 +23,7 @@
 #include "debug.h"
 
 /** \ingroup python
- * \class rpm.hdr
+ * \class Rpmhdr
  * \brief A python header object represents an RPM package header.
  * 
  * All RPM packages have headers that provide metadata for the package.

diff --git a/python/rpmdb-py.c b/python/rpmdb-py.c
index 584098492d6f3f03172bdebeb373c7df893972cd..8dc0dc79009ed6c8db541597f6e27125720e0462 100644 (file)
--- a/python/rpmdb-py.c
+++ b/python/rpmdb-py.c
@@ -14,7 +14,7 @@
 #include "debug.h"
 
 /** \ingroup python
- * \class rpm.db
+ * \class Rpmdb
  * \brief A python rpmdb object represents an RPM database.
  * 
  * Instances of the rpmdb object provide access to the records of a

diff --git a/python/rpmdb/Makefile.am b/python/rpmdb/Makefile.am
index 981231234bbf0f8d1dd5d531ecb8a548d6e11ee7..832478ec5bf52e408c0ce8658acbd371f5235906 100644 (file)
--- a/python/rpmdb/Makefile.am
+++ b/python/rpmdb/Makefile.am
@@ -4,6 +4,9 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 PYVER= @WITH_PYTHON_VERSION@
 
+EXTRA_DIST = \
+       __init__.py dbobj.py db.py dbrecio.py dbshelve.py dbtables.py dbutils.py
+
 rpmdbdir = $(prefix)/lib/python${PYVER}/site-packages/rpmdb
-rpmdb_SCRIPTS = __init__.py \
-       dbobj.py db.py dbrecio.py dbshelve.py dbtables.py dbutils.py
+rpmdb_SCRIPTS = \
+       __init__.py dbobj.py db.py dbrecio.py dbshelve.py dbtables.py dbutils.py

diff --git a/python/rpmfd-py.c b/python/rpmfd-py.c
index e2c48593c828f7298e9ea82edfd4670546377a38..3cd9a2a25c8f2bd7487c8c2558a24b50c4da88ee 100644 (file)
--- a/python/rpmfd-py.c
+++ b/python/rpmfd-py.c
@@ -20,8 +20,8 @@
 extern int _rpmio_debug;
 
 /** \ingroup python
- * \name Class: rpm.fd
- * \class rpm.fd
+ * \name Class: Rpmfd
+ * \class Rpmfd
  * \brief An python rpm.fd object represents an rpm I/O handle.
  */
 

diff --git a/python/rpmmi-py.c b/python/rpmmi-py.c
index 5782bf6c2e74dc9d52f45439deb9551f450801f6..2d0485433a59c1affd84e2914e191b97358598ba 100644 (file)
--- a/python/rpmmi-py.c
+++ b/python/rpmmi-py.c
@@ -14,7 +14,7 @@
 #include "debug.h"
 
 /** \ingroup python
- * \class rpm.mi
+ * \class Rpmmi
  * \brief A python rpm.mi match iterator object represents the result of a
  *     database query.
  *
@@ -73,7 +73,7 @@
  */
 
 /** \ingroup python
- * \name Class: rpm.mi
+ * \name Class: Rpmmi
  */
 /*@{*/
 
@@ -102,7 +102,7 @@ rpmmi_Next(rpmmiObject * s)
 }
 #endif
 
-/** \ingroup python
+/**
  */
 static PyObject *
 rpmmi_Pattern(rpmmiObject * s, PyObject * args)

diff --git a/python/rpmrc-py.c b/python/rpmrc-py.c
index bea2b006a5c2dc75a7afe772232eac92478253a4..887c5a912fcc75770ae74432b3e970dc87511287 100644 (file)
--- a/python/rpmrc-py.c
+++ b/python/rpmrc-py.c
@@ -27,7 +27,7 @@ extern PyTypeObject PyDictIter_Type;
 static int _rc_debug = 0;
 
 /** \ingroup python
- * \class rpm.rc
+ * \class Rpmrc
  * \brief A python rpm.rc object encapsulates rpmlib configuration.
  */
 

diff --git a/python/rpmte-py.c b/python/rpmte-py.c
index 5f54721314397c2538b6ceebd5e9026f5cc0a26a..26da8a3163b9ff4495bf2bd654fdb9f904f67b99 100644 (file)
--- a/python/rpmte-py.c
+++ b/python/rpmte-py.c
@@ -19,8 +19,8 @@
 #include "debug.h"
 
 /** \ingroup python
- * \name Class: rpm.te
- * \class rpm.te
+ * \name Class: Rpmte
+ * \class Rpmte
  * \brief An python rpm.te object represents an element of a transaction set.
  */
 

diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 633e46c4f082bb60cad05612b8e57d74a38f9376..9d29c90951c5681ef3c9b06b3f36b018fd224449 100644 (file)
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -23,8 +23,8 @@
 #include "debug.h"
 
 /** \ingroup python
- * \name Class: rpm.ts
- * \class rpm.ts
+ * \name Class: Rpmts
+ * \class Rpmts
  * \brief A python rpm.ts object represents an RPM transaction set.
  * 
  * The transaction set is the workhorse of RPM.  It performs the

diff --git a/rpm.spec.in b/rpm.spec.in
index 21c8ea15cd763c3970d904e0f100e7b61f0d0629..fd34bce2b1394fce42ed110480a7d6dd51de36af 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -454,6 +454,7 @@ fi
 %defattr(-,root,root)
 %{__prefix}/lib/python%{with_python_version}/site-packages/rpmmodule.so
 #%{__prefix}/lib/python%{with_python_version}/site-packages/poptmodule.so
+%{__prefix}/lib/python%{with_python_version}/site-packages/rpmdb
 %endif
 
 %if %{with_perl_subpackage}