[glibmm/glibmm-2-20-mm-common: 169/179] Merge commit 'e2519d9c4dfcc121ece8deea466e2f108ec38e89' into glibmm-2-20-mm-common
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glibmm/glibmm-2-20-mm-common: 169/179] Merge commit 'e2519d9c4dfcc121ece8deea466e2f108ec38e89' into glibmm-2-20-mm-common
- Date: Sat, 5 Sep 2009 12:38:41 +0000 (UTC)
commit aa24e33f824ea96755c1102fb85ff338ae22ebaa
Merge: 74d60b3... e2519d9...
Author: Daniel Elstner <daniel kitta gmail com>
Date: Sat Sep 5 11:15:25 2009 +0200
Merge commit 'e2519d9c4dfcc121ece8deea466e2f108ec38e89' into glibmm-2-20-mm-common
Conflicts:
configure.ac
docs/reference/Doxyfile.in
examples/Makefile.am
gio/src/Makefile_list_of_hg.am_fragment
gio/src/drive.hg
gio/src/file.hg
gio/src/fileiostream.hg
gio/src/inetaddress.hg
gio/src/inetsocketaddress.hg
gio/src/initable.hg
gio/src/iostream.hg
gio/src/networkaddress.hg
gio/src/networkservice.hg
gio/src/resolver.hg
gio/src/socket.hg
gio/src/socketaddress.hg
gio/src/socketaddressenumerator.hg
gio/src/socketconnectable.hg
gio/src/srvtarget.hg
glib/glibmm/timeval.h
glib/src/Makefile_list_of_hg.am_fragment
glib/src/date.hg
glib/src/fileutils.hg
glib/src/valuearray.hg
tests/Makefile.am
.gitignore | 60 +-
ChangeLog | 578 +
MSVC_Net2005/Makefile.am | 3 -
MSVC_Net2005/examples/Makefile.am | 3 -
MSVC_Net2005/examples/dispatcher/Makefile.am | 1 -
MSVC_Net2005/examples/dispatcher2/Makefile.am | 1 -
MSVC_Net2005/examples/markup/Makefile.am | 1 -
MSVC_Net2005/examples/options/Makefile.am | 1 -
MSVC_Net2005/examples/thread/Makefile.am | 1 -
MSVC_Net2005/examples/thread_pool/Makefile.am | 1 -
MSVC_Net2005/filelist.am | 20 +
MSVC_Net2005/gendef/Makefile.am | 2 -
MSVC_Net2005/giomm/Makefile.am | 12 -
MSVC_Net2005/giomm/giomm.rc.in | 10 +-
MSVC_Net2005/glibmm/Makefile.am | 12 -
MSVC_Net2005/glibmm/glibmm.rc.in | 6 +-
MSVC_Net2005/tests/Makefile.am | 4 -
MSVC_Net2005/tests/giomm_simple/Makefile.am | 1 -
MSVC_Net2005/tests/glibmm_value/Makefile.am | 1 -
MSVC_Net2008/Makefile.am | 3 -
MSVC_Net2008/examples/Makefile.am | 3 -
MSVC_Net2008/examples/dispatcher/Makefile.am | 1 -
MSVC_Net2008/examples/dispatcher2/Makefile.am | 1 -
MSVC_Net2008/examples/markup/Makefile.am | 1 -
MSVC_Net2008/examples/options/Makefile.am | 1 -
MSVC_Net2008/examples/thread/Makefile.am | 1 -
MSVC_Net2008/examples/thread_pool/Makefile.am | 1 -
MSVC_Net2008/filelist.am | 19 +
MSVC_Net2008/gendef/Makefile.am | 2 -
MSVC_Net2008/giomm/Makefile.am | 12 -
MSVC_Net2008/giomm/giomm.rc.in | 10 +-
MSVC_Net2008/glibmm/Makefile.am | 12 -
MSVC_Net2008/glibmm/glibmm.rc.in | 6 +-
MSVC_Net2008/tests/Makefile.am | 4 -
MSVC_Net2008/tests/giomm_simple/Makefile.am | 1 -
MSVC_Net2008/tests/glibmm_value/Makefile.am | 1 -
Makefile.am | 219 +-
api_status.txt | 177 -
autogen.sh | 84 +-
build/.gitignore | 10 +
{scripts => build}/c_std.m4 | 0
build/cxx.m4 | 238 +
{scripts => build}/cxx_std.m4 | 1 -
{scripts => build}/dk-feature.m4 | 0
{scripts => build}/glibmm_check_perl.m4 | 0
{scripts => build}/macros.m4 | 0
{scripts => build}/reduced.m4 | 27 -
{scripts => build}/sun.m4 | 0
build_shared/Makefile_build.am_fragment | 50 -
build_shared/Makefile_build_gensrc.am_fragment | 86 -
build_shared/Makefile_gensrc.am_fragment | 70 -
config.h.in | 6 -
configure.ac | 461 +-
docs/Makefile.am | 82 +-
docs/images/Makefile.am | 16 -
docs/internal/Makefile.am | 10 -
docs/reference/Doxyfile.in | 1308 +-
docs/reference/Makefile.am | 96 -
docs/reference/README | 6 -
docs/reference/beautify_docs.pl.in | 81 -
docs/reference/doxygen_to_devhelp.xsl | 98 -
docs/reference/libstdc++.tag.xml |88452 ------------------------
examples/Makefile.am | 73 +-
examples/Makefile.am_fragment | 43 -
examples/README | 1 -
examples/child_watch/Makefile.am | 11 -
examples/compose/Makefile.am | 6 -
examples/iochannel_stream/Makefile.am | 11 -
examples/keyfile/Makefile.am | 7 -
examples/markup/Makefile.am | 8 -
examples/options/Makefile.am | 6 -
examples/properties/Makefile.am | 6 -
examples/regex/Makefile.am | 6 -
examples/thread/Makefile.am | 19 -
gio/Makefile.am | 13 -
gio/README | 7 -
gio/giomm-2.4.pc.in | 11 -
gio/giomm-uninstalled.pc.in | 10 +
gio/giomm.pc.in | 19 +
gio/giomm/Makefile.am | 77 +-
gio/giomm/contenttype.h | 4 +-
gio/giomm/filelist.am | 9 +
gio/giomm/private/.gitignore | 1 +
gio/giomm/private/Makefile.am | 14 -
gio/giommconfig.h.in | 96 +-
gio/src/Makefile.am | 38 +-
gio/src/Makefile_list_of_hg.am_fragment | 17 -
gio/src/appinfo.hg | 4 +-
gio/src/asyncresult.hg | 4 +-
gio/src/bufferedinputstream.hg | 2 +-
gio/src/bufferedoutputstream.hg | 2 +-
gio/src/cancellable.hg | 2 +-
gio/src/datainputstream.hg | 2 +-
gio/src/dataoutputstream.hg | 2 +-
gio/src/desktopappinfo.hg | 2 +-
gio/src/drive.hg | 8 +-
gio/src/emblem.hg | 2 +-
gio/src/emblemedicon.hg | 2 +-
gio/src/file.hg | 10 +-
gio/src/fileattributeinfo.hg | 2 +-
gio/src/fileattributeinfolist.hg | 2 +-
gio/src/fileenumerator.hg | 2 +-
gio/src/fileicon.hg | 2 +-
gio/src/fileinfo.hg | 2 +-
gio/src/fileinputstream.hg | 2 +-
gio/src/filelist.am | 77 +
gio/src/filemonitor.hg | 2 +-
gio/src/filenamecompleter.hg | 2 +-
gio/src/fileoutputstream.hg | 2 +-
gio/src/filterinputstream.hg | 2 +-
gio/src/filteroutputstream.hg | 2 +-
gio/src/icon.hg | 2 +-
gio/src/inputstream.hg | 2 +-
gio/src/loadableicon.hg | 2 +-
gio/src/memoryinputstream.hg | 2 +-
gio/src/memoryoutputstream.hg | 2 +-
gio/src/mount.hg | 8 +-
gio/src/mountoperation.hg | 2 +-
gio/src/outputstream.hg | 2 +-
gio/src/seekable.hg | 2 +-
gio/src/themedicon.hg | 2 +-
gio/src/unixinputstream.hg | 2 +-
gio/src/unixmount.hg | 2 +-
gio/src/unixoutputstream.hg | 2 +-
gio/src/volume.hg | 2 +-
gio/src/volumemonitor.hg | 2 +-
glib/Makefile.am | 12 -
glib/README | 1 -
glib/glibmm-2.4.pc.in | 12 -
glib/glibmm-uninstalled.pc.in | 13 +
glib/glibmm.pc.in | 22 +
glib/glibmm/Makefile.am | 143 +-
glib/glibmm/arrayhandle.h | 4 +-
glib/glibmm/containerhandle_shared.h | 25 +-
glib/glibmm/containers.h | 49 +-
glib/glibmm/debug.h | 4 +-
glib/glibmm/error.cc | 10 +-
glib/glibmm/error.h | 9 +-
glib/glibmm/exceptionhandler.cc | 11 +-
glib/glibmm/exceptionhandler.h | 4 +-
glib/glibmm/filelist.am | 86 +
glib/glibmm/listhandle.h | 6 +-
glib/glibmm/main.cc | 4 -
glib/glibmm/main.h | 17 +-
glib/glibmm/miscutils.h | 8 +-
glib/glibmm/object.h | 6 +-
glib/glibmm/objectbase.h | 12 +-
glib/glibmm/private/Makefile.am | 19 -
glib/glibmm/property.h | 2 +-
glib/glibmm/propertyproxy.h | 2 +-
glib/glibmm/propertyproxy_base.h | 2 -
glib/glibmm/quark.h | 5 +-
glib/glibmm/refptr.h | 5 +-
glib/glibmm/slisthandle.h | 6 +-
glib/glibmm/streamiochannel.cc | 3 -
glib/glibmm/streamiochannel.h | 10 +-
glib/glibmm/stringutils.cc | 7 +-
glib/glibmm/threadpool.cc | 6 +-
glib/glibmm/ustring.cc | 11 +-
glib/glibmm/ustring.h | 53 +-
glib/glibmm/utility.h | 7 +-
glib/glibmm/value.h | 5 +-
glib/glibmm/value_custom.h | 5 +-
glib/glibmm/wrap.cc | 12 +-
glib/glibmmconfig.h.in | 187 +-
glib/src/Makefile.am | 61 +-
glib/src/Makefile_list_of_hg.am_fragment | 13 -
glib/src/checksum.hg | 4 +-
glib/src/convert.hg | 4 +-
glib/src/date.ccg | 3 -
glib/src/date.hg | 13 +-
glib/src/filelist.am | 39 +
glib/src/fileutils.hg | 8 +-
glib/src/iochannel.hg | 6 +-
glib/src/keyfile.hg | 9 +-
glib/src/markup.hg | 5 -
glib/src/module.hg | 4 -
glib/src/nodetree.hg | 2 +-
glib/src/optioncontext.hg | 2 +-
glib/src/regex.hg | 3 +-
glib/src/shell.hg | 9 +-
glib/src/spawn.hg | 9 +-
glib/src/thread.hg | 10 +-
glib/src/uriutils.hg | 10 +-
scripts/Makefile.am | 8 -
scripts/README | 1 -
scripts/cxx.m4 | 364 -
scripts/dk-warn.m4 | 114 -
scripts/docgen.m4 | 75 -
tests/Makefile.am | 51 +-
tests/Makefile.am_fragment | 9 -
tests/giomm_ioerror/Makefile.am | 7 -
tests/giomm_simple/Makefile.am | 7 -
tests/glibmm_date/Makefile.am | 4 -
tests/glibmm_nodetree/Makefile.am | 7 -
tests/glibmm_ustring_compose/Makefile.am | 7 -
tests/glibmm_value/Makefile.am | 7 -
tools/Makefile.am | 58 +-
tools/Makefile_list_of_sources.am_fragment | 5 -
tools/extra_defs_gen/Makefile.am | 33 -
tools/generate_wrap_init.pl.in | 2 +-
tools/gmmproc.in | 28 +-
tools/m4/Makefile.am | 10 -
tools/m4/Makefile_list_of_sources.am_fragment | 8 -
tools/m4/base.m4 | 3 +
tools/m4/filelist.am | 33 +
tools/pm/DocsParser.pm | 13 +-
tools/pm/Makefile.am | 10 -
tools/pm/Makefile_list_of_sources.am_fragment | 2 -
tools/pm/filelist.am | 13 +
210 files changed, 2262 insertions(+), 92701 deletions(-)
---
diff --cc .gitignore
index 4cf122f,6989570..5ab97a6
--- a/.gitignore
+++ b/.gitignore
@@@ -51,9 -62,11 +62,10 @@@ giommconfig.
/examples/thread/dispatcher2
/examples/thread/thread
/examples/thread/threadpool
-/examples/network_io/resolve
# gio/
- /gio/giomm-2.4.pc
+ /gio/giomm-*.pc
+ /gio/giomm-*-uninstalled.pc
/gio/giomm/*.cc
!/gio/giomm/contenttype.cc
!/gio/giomm/init.cc
diff --cc ChangeLog
index daed459,4a10419..e310673
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,630 +1,581 @@@
+ 2009-08-21 Daniel Elstner <danielk openismus com>
+
+ Move #undef G_DISABLE_DEPRECATED out of header
+
+ * glib/src/date.hg: Push the #undef G_DISABLE_DEPRECATED into the
+ new SECTION_CC_PRE_INCLUDES rather than the public header file.
+
+ 2009-08-21 Daniel Elstner <danielk openismus com>
+
+ Add SECTION_CC_PRE_INCLUDES section to gmmproc
+
+ * tools/m4/base.m4: Define new SECTION_CC_PRE_INCLUDES and import
+ it at the top of the generated source file. This new section can
+ be used to insert custom code at the beginning of the translation
+ unit as seen by the compiler.
+
+ 2009-08-21 Daniel Elstner <danielk openismus com>
+
+ Use mm-common macro for --disable-deprecated-api
+
+ * configure.ac: Replace GLIBMM_ARG_ENABLE_API_DEPRECATED() with
+ the new MM_ARG_DISABLE_DEPRECATED_API() macro from mm-common.
+ (MM_PREREQ): Raise requirement to mm-common 0.6.
+ * build/reduced.m4 (GLIBMM_ARG_ENABLE_API_DEPRECATED): Remove
+ obsolete macro definition.
+ * glib/glibmmconfig.h.in (GLIBMM_DISABLE_DEPRECATED): Copy #undef
+ statement from config.h.in template.
+ * gio/giommconfig.h.in (GIOMM_DISABLE_DEPRECATED): ditto.
+
+ 2009-08-21 Daniel Elstner <danielk openismus com>
+
+ Insist on working Perl in maintainer mode
+
+ * configure.ac: Call MM_CHECK_PERL in maintainer mode in order
+ to verify early that the Perl interpreter is working.
+
+ 2009-08-20 Daniel Elstner <danielk openismus com>
+
+ Rename @since back to @newin
+
+ * docs/reference/Doxyfile.in (ALIASES): Rename the @since alias
+ back to its old name @newin, but otherwise keep the parameters.
+ Apparently there is a @since command predefined in Doxygen which
+ I hadn't noticed. It does seem to get overridden silently, but
+ it is better not to rely on this.
+ * tools/pm/DocsParser.pm (convert_tags_to_doxygen): Output @newin
+ instead of @since.
+ * {glib,gio}/src/*.hg, {glib,gio}/{glib,gio}mm/*.h: Replace all
+ uses of @since with @newin.
+
+ 2009-08-20 Daniel Elstner <danielk openismus com>
+
+ Predefine GIOMM_API for Doxygen
+
+ * docs/reference/Doxyfile.in (PREDEFINED): Define GIOMM_API to the
+ empty expansion, so that it won't show up in the documentation.
+
+ 2009-08-20 Daniel Elstner <danielk openismus com>
+
+ Substitute API version in filenames dynamically
+
+ * glib/glibmm.pc.in: Rename file from glib/glibmm-2.4.pc.in.
+ * glib/glibmm-uninstalled.pc.in: Rename file from
+ glib/glibmm-2.4-uninstalled.pc.in.
+ * gio/giomm.pc.in: Rename file from gio/giomm-2.4.pc.in.
+ * gio/giomm-uninstalled.pc.in: Rename file from
+ gio/giomm-2.4-uninstalled.pc.in.
+ * configure.ac (AC_CONFIG_FILES): Insert ${GLIBMM_MODULE_NAME}
+ and ${GIOMM_MODULE_NAME} into output filenames and remove the
+ hard-coded version from the input filenames.
+ * glib/glibmm/Makefile.am (lib_LTLIBRARIES): Substitute
+ @GLIBMM_API_VERSION@ into the libtool archive name as well as
+ the variable names derived from it instead of hard-coding the
+ API version.
+
+ 2009-08-20 Daniel Elstner <danielk openismus com>
+
+ Do not hard-code API version in resource files
+
+ * MSVC_Net200[58]/glibmm/glibmm.rc.in: Use newer @PACKAGE_VERSION@
+ substitution in place of @VERSION Substitute @GLIBMM_MODULE_NAME@
+ instead of hardcoding the API version.
+ * MSVC_Net200[58]/giomm/giomm.rc.in: Use newer @PACKAGE_VERSION@
+ substitution in place of @VERSION Substitute @GIOMM_MODULE_NAME@
+ instead of hardcoding the API version. Replace @GLIBMM_*_VERSION@
+ substitutions with their @GIOMM_*_VERSION@ equivalents.
+
+ 2009-08-19 Daniel Elstner <danielk openismus com>
+
+ Predefine GLIBMM_API for Doxygen
+
+ * docs/reference/Doxyfile.in (PREDEFINED): Define GLIBMM_API to the
+ empty expansion, so that it won't show up in the documentation.
+
+ 2009-08-18 Daniel Elstner <danielk openismus com>
+
+ Prepend tools/pm/ to Perl include path
+
+ * g{lib,io}/src/Makefile.am (gmmproc): Pass -I$(top_srcdir)/tools/pm
+ to the Perl interpreter when invoking the local gmmproc, so that it
+ will pick up the modules from the source tree instead of an existing
+ glibmm installation.
+ * tools/gmmproc.in (BEGIN): Substitute @GLIBMM_MODULE_NAME@ instead
+ of hard-coding the location.
+
+ 2009-08-18 Daniel Elstner <danielk openismus com>
+
+ Implement parametric Doxygen alias @since{m,n}
+
+ * docs/reference/Doxyfile.in (ALIASES): Define a parametrized alias
+ @since{major,minor} to replace the old @newin?p?* aliases which had
+ to be defined manually for every version number used.
+ (PREDEFINED): Predefine G_GNUC_NORETURN, G_GNUC_NULL_TERMINATED and
+ G_GNUC_PURE to the empty expansion. Remove GTKMM_* macros.
+ * tools/pm/DocsParser.pm (convert_tags_to_doxygen): Change "Since:"
+ substitution to output the new generic @since alias.
+ * {glib,gio}/src/*.hg, {glib,gio}/{glib,gio}mm/*.h: Change all uses
+ of @newin?p?* to @since{major,minor}.
+
+ 2009-08-17 Daniel Elstner <danielk openismus com>
+
+ Append slash to overridden $(htmlrefpub)
+
+ * docs/Makefile.am (htmlrefpub): Append trailing slash for
+ consistency with the non-overridden value.
+
+ 2009-08-17 Daniel Elstner <danielk openismus com>
+
+ Exclude GTimeVal and nil from the documentation
+
+ * docs/reference/Doxyfile.in (EXCLUDE_SYMBOLS): Add GTimeVal and
+ nil to the list of symbols to exclude from the documentation.
+
+ 2009-08-17 Daniel Elstner <daniel kitta gmail com>
+
+ Reenable JAVADOC_AUTOBRIEF mode of Doxygen
+
+ * docs/reference/Doxyfile.in (JAVADOC_AUTOBRIEF): Change value
+ back to 'YES'. I accidentally turned off the setting during the
+ build infrastructure transition.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Unbreak List_Iterator::operator->()
+
+ * glib/glibmm/containers.h ({S,}List_Iterator::operator->):
+ Use &**this, not &*this. Oops.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Define GLIBMM_USING_STD() as dummy no-op
+
+ * glib/glibmmconfig.h.in (GLIBMM_USING_STD): Resurrect macro
+ for backwards compatibility, but unconditionally define it to
+ the empty expansion.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Define GLIBMM_BUILD and GIOMM_BUILD
+
+ * glib/glibmm/Makefile.am (local_cppflags): Add -DGLIBMM_BUILD=1.
+ * gio/giomm/Makefile.am (local_cppflags): Add -DGIOMM_BUILD=1.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Slightly clean up List_Iterator helper classes
+
+ * glib/glibmm/containers.h ({S,}List_Iterator): Smooth out
+ a number of eye sores I had stumbled upon in the code.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Correct nesting mistakes in Autoconf macros
+
+ * build/cxx.m4: Fix the incorrect nesting of parentheses with
+ about every other AC_COMPILE_IFELSE/AC_LANG_PROGRAM construct.
+ My fault, ooops.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Clean up g{lib,io}mmconfig.h.in templates
+
+ * glib/glibmmconfig.h.in: Rewrite, copying large chunks from
+ the autoheader-generated config.h.in template.
+ * gio/giommconfig.h.in: Remove everything that belongs to glibmm
+ and include glibmmconfig.h.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Set GTHREAD_LIBS to the full --libs value again
+
+ * configure.ac (GTHREAD_LIBS): Go back to pkg-config --libs
+ to retrieve the linker flags to use with threaded programs.
+ For some reason --libs-only-other does not include -pthread.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Get rid of all uses of GLIBMM_USING_STD()
+
+ * glib/src/*.{ccg,hg}: Remove all uses of GLIBMM_USING_STD().
+ We definitely do not need this anymore, and probably never
+ did. We never covered all symbols from namespace std anyway
+ and never got any complaint about it. Also, be careful to
+ always include the glibmmconfig.h header when it is needed.
+ * glib/glibmm/*.{cc,h}: ditto.
+ * glib/glibmmconfig.h.in: Clean up and re-indent.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Clean up C++ compiler test Autoconf macros
+
+ * build/cxx.m4: Clean up M4 code and switch to non-deprecated
+ Autoconf macros.
+ (AC_CXX_NAMESPACES), (AC_CXX_BOOL), (AC_CXX_MUTABLE): Remove
+ obsolete feature check macros.
+ * configure.ac: Remove AC_CXX_NAMESPACES(), AC_CXX_BOOL(),
+ AC_CXX_MUTABLE() and GLIBMM_CXX_HAS_NAMESPACE_STD checks.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Remove now optional macro arguments
+
+ * configure.ac: Insert MM_PREREQ([0.4]) macro call.
+ (MM_INIT_MODULE): Remove the now optional second macro argument.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Move M4 files from scripts/ over to build/
+
+ * scripts/*.m4: Move files over to the build/ directory, in order
+ to be more consistent with the directory layout of other binding
+ modules that switched to the new build organization.
+ * Makefile.am (ACLOCAL_AMFLAGS): Search build/ for M4 files.
+ (dist_aclocal_macro_DATA): Adjust directory prefix to build/.
+ * configure.ac (AC_CONFIG_MACRO_DIR): Place third-party Autoconf
+ macros into the build/ directory.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Use hammer method to avoid admitting to be wrong
+
+ * glib/README, gio/README: Oops, looks like I was wrong in my
+ assumption that these files would be distributed automatically by
+ Automake. In order to save face, I thought I might just delete
+ them then, as their content is not very useful anyway.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Stop distributing README files manually
+
+ * Makefile.am (text_files): Remove glib/README and gio/README as
+ files named README are distributed automatically by Automake.
+ (msvc_files): Use the more readable and safer $(addprefix ...)
+ function of GNU make instead of a $(foo:%=prefix/%) substitution.
+ (DISTCLEANFILES): Use $(filter %mmconfig.h,$(msvc_files)) instead
+ of listing the generated configuration header files manually.
+
+ 2009-08-16 Daniel Elstner <daniel kitta gmail com>
+
+ Provide g{lib,io}mm-2.4-uninstalled.pc files
+
+ * glib/glibmm-2.4-uninstalled.pc.in: New file to provide a pkg-config
+ configuration for building against an uninstalled glibmm library.
+ * gio/giomm-2.4-uninstalled.pc.in: ditto for giomm.
+ * glib/glibmm-2.4.pc.in (htmlrefpub): Append slash to URL.
+ * gio/giomm-2.4.pc.in (htmlrefpub): ditto.
+ * configure.ac (AC_CONFIG_FILES): List glib/glibmm-2.4-uninstalled.pc
+ and gio/giomm-2.4-uninstalled.pc output files.
+
+ 2009-08-11 Daniel Elstner <danielk openismus com>
+
+ Add missing datadir substitution to .pc file
+
+ * glib/glibmm-2.4.pc.in (datadir): Substitute value, as it is
+ used as a component of doctooldir later in the file.
+ * gio/giomm-2.4.pc.in (datadir): Substitute value, just in case.
+ * docs/Makefile.am: Remove overrides of the documentation
+ utilities, since MM_CONFIG_DOCTOOL_DIR() already takes care
+ of setting MMDOCTOOLDIR to the local directory.
+
+ 2009-08-10 Daniel Elstner <danielk openismus com>
+
+ Get rid of some old Autoconf macro cruft
+
+ * scripts/dk-warn.m4: Delete file, since the functionality is now
+ provided by MM_ARG_ENABLE_WARNINGS() from the mm-common module.
+ * scripts/docgen.m4: Delete obsolete file.
+ * scripts/cxx_std.m4: Remove stray text snippet from the top of the
+ file. Probably a cut'n'paste accident.
+ * scripts/cxx.m4 (GLIBMM_MEMBER_FUNCTIONS_MEMBER_TEMPLATES): Do not
+ AC_DEFINE to 0 in the else branch, as that will do the wrong thing
+ when #ifdef is used instead of #if.
+ * scripts/README: Delete file consisting solely of whitespace.
+ * configure.ac: Add note on pointless test for namespace std.
+
+ 2009-08-10 Daniel Elstner <danielk openismus com>
+
+ Clean up configure check for Windows host
+
+ * configure.ac (OS_WIN32): Rename conditional to HOST_WINDOWS_NATIVE
+ because the OS vs platform terminology confused the hell out of me.
+ Remove the check for a non-native Windows host such as Cygwin, since
+ the corresponding conditional is not used anymore.
+
+ 2009-08-10 Daniel Elstner <danielk openismus com>
+
+ Have mm-common-prepare install the doc utils
+
+ * configure.ac: Call MM_CONFIG_DOCTOOL_DIR([docs]) to set
+ up the destination directory for mm-common-prepare to copy
+ the documentation utilities to.
+ * docs/doc-install.pl: Delete file.
+ * docs/doc-postprocess.pl: ditto,
+ * docs/tagfile-to-devhelp2.xsl: ditto.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Distribute README.SUN and autogen.sh
+
+ * Makefile.am (text_files): Add README.SUN.
+ (dist_noinst_SCRIPTS): List autogen.sh.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Use versioned directory for documentation tools
+
+ * docs/Makefile.am (doctooldir): Use the versioned module
+ name instead of the package name as $(datadir) subdirectory.
+ * glib/glibmm-2.4.pc.in (doctooldir): Change the variable
+ value accordingly.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Provide documentation location via pkg-config
+
+ * glib/glibmm-2.4.pc.in: Clean up and modernize the values,
+ and make use of more configure variable substitutions.
+ (datarootdir): Substitute @datarootdir
+ (gmmprocdir): Remove the @GMMPROC_DIR@ substitution and expand
+ ${libdir} indirectly.
+ (doctooldir): New variable pointing to the location of the
+ installed utilities for building the reference documentation.
+ (docdir), (doxytagfile), (htmlrefdir), (htmlrefpub): Provide
+ meta information on the installed reference documentation in
+ these new pkg-config variables.
+ * gio/giomm-2.4.pc.in: Clean up and modernize the values,
+ and make use of more configure variable substitutions.
+ (datarootdir): Substitute @datarootdir
+ (docdir), (doxytagfile), (htmlrefdir), (htmlrefpub): Provide
+ meta information on the installed reference documentation in
+ these new pkg-config variables. The values are identical to
+ the glibmm-2.4 ones because the documentation is bundled.
+ * docs/Makefile.am (hmtlrefpub): Override the public web URL
+ of the reference documentation, since the currently uploaded
+ documentation still has the redundant docs/ component in the
+ base path.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Get make distcheck to pass cleanly
+
+ * Makefile.am (DISTCLEANFILES): List the configuration header
+ copies made by the AC_CONFIG_COMMANDS() as files to delete.
+ * configure.ac (AM_INIT_AUTOMAKE): Switch to POSIX archive
+ format (pax) for tar, because just as with libsigc++ the
+ filenames generated by Doxygen exceed the tar-ustar limit.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Work around Automake cleverness failure
+
+ * gio/giomm/filelist.am (giomm_files_built_ph): Use the GNU
+ make $(patsubst ...) function instead of $(var:%=foo%bar) if
+ a simple $(var:.a=.b) is not sufficient. Apparently Automake
+ is able to expand some of these constructs statically, but in
+ some cases it will actually produce the wrong result. Using
+ $(patsubst ...) helps to avoid the problem because Automake
+ does not attempt to expand it.
+ * glib/glibmm/filelist.am (glibmm_files_built_ph): Use the
+ $(patsubst ...) function here, too.
+ * gio/src/filelist.am (giomm_files_used_hg): Define another
+ intermediate variable to avoid repetition.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Get rid of all Makefile.am in the MSVC dirs
+
+ * MSVC_Net2005/**/Makefile.am: Delete recursive build files.
+ * MSVC_Net2008/**/Makefile.am: ditto.
+ * MSVC_Net2005/filelist.am: New file. Recursively list all
+ files that should go into the distribution.
+ * MSVC_Net2008/filelist.am: ditto.
+ * configure.ac (AC_CONFIG_FILES): Remove all Makefile outputs
+ to the MSVC subdirectories. Combine all the remaining output
+ files into a single argument to just one AC_CONFIG_FILES call.
+ Follow through with a number of TODO comments and remove some
+ old cruft which is no longer used anywhere in the module.
+ (AC_CONFIG_COMMANDS): Copy the configuration header files into
+ the MSVC subdirectories by making config.status execute custom
+ configuration commands. This is easier than doing it at the
+ Makefile level, where it was previously implemented.
+ * Makefile.am: Include the filelist.am files from the MSVC
+ subdirectories.
+ (SUBDIRS): Remove MSVC_Net200[58] directories from the list.
+ (dist_noinst_DATA): Distribute the MSVC project files.
+ * tools/gmmproc.in: Substitute @PERL@ instead of @PERL_PATH
+ * tools/generate_wrap_init.pl.in: ditto.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Bring back the giomm reference documentation
+
+ * glib/{src,glibmm}/filelist.am: Add namespace prefix glibmm_
+ to variable names, so that the file lists of glibmm and giomm
+ can be included together without conflicts.
+ * gio/{src,giomm}/filelist.am: Add namespace prefix giomm_ to
+ variable names.
+ * glib/{src,glibmm}/Makefile.am: Copy the namespace-prefixed
+ make variables to non-prefixed variables, so that the Automake
+ include files from mm-common will pick up the values.
+ * gio/{src,giomm}/Makefile.am: ditto.
+ * docs/Makefile.am: Include file lists of giomm.
+ (doc_input): List the header files of both glibmm and giomm.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Begin move to new documentation infrastructure
+
+ * configure.ac (AC_CONFIG_FILES): Remove the old build files
+ docs/{images,internal,reference}/Makefile from the list. Also
+ remove the obsolete docs/reference/beautify_docs.pl.
+ * docs/Makefile.am: Big overhaul. Reimplement on top of the
+ new documentation infrastructure provided with the mm-common
+ module. Build, distribute and install files which used to be
+ handled by the subdirectories' Makefiles directly from here.
+ Note that the generated reference documentation at the moment
+ only covers glibmm without giomm. Remedy follows.
+ * docs/reference/Doxyfile.in: Replace configuration with the
+ modernized version from librsvgmm, appropriately modified for
+ glibmm. Make use of the new substitutions provided by the
+ mm-common Autoconf magic.
+ * docs/doc-install.pl: Copy script from mm-common. Install
+ it into $(pkgdatadir)/doctool.
+ * docs/doc-postprocess.pl: ditto,
+ * docs/tagfile-to-devhelp2.xsl: ditto.
+ * docs/images/Makefile.am: Delete subdirectory Makefile.
+ * docs/internal/Makefile.am: ditto,
+ * docs/reference/Makefile.am: ditto.
+ * docs/reference/README: Delete file, as it documents exactly
+ the things I just ripped.
+ * docs/reference/beautify_docs.pl.in: Delete obsolete file.
+ * docs/reference/doxygen_to_devhelp.xsl: ditto,
+ * docs/reference/libstdc++.tag.xml: ditto.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Convert examples/ sub-tree to non-recursive build
+
+ * examples/Makefile.am: Rewrite to a non-recursive build of
+ all example programs with a single control file. Hook the
+ build of the example programs to the make check target.
+ * examples/Makefile.am_fragment: Delete obsolete file.
+ * examples/*/Makefile.am: Delete obsolete files.
+ * examples/README: Delete file, as it was empty anyway apart
+ from a single whitespace character.
+ * configure.ac (AC_CONFIG_FILES): Remove examples/*/Makefile
+ output files from the list.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Convert tests/ sub-tree to non-recursive build
+
+ * tests/Makefile.am: Rewrite to a non-recursive build of all
+ test programs with a single control file. Hook the the build
+ of the test programs to the make check target.
+ * tests/Makefile.am_fragment: Delete obsolete file.
+ * tests/*/Makefile.am: Delete obsolete files.
+ * configure.ac (AC_CONFIG_FILES): Remove tests/*/Makefile
+ output files from the list.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Delete now unused build_shared/ subdirectory
+
+ * build_shared/*.am_fragment: Delete files, as they are no
+ longer used anywhere.
+ * tools/Makefile_list_of_sources.am_fragment: Delete file,
+ * tools/m4/Makefile_list_of_sources.am_fragment: ditto,
+ * tools/pm/Makefile_list_of_sources.am_fragment: ditto.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Convert gio/ sub-tree to new build system
+
+ * gio/src/filelist.am: New file for defining the lists of
+ gmmproc input files.
+ * gio/src/Makefile.am: Clean up and modernize. Integrate
+ with the new generate-binding.am build file from mm-common.
+ * gio/giomm/filelist.am: New file for the lists of source
+ code files, both generated and static. Also list files from
+ the private/ subdirectory here.
+ * gio/giomm/Makefile.am: Clean up and modernize. Integrate
+ with the new compile-binding.am build file from mm-common.
+ * configure.ac (AC_CONFIG_FILES): Remove the output file
+ gio/giomm/private/Makefile from the list.
+ * gio/giomm/private/Makefile.am: Delete file.
+ * gio/src/Makefile_list_of_hg.am_fragment: Delete file.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Convert glib/ sub-tree to new build system
+
+ * glib/src/filelist.am: New file for defining the lists of
+ gmmproc input files and M4 template files.
+ * glib/src/Makefile.am: Clean up and modernize. Integrate
+ with the new generate-binding.am build file from mm-common.
+ * glib/glibmm/filelist.am: New file for the lists of source
+ code files, both generated and static. Also list files from
+ the private/ subdirectory here.
+ * glib/glibmm/Makefile.am: Clean up and modernize. Integrate
+ with the new compile-binding.am build file from mm-common.
+ * configure.ac (AC_CONFIG_FILES): Remove the output file
+ glib/glibmm/private/Makefile from the list.
+ * glib/glibmm/private/Makefile.am: Delete file.
+ * glib/src/Makefile_list_of_hg.am_fragment: Delete file.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Do not recurse into scripts/ subdirectory
+
+ * Makefile.am: Install scripts/glibmm_check_perl.m4 from here.
+ * scripts/Makefile.am: Delete file.
+ * configure.ac (AC_CONFIG_FILES): Remove scripts/Makefile.
+
+ 2009-08-09 Daniel Elstner <danielk openismus com>
+
+ Convert tools/ directory to new build system
+
+ * configure.ac (AC_CONFIG_FILES): Remove the output files
+ tools/{extra_defs_gen,m4,pm}/Makefile from the list.
+ * tools/Makefile.am: Clean up. Build, distribute and install the
+ contents of all three subdirectories. Rename generate_extra_defs
+ executable to generate_defs_glib.
+ * tools/m4/filelist.am: New file to hold the list of M4 files.
+ * tools/pm/filelist.am: New file to hold the list of Perl modules.
+ * tools/{extra_defs_gen,m4,pm}/Makefile.am: Delete files.
+
+ 2009-08-08 Daniel Elstner <danielk openismus com>
+
+ Remove glib/Makefile.am and gio/Makefile.am
+
+ * Makefile.am: Move things from glib/Makefile.am and gio/Makefile.am
+ to the toplevel. Remove the improvised custom convenience rules for
+ now.
+ (SUBDIRS): Enter the glib/src, gio/src, glib/glibmm and gio/giomm
+ subdirectories directly from the toplevel. Use indirect variables
+ to define the conditionally entered subdirectories.
+ * configure.ac: Call macros from mm-common for preparing the build of
+ the reference documentation. Remove {glib,gio}/Makefile.am from the
+ AC_CONFIG_FILES list. Avoid repeating the version requirement for all
+ the basic g* libraries when constructing the list of dependencies for
+ pkg-config.
+ * {glib,gio}/Makefile.am: Remove files.
+
+ 2009-08-07 Daniel Elstner <danielk openismus com>
+
+ Begin transition to new build infrastructure
+
+ * autogen.sh: Replace script with a minimalistic wrapper around
+ mm-common-prepare, autoreconf and configure.
+ * Makefile.am (ACLOCAL_AMFLAGS): Pick up ${ACLOCAL_FLAGS} from the
+ environment, so that autoreconf can do its magic.
+ * configure.ac: Modernize. Cut loads of old cruft. Make use of
+ magic mm-common macros to simplify things. Declare build/ as the
+ destination for auxiliary build files. Add TODO comments to flag
+ the pieces that still need cutting. Re-enable autoheader.
+ * config.h.in: Remove file, and have autoheader generate it.
+
-2009-07-27 José Alburquerque <jaalburqu svn gnome org>
-
- * gio/src/memoryinputstream.ccg: Correct the if condition in
- Gio::MemoryInputStream::add_data() to coincide correctly with copying
- data that is null terminated (as docs say).
-
-2.21.3:
-
-2009-07-27 Jonathon Jongsma <jonathon jongsma collabora co uk>
-
- * NEWS:
- * configure.ac: update for release
-
-2009-07-26 Jonathon Jongsma <jonathon jongsma collabora co uk>
-
- * glib/glibmm/objectbase.cc:
- * glib/glibmm/objectbase.h: add freeze_notify()/thaw_notify. Fixes
- Bug #575533
-
-2009-07-26 Jonathon Jongsma <jonathon quotidian org>
-
- * gio/src/memoryinputstream.ccg: fix a build error with explicit
- casts. I had made this change before, but apparently i forgot to
- commit it.
-
-2009-07-26 Jonathon Jongsma <jonathon quotidian org>
-
- * gio/src/memoryinputstream.ccg:
- * gio/src/memoryinputstream.hg: fix MemoryInputStream::add_data() so
- that it copies the memory internally. This function was basically
- unusable before except with statically allocated memory.
- Otherwise the memory would have been leaked (if the caller did not
- free it) or the memory could have been corrupted (if the caller
- freed it before the MemoryInputStream was finished using it). The
- std::string version was susceptible to memory corruption as well,
- so we take a copy of that string as well. To avoid needing to
- always copy the memory, I also introduced an overload which
- accepts a GDestroyNotify function that will free the memory when
- the object is finished with it. Fixes Bug #589683.
-
-2009-07-26 Krzesimir Nowak <krnowak svn gnome org>
-
- * glib/glibmm/timeval.cc:
- * glib/glibmm/timeval.h: Wrapped g_time_val_from_iso8601()
- and g_time_val_to_iso8601().
- * glib/src/date.ccg:
- * glib/src/date.hg: Wrapped
- g_date_get_iso8601_week_of_year().
-
2009-07-17 David King <davidk openismus com>
* examples/properties/properties_example.cc: Only compile the
diff --cc configure.ac
index 043bd8e,de71df0..fe14e2b
--- a/configure.ac
+++ b/configure.ac
@@@ -1,210 -1,84 +1,84 @@@
- # Configure.in
- #
- # This file tests for various compiler features needed to configure
- # the gtkmm package. Original skeleton was provided by Stephan Kulow.
- # All tests were written by Tero Pulkkinen, Mirko Streckenbach, and
- # Karl Nelson.
- #
- # NOTE! IF YOU DO CHANGES HERE, CHECK IF YOU NEED TO MODIFY .m4 TOO!!!
- #
- # Copyright 2001 Free Software Foundation
- # Copyright 1999 gtkmm Development Team
- # Copyright 1998 Stephan Kulow
- #
-
- pushdef([GLIBMM_MAJOR_VERSION], [2])
- pushdef([GLIBMM_MINOR_VERSION], [20])
- pushdef([GLIBMM_MICRO_VERSION], [1])
- pushdef([GLIBMM_EXTRA_VERSION], [])
- pushdef([GLIBMM_VERSION], GLIBMM_MAJOR_VERSION.GLIBMM_MINOR_VERSION.GLIBMM_MICRO_VERSION[]GLIBMM_EXTRA_VERSION)
-
- AC_INIT([glibmm], GLIBMM_VERSION, [gtkmm-list gnome org])
- AC_PREREQ([2.58])
- AC_CONFIG_SRCDIR([glib/glibmmconfig.h.in])
- AC_CONFIG_MACRO_DIR([scripts])
-
- #########################################################################
- # Version and initialization
- #########################################################################
- [GLIBMM_MAJOR_VERSION]=GLIBMM_MAJOR_VERSION
- [GLIBMM_MINOR_VERSION]=GLIBMM_MINOR_VERSION
- [GLIBMM_MICRO_VERSION]=GLIBMM_MICRO_VERSION
- [GLIBMM_EXTRA_VERSION]=GLIBMM_EXTRA_VERSION
- [GLIBMM_VERSION]=GLIBMM_VERSION
- popdef([GLIBMM_MAJOR_VERSION])
- popdef([GLIBMM_MINOR_VERSION])
- popdef([GLIBMM_MICRO_VERSION])
- popdef([GLIBMM_EXTRA_VERSION])
- popdef([GLIBMM_VERSION])
- GLIBMM_RELEASE=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION
- AC_DEFINE_UNQUOTED(GLIBMM_MAJOR_VERSION, $GLIBMM_MAJOR_VERSION, [Major version of gtkmm])
- AC_DEFINE_UNQUOTED(GLIBMM_MINOR_VERSION, $GLIBMM_MINOR_VERSION, [Minor version of gtkmm])
- AC_DEFINE_UNQUOTED(GLIBMM_MICRO_VERSION, $GLIBMM_MICRO_VERSION, [Micro version of gtkmm])
- AC_SUBST(GLIBMM_MAJOR_VERSION)
- AC_SUBST(GLIBMM_MINOR_VERSION)
- AC_SUBST(GLIBMM_MICRO_VERSION)
- AC_SUBST(GLIBMM_VERSION)
- AC_SUBST(GLIBMM_RELEASE)
-
- #
- # +1 : ? : +1 == new interface that does not break old one
- # +1 : ? : 0 == new interface that breaks old one
- # ? : ? : 0 == no new interfaces, but breaks apps
- # ? :+1 : ? == just some internal changes, nothing breaks but might work
- # better
- # CURRENT : REVISION : AGE
- LIBGLIBMM_SO_VERSION=3:0:2
- AC_SUBST(LIBGLIBMM_SO_VERSION)
-
- AC_CONFIG_AUX_DIR(scripts)
-
- dnl Initialize automake stuff
- AM_INIT_AUTOMAKE([1.7 gnu])
-
- dnl Specify a configuration file (no autoheader)
- AM_CONFIG_HEADER(config.h glib/glibmmconfig.h gio/giommconfig.h)
+ ## Copyright (c) 2009 Openismus GmbH <http://www.openismus.com/>
+ ##
+ ## This file is part of glibmm.
+ ##
+ ## glibmm is free software: you can redistribute it and/or modify it
+ ## under the terms of the GNU Lesser General Public License as published
+ ## by the Free Software Foundation, either version 2.1 of the License,
+ ## or (at your option) any later version.
+ ##
+ ## glibmm is distributed in the hope that it will be useful, but
+ ## WITHOUT ANY WARRANTY; without even the implied warranty of
+ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ ## See the GNU Lesser General Public License for more details.
+ ##
+ ## You should have received a copy of the GNU Lesser General Public License
+ ## along with this library. If not, see <http://www.gnu.org/licenses/>.
+
-AC_INIT([glibmm], [2.21.3], [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
++AC_INIT([glibmm], [2.20.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
+ [glibmm], [http://www.gtkmm.org/])
+ AC_PREREQ([2.59])
+
+ AC_CONFIG_SRCDIR([glib/glibmm.h])
+ AC_CONFIG_AUX_DIR([build])
+ AC_CONFIG_MACRO_DIR([build])
+ AC_CONFIG_HEADERS([config.h glib/glibmmconfig.h gio/giommconfig.h])
+
+ AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 no-define nostdinc tar-pax])
AM_MAINTAINER_MODE
- AL_ACLOCAL_INCLUDE(scripts)
+ AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
+ MM_PREREQ([0.6])
+ MM_INIT_MODULE([glibmm-2.4])
+ MM_INIT_MODULE([giomm-2.4])
+ MM_CONFIG_DOCTOOL_DIR([docs])
- #########################################################################
- # Configure arguments
- #########################################################################
+ # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+ AC_SUBST([LIBGLIBMM_SO_VERSION], [3:0:2])
- #########################################################################
- # Environment Checks
- #########################################################################
- AC_PROG_CC
- AC_PROG_CPP
- AC_PROG_MAKE_SET
- AC_CANONICAL_BUILD
- AC_CANONICAL_HOST
-
- dnl Used for enabling the "-no-undefined" flag while generating DLLs
- dnl Copied from the official gtk+-2 configure.in
- AC_MSG_CHECKING([for some Win32 platform])
- case "$host" in
- *-*-mingw*|*-*-cygwin*)
- platform_win32=yes
- ;;
- *)
- platform_win32=no
- ;;
- esac
- AC_MSG_RESULT([$platform_win32])
- AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
-
- AC_MSG_CHECKING([for native Win32])
- case "$host" in
- *-*-mingw*)
- os_win32=yes
- ;;
- *)
- os_win32=no
- ;;
- esac
- AC_MSG_RESULT([$os_win32])
- AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
-
- # Disable static libraries by default
+ AC_PROG_CXX
AC_DISABLE_STATIC
-
- if test x$enable_static = "xyes"; then
- AC_DEFINE([GLIBMM_STATIC_LIB],[1], [Defined when glibmm is built as a static library])
- AC_DEFINE([GIOMM_STATIC_LIB],[1], [Defined when giomm is built as a static library])
- fi
-
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
+ MM_PATH_PERL
+ AS_IF([test "x$USE_MAINTAINER_MODE" != xno], [MM_CHECK_PERL])
- AL_PROG_GNU_M4(AC_MSG_ERROR([dnl
- SUN m4 does not work for building gtkmm.
- Please install GNU m4.]))
-
- AL_PROG_GNU_MAKE(AC_MSG_ERROR([dnl
- SUN make does not work for building gtkmm.
- Please install GNU make.]))
-
- GLIBMM_CHECK_PERL([5.6.0])
-
- #########################################################################
- # Function checks
- #########################################################################
-
- # functions used in demos/gtk-demo. Undefined in config.h !
- AC_CHECK_FUNCS([flockfile funlockfile getc_unlocked mkfifo])
-
- #########################################################################
- # Dependancy checks
- #########################################################################
- gtkmm_min_sigc_version=2.0.0
- gtkmm_min_glib_version=2.19.8
-
- PKG_CHECK_MODULES(GLIBMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version})
- AC_SUBST(GLIBMM_CFLAGS)
- AC_SUBST(GLIBMM_LIBS)
+ AC_MSG_CHECKING([for native Windows host])
+ AS_CASE([$host_os], [mingw*], [glibmm_host_windows=yes], [glibmm_host_windows=no])
+ AC_MSG_RESULT([$glibmm_host_windows])
+ AM_CONDITIONAL([HOST_WINDOWS_NATIVE], [test "x$glibmm_host_windows" = xyes])
+ # TODO: This makes no sense. --danielk
+ AS_IF([test "x$enable_static" = xyes],
+ [
+ AC_DEFINE([GLIBMM_STATIC_LIB], [1], [Define if glibmm is built as a static library])
+ AC_DEFINE([GIOMM_STATIC_LIB], [1], [Define if giomm is built as a static library])
+ ])
- # Only check for gio-unix-2.0 on non-win32 platform, because that API is Unix-specific.
- if test x"$os_win32" = xyes; then
- PKG_CHECK_MODULES(GIOMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version} gio-2.0 >= ${gtkmm_min_glib_version})
- else
- PKG_CHECK_MODULES(GIOMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version} gio-2.0 >= ${gtkmm_min_glib_version} gio-unix-2.0 >= ${gtkmm_min_glib_version})
- fi
- AC_SUBST(GIOMM_CFLAGS)
- AC_SUBST(GIOMM_LIBS)
+ glibreq='2.0 >= 2.21.1'
+ GLIBMM_MODULES="sigc++-2.0 >= 2.0 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
+ GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq"
+ test "x$glibmm_host_windows" = xyes || GIOMM_MODULES="$GIOMM_MODULES gio-unix-$glibreq"
- # gthread isn't a requirement, but we should use its CFLAGS if available.
- PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= ${gtkmm_min_glib_version},[],[GTHREAD_CFLAGS=''; GTHREAD_LIBS=''])
- AC_SUBST(GTHREAD_CFLAGS)
- AC_SUBST(GTHREAD_LIBS)
+ PKG_CHECK_MODULES([GLIBMM], [$GLIBMM_MODULES])
+ PKG_CHECK_MODULES([GIOMM], [$GIOMM_MODULES])
- #location to install gmmproc tools
- GMMPROC_DIR=[${libdir}/glibmm-2.4/proc]
- AC_SUBST([GMMPROC_DIR])
+ MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
+ MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0])
- #########################################################################
- # C++ checks
- #########################################################################
- AC_PROG_CXX
+ AC_CHECK_PROGS([M4], [gm4 m4], [m4])
- # Check for the SUN Forte compiler, and define GLIBMM_COMPILER_SUN_FORTE in the header.
+ # Check for the SUN Forte compiler, and define GLIBMM_COMPILER_SUN_FORTE
+ # in the header.
GLIBMM_PROG_CXX_SUN
+ AC_CHECK_FUNCS([flockfile funlockfile getc_unlocked mkfifo])
+
# Ensure MSVC-compatible struct packing convention is used when
# compiling for Win32 with gcc.
- # What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
- # gcc2 uses "-fnative-struct".
- if test x"$os_win32" = xyes; then
- if test x"$GCC" = xyes -a x"$GXX" = xyes; then
- msnative_struct=''
- AC_MSG_CHECKING([how to get MSVC-compatible struct packing])
- if test -z "$ac_cv_prog_CC"; then
- our_gcc="$CC"
- else
- our_gcc="$ac_cv_prog_CC"
- fi
- case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in
- 2.)
- if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then
- msnative_struct='-fnative-struct'
- fi
- ;;
- *)
- if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then
- msnative_struct='-mms-bitfields'
- fi
- ;;
- esac
- if test x"$msnative_struct" = x ; then
- AC_MSG_RESULT([no way])
- AC_MSG_WARN([produced libraries might be incompatible with MSVC-compiled code])
- else
- CXXFLAGS="$CXXFLAGS $msnative_struct"
- AC_MSG_RESULT([${msnative_struct}])
- fi
- fi
- fi
+ # TODO: Disabled for now. I don't think this should be enabled by the
+ # libraries themselves on behalf of the user. That makes no sense as
+ # it is a platform-wide ABI choice.
AC_LANG([C++])
diff --cc examples/Makefile.am
index ccc9014,5d69948..823a3d7
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@@ -1,21 -1,72 +1,68 @@@
- example_dirs = child_watch compose iochannel_stream markup options properties regex thread keyfile
+ ## Copyright (c) 2009 Openismus GmbH <http://www.openismus.com/>
+ ##
+ ## This file is part of glibmm.
+ ##
+ ## glibmm is free software: you can redistribute it and/or modify it
+ ## under the terms of the GNU Lesser General Public License as published
+ ## by the Free Software Foundation, either version 2.1 of the License,
+ ## or (at your option) any later version.
+ ##
+ ## glibmm is distributed in the hope that it will be useful, but
+ ## WITHOUT ANY WARRANTY; without even the implied warranty of
+ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ ## See the GNU Lesser General Public License for more details.
+ ##
+ ## You should have received a copy of the GNU Lesser General Public License
+ ## along with this library. If not, see <http://www.gnu.org/licenses/>.
- # These use gtkmm stuff:
- # thread
+ AUTOMAKE_OPTIONS = subdir-objects
- SUBDIRS = $(example_dirs)
- EXTRA_DIST = README Makefile.am_fragment
+ check_PROGRAMS = \
+ child_watch/child_watch \
+ compose/example \
+ iochannel_stream/example \
+ keyfile/example \
+ markup/parser \
- network_io/resolve \
+ options/example \
+ properties/example \
+ regex/example \
+ thread/dispatcher \
+ thread/dispatcher2 \
+ thread/thread \
+ thread/threadpool
- #Web upload:
- include $(top_srcdir)/docs/Makefile_web.am_fragment
+ glibmm_includes = -I$(top_builddir)/glib $(if $(srcdir:.=),-I$(top_srcdir)/glib)
+ giomm_includes = -I$(top_builddir)/gio $(if $(srcdir:.=),-I$(top_srcdir)/gio)
+ local_cppflags = -I$(top_builddir) $(glibmm_includes) $(giomm_includes)
- web_path = $(web_path_gtkmm)examples
+ AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(GIOMM_CFLAGS)
+ AM_CXXFLAGS = $(GLIBMM_WXXFLAGS)
- #rsync --cvs-exclude ignores *.o and anything in .cvsignore and some more:
- rsync_options = -vzr --rsh ssh --cvs-exclude --delete-excluded --exclude=.libs --exclude=.deps --exclude=core --exclude=.cvsignore --exclude=a.out --exclude=Makefile --exclude=Makefile.in
+ local_libglibmm = $(top_builddir)/glib/glibmm/libglibmm-$(GLIBMM_API_VERSION).la
+ local_libgiomm = $(top_builddir)/gio/giomm/libgiomm-$(GIOMM_API_VERSION).la
- post-html:
- rsync $(rsync_options) $(example_dirs) $$USER $(web_host):$(web_path)
+ LDADD = $(GLIBMM_LIBS) $(local_libglibmm)
+ giomm_ldadd = $(GIOMM_LIBS) $(local_libglibmm) $(local_libgiomm)
+ thread_ldadd = $(GTHREAD_LIBS) $(GLIBMM_LIBS) $(local_libglibmm)
- .PHONY: post-html
+ child_watch_child_watch_SOURCES = child_watch/main.cc
+ iochannel_stream_example_SOURCES = \
+ iochannel_stream/fdstream.cc \
+ iochannel_stream/fdstream.h \
+ iochannel_stream/main.cc
+ compose_example_SOURCES = compose/main.cc
+ keyfile_example_SOURCES = keyfile/main.cc
+ markup_parser_SOURCES = markup/parser.cc
+ options_example_SOURCES = options/main.cc
+ properties_example_SOURCES = properties/properties_example.cc
+ regex_example_SOURCES = regex/main.cc
+
+ thread_dispatcher_SOURCES = thread/dispatcher.cc
+ thread_dispatcher_LDADD = $(thread_ldadd)
+ thread_dispatcher2_SOURCES = thread/dispatcher2.cc
+ thread_dispatcher2_LDADD = $(thread_ldadd)
+ thread_thread_SOURCES = thread/thread.cc
+ thread_thread_LDADD = $(thread_ldadd)
+ thread_threadpool_SOURCES = thread/threadpool.cc
+ thread_threadpool_LDADD = $(thread_ldadd)
-
-network_io_resolve_SOURCES = network_io/resolve.cc
-network_io_resolve_LDADD = $(giomm_ldadd)
diff --cc gio/src/drive.hg
index 14a2a4c,e82496f..27f1073
--- a/gio/src/drive.hg
+++ b/gio/src/drive.hg
@@@ -112,7 -124,29 +112,7 @@@ public
_WRAP_METHOD(std::string get_identifier(const std::string& kind) const, g_drive_get_identifier)
_WRAP_METHOD(Glib::StringArrayHandle enumerate_identifiers() const, g_drive_enumerate_identifiers)
- /** @newin2p20
- /** @newin{2,22} */
- void start(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot, DriveStartFlags flags = DRIVE_START_NONE);
- /** @newin{2,22} */
- void start(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, DriveStartFlags flags = DRIVE_START_NONE);
- _IGNORE(g_drive_start)
- _WRAP_METHOD(bool start_finish(const Glib::RefPtr<AsyncResult>& result), g_drive_start_finish, errthrow)
- /** @newin{2,22} */
- _WRAP_METHOD(bool can_start() const, g_drive_can_start)
- /** @newin{2,22} */
- _WRAP_METHOD(bool can_start_degraded() const, g_drive_can_start_degraded)
-
- /** @newin{2,22} */
- void stop(const Glib::RefPtr<MountOperation>& mount_operation, const Glib::RefPtr<Cancellable>& cancellable, const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- /** @newin{2,22} */
- void stop(const Glib::RefPtr<MountOperation>& mount_operation, const SlotAsyncReady& slot, MountUnmountFlags flags = MOUNT_UNMOUNT_NONE);
- _IGNORE(g_drive_stop)
- _WRAP_METHOD(bool stop_finish(const Glib::RefPtr<AsyncResult>& result), g_drive_stop_finish, errthrow)
- /** @newin{2,22} */
- _WRAP_METHOD(bool can_stop() const, g_drive_can_stop)
-
- _WRAP_METHOD(DriveStartStopType get_start_stop_type() const, g_drive_get_start_stop_type)
-
+ /** @newin{2,20}
*/
_WRAP_SIGNAL(void changed(), changed, no_default_handler)
diff --cc tests/Makefile.am
index 1d2feba,6be2346..95b24fb
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -1,4 -1,51 +1,49 @@@
- test_dirs = glibmm_value glibmm_nodetree glibmm_date glibmm_ustring_compose giomm_simple giomm_ioerror
+ ## Copyright (c) 2009 Openismus GmbH <http://www.openismus.com/>
+ ##
+ ## This file is part of glibmm.
+ ##
+ ## glibmm is free software: you can redistribute it and/or modify it
+ ## under the terms of the GNU Lesser General Public License as published
+ ## by the Free Software Foundation, either version 2.1 of the License,
+ ## or (at your option) any later version.
+ ##
+ ## glibmm is distributed in the hope that it will be useful, but
+ ## WITHOUT ANY WARRANTY; without even the implied warranty of
+ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ ## See the GNU Lesser General Public License for more details.
+ ##
+ ## You should have received a copy of the GNU Lesser General Public License
+ ## along with this library. If not, see <http://www.gnu.org/licenses/>.
- SUBDIRS = $(test_dirs)
- EXTRA_DIST = Makefile.am_fragment
+ AUTOMAKE_OPTIONS = subdir-objects
+
+ check_PROGRAMS = \
+ giomm_ioerror/test \
+ giomm_simple/test \
+ glibmm_date/test \
+ glibmm_nodetree/test \
+ glibmm_ustring_compose/test \
- glibmm_value/test \
- glibmm_valuearray/test
++ glibmm_value/test
+
+ glibmm_includes = -I$(top_builddir)/glib $(if $(srcdir:.=),-I$(top_srcdir)/glib)
+ giomm_includes = -I$(top_builddir)/gio $(if $(srcdir:.=),-I$(top_srcdir)/gio)
+ local_cppflags = -I$(top_builddir) $(glibmm_includes) $(giomm_includes)
+
+ AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(GIOMM_CFLAGS)
+ AM_CXXFLAGS = $(GLIBMM_WXXFLAGS)
+
+ local_libglibmm = $(top_builddir)/glib/glibmm/libglibmm-$(GLIBMM_API_VERSION).la
+ local_libgiomm = $(top_builddir)/gio/giomm/libgiomm-$(GIOMM_API_VERSION).la
+
+ LDADD = $(GLIBMM_LIBS) $(local_libglibmm)
+ giomm_ldadd = $(GIOMM_LIBS) $(local_libglibmm) $(local_libgiomm)
+
+ giomm_ioerror_test_SOURCES = giomm_ioerror/main.cc
+ giomm_ioerror_test_LDADD = $(giomm_ldadd)
+ giomm_simple_test_SOURCES = giomm_simple/main.cc
+ giomm_simple_test_LDADD = $(giomm_ldadd)
+
+ glibmm_date_test_SOURCES = glibmm_date/main.cc
+ glibmm_nodetree_test_SOURCES = glibmm_nodetree/main.cc
+ glibmm_ustring_compose_test_SOURCES = glibmm_ustring_compose/main.cc
+ glibmm_value_test_SOURCES = glibmm_value/glibmm_value.cc glibmm_value/main.cc
-glibmm_valuearray_test_SOURCES = glibmm_valuearray/main.cc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
