This email list is read-only. Emails sent to this list will be discarded
----------------------------------
.gitignore | 7 ++
COPYING | 10 ++--
COPYING.LIB | 18 +++---
ChangeLog | 3 +
acinclude.m4 | 34 +++++++++
bootstrap-configure | 6 ++-
configure.ac | 12 ++--
doc/Doxyfile.in | 169 -------------------------------------------
doc/Makefile.am | 37 ++++++++--
doc/gtk-doc.make | 173 ++++++++++++++++++++++++++++++++++++++++++++
doc/libgdbus-api.txt | 125 --------------------------------
doc/libgdbus-docs.xml | 70 ++++++++++++++++++
doc/version.xml.in | 1 +
src/gdbus.h | 174 +++++++++++++++++++++++++++++----------------
src/mainloop.c | 62 +++++++++-------
src/object.c | 192 +++++++++++++++++++++++++++----------------------
src/watch.c | 64 +++++++++--------
17 files changed, 629 insertions(+), 528 deletions(-)
New commits:
commit aeab6e3c0185b271ca343b439470491b99cc587f
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Wed Aug 13 23:13:40 2008 +0200
Release 0.2
commit a6267460b97efd0ec421e42b88b9ca81a5c9baeb
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Wed Aug 13 23:05:17 2008 +0200
Convert all documentation to gtk-doc style
commit cdcc5affe3aece8b97cf7c825c63986d03e44e1a
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Wed Aug 13 23:04:06 2008 +0200
Also ignore any *.bak files that gtk-doc might create
commit 97522025c4dfbd24b6224b88e49b4e97ebd93130
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Wed Aug 13 22:08:54 2008 +0200
Update .gitignore with gtk-doc generated files
commit f6a53147d1554c81f346ead79b663fa38c21f2bd
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Wed Aug 13 22:04:47 2008 +0200
Include API reference in the documentation
commit c0f9bee54e91386cff8cd00de07e13eb27fef43b
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Wed Aug 13 21:22:46 2008 +0200
First step to move over to gtk-doc support
commit d9abeb9bf3d1a48bbc6b1f17231061c069ffd1d8
Author: Marcel Holtmann <[EMAIL PROTECTED]>
Date: Wed Aug 13 21:20:35 2008 +0200
Remove page break characters
Diff in this email is a maximum of 400 lines.
diff --git a/.gitignore b/.gitignore
index 0a12d5a..39e522c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,13 @@ stamp-h1
autom4te.cache
gdbus.pc
+doc/*.bak
+doc/*.stamp
+doc/libgdbus.*
+doc/libgdbus-*.txt
+doc/*.sgml
+doc/version.xml
+doc/xml
doc/html
test/example
test/introspect
diff --git a/COPYING b/COPYING
index 3912109..6d45519 100644
--- a/COPYING
+++ b/COPYING
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not
licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
-
+
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering
equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
diff --git a/COPYING.LIB b/COPYING.LIB
index 8add30a..1f7c8cc 100644
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should
know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -111,7 +111,7 @@ modification follow. Pay close attention to the difference
between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
-
+
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -158,7 +158,7 @@ Library.
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
-
+
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@ instead of to this License. (If a newer version than
version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@ Library will still fall under Section 6.)
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not
normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@ subject to these terms and conditions. You may not impose
any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@ conditions either of that version or of any later version
published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
diff --git a/ChangeLog b/ChangeLog
index ba27052..f53df3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,2 +1,5 @@
+ver 0.2:
+ Use gtk-doc for API documentation.
+
ver 0.1:
Initial public release.
diff --git a/acinclude.m4 b/acinclude.m4
index 95486c3..9c51ddf 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -9,3 +9,37 @@ AC_DEFUN([AC_PROG_CC_PIE], [
rm -rf conftest*
])
])
+
+AC_DEFUN([GTK_DOC_CHECK],
+[
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+ dnl for overriding the documentation installation directory
+ AC_ARG_WITH([html-dir],
+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+ [with_html_dir='${datadir}/gtk-doc/html'])
+ HTML_DIR="$with_html_dir"
+ AC_SUBST([HTML_DIR])
+
+ dnl enable/disable documentation building
+ AC_ARG_ENABLE([gtk-doc],
+ AS_HELP_STRING([--enable-gtk-doc],
+ [use gtk-doc to build documentation [[default=no]]]),,
+ [enable_gtk_doc=no])
+
+ if test x$enable_gtk_doc = xyes; then
+ ifelse([$1],[],
+ [PKG_CHECK_EXISTS([gtk-doc],,
+ AC_MSG_ERROR([gtk-doc not installed and
--enable-gtk-doc requested]))],
+ [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed
to build gtk-doc]))])
+ fi
+
+ AC_MSG_CHECKING([whether to build gtk-doc documentation])
+ AC_MSG_RESULT($enable_gtk_doc)
+
+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
+
+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+])
diff --git a/bootstrap-configure b/bootstrap-configure
index f146de5..0de8cca 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -4,8 +4,12 @@ if [ -f config.status ]; then
make maintainer-clean
fi
+if [ ! -f doc/gtk-doc.make ]; then
+ gtkdocize --copy --docdir doc
+fi
+
./bootstrap && \
./configure --enable-maintainer-mode \
+ --enable-gtk-doc \
--enable-debug \
- --enable-doxygen \
--prefix=/usr
diff --git a/configure.ac b/configure.ac
index bf75f4b..a57b745 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ(2.50)
AC_INIT()
-AM_INIT_AUTOMAKE(libgdbus, 0.1)
+AM_INIT_AUTOMAKE(libgdbus, 0.2)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
@@ -22,6 +22,8 @@ m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])])
AC_PROG_LIBTOOL
+GTK_DOC_CHECK
+
AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
[enable compiling with debugging information]), [
if (test "${enableval}" = "yes" &&
@@ -39,11 +41,6 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie],
fi
])
-AC_PATH_PROG(DOXYGEN, [doxygen])
-
-AC_ARG_ENABLE(doxygen, AS_HELP_STRING([--enable-doxygen],
- [build documentation (requires Doxygen)]), dummy=yes, DOXYGEN="")
-
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.10, dummy=yes,
AC_MSG_ERROR(glib >= 2.10 is required))
@@ -60,4 +57,5 @@ AC_SUBST(DBUS_LIBS)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
-AC_OUTPUT(Makefile src/Makefile test/Makefile doc/Makefile doc/Doxyfile
gdbus.pc)
+AC_OUTPUT(Makefile src/Makefile test/Makefile
+ doc/Makefile doc/version.xml gdbus.pc)
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
deleted file mode 100644
index ac1425a..0000000
--- a/doc/Doxyfile.in
+++ /dev/null
@@ -1,169 +0,0 @@
-# Doxyfile 0.1
-
-#---------------------------------------------------------------------------
-# General configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME = libgdbus
-PROJECT_NUMBER = @VERSION@
-OUTPUT_DIRECTORY = @top_srcdir@/doc
-OUTPUT_LANGUAGE = English
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = NO
-EXTRACT_LOCAL_CLASSES = NO
-EXTRACT_LOCAL_METHODS = NO
-HIDE_UNDOC_MEMBERS = YES
-HIDE_UNDOC_CLASSES = YES
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ALWAYS_DETAILED_SEC = NO
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-INTERNAL_DOCS = NO
-STRIP_CODE_COMMENTS = YES
-CASE_SENSE_NAMES = YES
-SHORT_NAMES = NO
-HIDE_SCOPE_NAMES = NO
-VERBATIM_HEADERS = YES
-SHOW_INCLUDE_FILES = YES
-JAVADOC_AUTOBRIEF = YES
-INHERIT_DOCS = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-DISTRIBUTE_GROUP_DOC = NO
-TAB_SIZE = 8
-GENERATE_TODOLIST = NO
-GENERATE_TESTLIST = NO
-GENERATE_BUGLIST = NO
-ALIASES =
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-OPTIMIZE_OUTPUT_FOR_C = YES
-SHOW_USED_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = YES
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_FORMAT =
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = @top_srcdir@/src
-FILE_PATTERNS = *.c *.h
-RECURSIVE = NO
-#EXCLUDE = test
-EXCLUDE_PATTERNS = debug.h debug.c
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS =
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = NO
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT =
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 1
-GENERATE_TREEVIEW = NO
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT =
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT =
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
