[glibmm/gmmproc-refactor: 160/164] Merge branch 'master' into gmmproc-refactor
- From: Krzesimir Nowak <krnowak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm/gmmproc-refactor: 160/164] Merge branch 'master' into gmmproc-refactor
- Date: Fri, 13 Jul 2012 17:38:15 +0000 (UTC)
commit 6211aab1820196c990e7c16e9211253753c61d42
Merge: 684d661 169e440
Author: Krzesimir Nowak <qdlacz gmail com>
Date: Fri Jul 13 18:57:46 2012 +0200
Merge branch 'master' into gmmproc-refactor
Also, removed lots of files.
.gitignore | 8 +-
ChangeLog | 1399 +
MSVC_Net2005/giomm/giomm.vcproj | 128 +
MSVC_Net2005/glibmm/glibmm.vcproj | 8 +
MSVC_Net2008/giomm/giomm.vcproj | 128 +
MSVC_Net2008/glibmm/glibmm.vcproj | 8 +
MSVC_Net2010/giomm/giomm.vcxproj | 32 +
MSVC_Net2010/giomm/giomm.vcxproj.filters | 96 +
MSVC_Net2010/glibmm/glibmm.vcxproj | 2 +
MSVC_Net2010/glibmm/glibmm.vcxproj.filters | 6 +
NEWS | 303 +-
configure.ac | 30 +-
examples/Makefile.am | 12 +-
examples/network/resolver.cc | 36 +-
examples/network/socket-client.cc | 4 +-
examples/network/socket-server.cc | 4 +-
examples/thread/dispatcher.cc | 14 +-
examples/thread/dispatcher2.cc | 42 +-
examples/thread/thread.cc | 24 +-
examples/thread/threadpool.cc | 8 +-
gio/giomm.h | 9 +
gio/giomm/Makefile.am | 2 +-
gio/giomm/init.cc | 1 +
gio/giomm/slot_async.cc | 2 +
gio/giomm/wrap_init.h | 4 +-
gio/src/action.ccg | 2 +
gio/src/action.hg | 12 +-
gio/src/actiongroup.ccg | 3 +
gio/src/actiongroup.hg | 12 +-
gio/src/actionmap.ccg | 25 +
gio/src/actionmap.hg | 65 +
gio/src/appinfo.ccg | 4 +-
gio/src/appinfo.hg | 30 +-
gio/src/applaunchcontext.ccg | 25 +
gio/src/applaunchcontext.hg | 63 +
gio/src/application.ccg | 8 +-
gio/src/application.hg | 66 +-
gio/src/applicationcommandline.ccg | 1 +
gio/src/applicationcommandline.hg | 34 +-
gio/src/asyncinitable.ccg | 2 +
gio/src/asyncinitable.hg | 1 +
gio/src/asyncresult.ccg | 1 +
gio/src/bufferedinputstream.ccg | 1 +
gio/src/cancellable.ccg | 1 +
gio/src/credentials.ccg | 1 +
gio/src/credentials.hg | 2 +-
gio/src/datainputstream.ccg | 1 +
gio/src/datainputstream.hg | 15 +-
gio/src/dataoutputstream.ccg | 1 +
gio/src/dbusactiongroup.ccg | 24 +
gio/src/dbusactiongroup.hg | 58 +
gio/src/dbusaddress.ccg | 1 +
gio/src/dbusauthobserver.ccg | 1 +
gio/src/dbusauthobserver.hg | 2 +-
gio/src/dbusconnection.ccg | 71 +-
gio/src/dbusconnection.hg | 104 +-
gio/src/dbuserror.hg | 15 +-
gio/src/dbuserrorutils.ccg | 2 +
gio/src/dbuserrorutils.hg | 7 +
gio/src/dbusinterface.ccg | 27 +
gio/src/dbusinterface.hg | 76 +
gio/src/dbusinterfacevtable.ccg | 1 +
gio/src/dbusintrospection.ccg | 3 +
gio/src/dbusintrospection.hg | 1 +
gio/src/dbusmenumodel.ccg | 24 +
gio/src/dbusmenumodel.hg | 53 +
gio/src/dbusmessage.ccg | 3 +
gio/src/dbusmessage.hg | 3 +
gio/src/dbusmethodinvocation.ccg | 1 +
gio/src/dbusmethodinvocation.hg | 13 +
gio/src/dbusobject.ccg | 27 +
gio/src/dbusobject.hg | 79 +
gio/src/dbusownname.ccg | 1 +
gio/src/dbusproxy.ccg | 3 +
gio/src/dbusproxy.hg | 5 +
gio/src/dbusserver.ccg | 5 +-
gio/src/dbusserver.hg | 32 +-
gio/src/dbussubtreevtable.ccg | 1 +
gio/src/dbusutils.ccg | 1 +
gio/src/dbuswatchname.ccg | 1 +
gio/src/desktopappinfo.ccg | 1 +
gio/src/desktopappinfo.hg | 7 +
gio/src/drive.hg | 5 +-
gio/src/emblemedicon.hg | 2 +
gio/src/enums.hg | 1 +
gio/src/error.hg | 1 +
gio/src/file.hg | 1 +
gio/src/fileenumerator.hg | 1 +
gio/src/fileicon.hg | 2 +
gio/src/filelist.am | 65 +-
gio/src/filemonitor.ccg | 1 +
gio/src/filemonitor.hg | 2 +-
gio/src/filenamecompleter.ccg | 1 +
gio/src/filenamecompleter.hg | 1 +
gio/src/gio.defs | 8 -
gio/src/gio_docs.xml |32990 ---------------
gio/src/gio_docs_override.xml | 1783 -
gio/src/gio_enums.defs | 1146 -
gio/src/gio_extra_objects.defs | 127 -
gio/src/gio_methods.defs |14741 -------
gio/src/gio_methods.defs.patch | 66 -
gio/src/gio_others.defs | 44 -
gio/src/gio_signals.defs | 1882 -
gio/src/gio_signals.defs.patch | 40 -
gio/src/gio_unix_functions.defs | 725 -
gio/src/gio_vfuncs.defs | 667 -
gio/src/icon.ccg | 1 +
gio/src/inetaddress.hg | 2 +
gio/src/inetsocketaddress.hg | 5 +
gio/src/initable.ccg | 2 +
gio/src/inputstream.ccg | 33 +
gio/src/inputstream.hg | 21 +
gio/src/iostream.ccg | 1 +
gio/src/loadableicon.ccg | 1 +
gio/src/menu.ccg | 23 +
gio/src/menu.hg | 62 +
gio/src/menuattributeiter.ccg | 38 +
gio/src/menuattributeiter.hg | 48 +
gio/src/menuitem.ccg | 28 +
gio/src/menuitem.hg | 67 +
gio/src/menulinkiter.ccg | 37 +
gio/src/menulinkiter.hg | 50 +
gio/src/menumodel.ccg | 50 +
gio/src/menumodel.hg | 157 +
gio/src/mount.ccg | 2 +
gio/src/mount.hg | 1 +
gio/src/mountoperation.ccg | 1 +
gio/src/mountoperation.hg | 1 +
gio/src/networkaddress.ccg | 1 +
gio/src/outputstream.ccg | 33 +
gio/src/outputstream.hg | 16 +
gio/src/proxyresolver.ccg | 1 +
gio/src/remoteactiongroup.ccg | 23 +
gio/src/remoteactiongroup.hg | 68 +
gio/src/resolver.ccg | 1 +
gio/src/resource.ccg | 25 +
gio/src/resource.hg | 31 +
gio/src/seekable.hg | 1 +
gio/src/settings.ccg | 2 +
gio/src/settings.hg | 1 +
gio/src/simpleaction.ccg | 9 +-
gio/src/simpleaction.hg | 20 +-
gio/src/simpleactiongroup.hg | 9 +-
gio/src/socket.ccg | 1 +
gio/src/socket.hg | 2 +
gio/src/socketaddress.ccg | 1 +
gio/src/socketaddress.hg | 2 +
gio/src/socketaddressenumerator.ccg | 1 +
gio/src/socketconnection.hg | 4 +-
gio/src/socketcontrolmessage.ccg | 1 +
gio/src/socketservice.ccg | 1 +
gio/src/srvtarget.ccg | 1 +
gio/src/threadedsocketservice.ccg | 1 +
gio/src/unixfdlist.ccg | 1 +
gio/src/unixfdlist.hg | 1 +
gio/src/unixfdmessage.ccg | 1 +
gio/src/unixfdmessage.hg | 1 +
gio/src/volumemonitor.ccg | 1 +
gio/src/volumemonitor.hg | 1 +
glib/glibmm.h | 8 +-
glib/glibmm/Makefile.am | 2 +-
glib/glibmm/class.cc | 26 +-
glib/glibmm/dispatcher.cc | 104 +-
glib/glibmm/dispatcher.h | 7 +-
glib/glibmm/exceptionhandler.cc | 4 +-
glib/glibmm/exceptionhandler.h | 3 +-
glib/glibmm/main.cc | 90 +-
glib/glibmm/main.h | 125 +-
glib/glibmm/miscutils.cc | 4 +-
glib/glibmm/property.h | 78 +-
glib/glibmm/streamiochannel.cc | 1 +
glib/glibmm/threadpool.cc | 9 +-
glib/glibmm/threadpool.h | 2 +-
glib/glibmm/utility.h | 4 +-
glib/src/bytes.ccg | 27 +
glib/src/bytes.hg | 72 +
glib/src/checksum.hg | 2 +-
glib/src/date.ccg | 2 +-
glib/src/date.hg | 1 +
glib/src/datetime.hg | 2 +-
glib/src/filelist.am | 5 +-
glib/src/glib.defs | 7 -
glib/src/glib_docs.xml |44210 --------------------
glib/src/glib_docs_override.xml | 554 -
glib/src/glib_enums.defs | 1813 -
glib/src/glib_extra_objects.defs | 65 -
glib/src/glib_functions.defs |13459 ------
glib/src/glib_functions.defs.patch | 163 -
glib/src/gmodule_enums.defs | 20 -
glib/src/gmodule_functions.defs | 79 -
glib/src/gobject.defs | 3 -
glib/src/gobject_enums.defs | 187 -
glib/src/gobject_functions.defs | 3284 --
glib/src/iochannel.hg | 17 +-
glib/src/keyfile.hg | 2 +
glib/src/optioncontext.ccg | 8 +-
glib/src/thread.ccg | 73 +-
glib/src/thread.hg | 268 +-
glib/src/threads.ccg | 245 +
glib/src/threads.hg | 796 +
glib/src/value_basictypes.cc.m4 | 4 +
glib/src/valuearray.hg | 5 +
glib/src/variant.ccg | 16 +
glib/src/variant.hg | 4 +
glib/src/varianttype.ccg | 2 +-
tests/Makefile.am | 4 +-
tools/TrashCan/defs_fixer.pl | 196 -
tools/TrashCan/defs_gen/definitions.py | 575 -
tools/TrashCan/defs_gen/defsparser.py | 153 -
tools/TrashCan/defs_gen/docextract.py | 461 -
tools/TrashCan/defs_gen/docextract_to_xml.py | 142 -
tools/TrashCan/defs_gen/h2def.py | 631 -
tools/TrashCan/defs_gen/scmexpr.py | 143 -
tools/TrashCan/enum.pl | 469 -
tools/TrashCan/extra_defs_gen/generate_defs_gio.cc | 135 -
.../TrashCan/extra_defs_gen/generate_defs_glib.cc | 36 -
.../TrashCan/extra_defs_gen/generate_extra_defs.cc | 261 -
.../TrashCan/extra_defs_gen/generate_extra_defs.h | 54 -
tools/TrashCan/generate_wrap_init.pl.in | 347 -
tools/TrashCan/m4/base.m4 | 448 -
tools/TrashCan/m4/class_boxedtype.m4 | 218 -
tools/TrashCan/m4/class_boxedtype_static.m4 | 169 -
tools/TrashCan/m4/class_generic.m4 | 54 -
tools/TrashCan/m4/class_gobject.m4 | 275 -
tools/TrashCan/m4/class_interface.m4 | 274 -
tools/TrashCan/m4/class_opaque_copyable.m4 | 184 -
tools/TrashCan/m4/class_opaque_refcounted.m4 | 181 -
tools/TrashCan/m4/class_shared.m4 | 269 -
tools/TrashCan/m4/compare.m4 | 118 -
tools/TrashCan/m4/convert.m4 | 6 -
tools/TrashCan/m4/convert_base.m4 | 98 -
tools/TrashCan/m4/convert_gio.m4 | 240 -
tools/TrashCan/m4/convert_glib.m4 | 150 -
tools/TrashCan/m4/convert_glibmm.m4 | 6 -
tools/TrashCan/m4/ctor.m4 | 71 -
tools/TrashCan/m4/doc.m4 | 3 -
tools/TrashCan/m4/enum.m4 | 101 -
tools/TrashCan/m4/filelist.am | 28 -
tools/TrashCan/m4/gerror.m4 | 91 -
tools/TrashCan/m4/list.m4 | 232 -
tools/TrashCan/m4/member.m4 | 132 -
tools/TrashCan/m4/method.m4 | 103 -
tools/TrashCan/m4/property.m4 | 40 -
tools/TrashCan/m4/signal.m4 | 272 -
tools/TrashCan/m4/vfunc.m4 | 154 -
tools/TrashCan/pm/Base/Backend.pm | 219 -
tools/TrashCan/pm/Base/Entity.pm | 107 -
tools/TrashCan/pm/Base/Enum.pm | 95 -
tools/TrashCan/pm/Base/Exceptions.pm | 55 -
tools/TrashCan/pm/Base/Function.pm | 302 -
tools/TrashCan/pm/Base/Object.pm | 96 -
tools/TrashCan/pm/Base/Property.pm | 132 -
tools/TrashCan/pm/Common/Api.pm | 341 -
tools/TrashCan/pm/Common/DocsParser.pm | 552 -
tools/TrashCan/pm/Common/Function.pm | 385 -
tools/TrashCan/pm/Defs/Backend.pm | 592 -
tools/TrashCan/pm/Defs/Common.pm | 56 -
tools/TrashCan/pm/Defs/Enum.pm | 395 -
tools/TrashCan/pm/Defs/Function.pm | 196 -
tools/TrashCan/pm/Defs/Named.pm | 55 -
tools/TrashCan/pm/Defs/Object.pm | 113 -
tools/TrashCan/pm/Defs/Property.pm | 124 -
tools/TrashCan/pm/Defs/Signal.pm | 209 -
tools/TrashCan/pm/Enum.pm | 347 -
tools/TrashCan/pm/FunctionBase.pm | 362 -
tools/TrashCan/pm/GtkDefs.pm | 820 -
tools/TrashCan/pm/Object.pm | 72 -
tools/TrashCan/pm/Output.pm | 1091 -
tools/TrashCan/pm/Property.pm | 120 -
269 files changed, 5803 insertions(+), 132953 deletions(-)
---
diff --cc configure.ac
index 728f7be,8db4415..94df43a
--- a/configure.ac
+++ b/configure.ac
@@@ -61,20 -60,14 +61,18 @@@ AS_IF([test "x$enable_static" = xyes]
AC_DEFINE([GIOMM_STATIC_LIB], [1], [Define if giomm is built as a static library])
])
- glibreq='2.0 >= 2.29.8'
+ glibreq='2.0 >= 2.33.3'
+GM_MODULES="glib-$glibreq gobject-$glibreq"
- GLIBMM_MODULES="sigc++-2.0 >= 2.0.10 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
+ GLIBMM_MODULES="sigc++-2.0 >= 2.2.10 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"
PKG_CHECK_MODULES([GLIBMM], [$GLIBMM_MODULES])
PKG_CHECK_MODULES([GIOMM], [$GIOMM_MODULES])
+PKG_CHECK_MODULES([GM], [$GM_MODULES])
+
- MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
- MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0])
+MM_PKG_CONFIG_SUBST([GIRDIR], [--variable=girdir gobject-introspection-1.0])
AC_CHECK_PROGS([M4], [gm4 m4], [m4])
GLIB_GSETTINGS
@@@ -144,33 -134,33 +142,33 @@@ AC_CONFIG_FILES([Makefil
glib/${GLIBMM_MODULE_NAME}.pc:glib/glibmm.pc.in
glib/${GLIBMM_MODULE_NAME}-uninstalled.pc:glib/glibmm-uninstalled.pc.in
glib/src/Makefile
- glib/glibmm/Makefile
- gio/${GIOMM_MODULE_NAME}.pc:gio/giomm.pc.in
- gio/${GIOMM_MODULE_NAME}-uninstalled.pc:gio/giomm-uninstalled.pc.in
- gio/src/Makefile
- gio/giomm/Makefile
- tests/Makefile
+ glib/glibmm/Makefile])
+#AC_CONFIG_FILES([gio/${GIOMM_MODULE_NAME}.pc:gio/giomm.pc.in
+# gio/${GIOMM_MODULE_NAME}-uninstalled.pc:gio/giomm-uninstalled.pc.in
+# gio/src/Makefile
+# gio/giomm/Makefile])
+AC_CONFIG_FILES([tests/Makefile
examples/Makefile
docs/Makefile
- docs/reference/Doxyfile])
+ docs/reference/Doxyfile
MSVC_Net2005/glibmm/glibmm.rc
- MSVC_Net2005/giomm/giomm.rc
MSVC_Net2008/glibmm/glibmm.rc
- MSVC_Net2010/glibmm/glibmm.rc
- #C_CONFIG_FILES([MSVC_Net2005/giomm/giomm.rc
- # MSVC_Net2008/giomm/giomm.rc
- # MSVC_Net2010/giomm/giomm.rc])
- MSVC_Net2008/giomm/giomm.rc
- MSVC_Net2010/glibmm/glibmm.rc
- MSVC_Net2010/giomm/giomm.rc])
++ MSVC_Net2010/glibmm/glibmm.rc])
++#AC_CONFIG_FILES([MSVC_Net2005/giomm/giomm.rc
++# MSVC_Net2008/giomm/giomm.rc
++# MSVC_Net2010/giomm/giomm.rc])
# Copy the generated configuration headers into the MSVC project directories.
AC_CONFIG_COMMANDS([MSVC_Net2005/glibmm/glibmmconfig.h],
[cp -f glib/glibmmconfig.h MSVC_Net2005/glibmm/glibmmconfig.h])
-AC_CONFIG_COMMANDS([MSVC_Net2005/giomm/giommconfig.h],
- [cp -f gio/giommconfig.h MSVC_Net2005/giomm/giommconfig.h])
AC_CONFIG_COMMANDS([MSVC_Net2008/glibmm/glibmmconfig.h],
[cp -f glib/glibmmconfig.h MSVC_Net2008/glibmm/glibmmconfig.h])
-AC_CONFIG_COMMANDS([MSVC_Net2008/giomm/giommconfig.h],
- [cp -f gio/giommconfig.h MSVC_Net2008/giomm/giommconfig.h])
AC_CONFIG_COMMANDS([MSVC_Net2010/glibmm/glibmmconfig.h],
[cp -f glib/glibmmconfig.h MSVC_Net2010/glibmm/glibmmconfig.h])
- #C_CONFIG_COMMANDS([MSVC_Net2005/giomm/giommconfig.h],
- # [cp -f gio/giommconfig.h MSVC_Net2005/giomm/giommconfig.h])
- #C_CONFIG_COMMANDS([MSVC_Net2008/giomm/giommconfig.h],
- # [cp -f gio/giommconfig.h MSVC_Net2008/giomm/giommconfig.h])
- #C_CONFIG_COMMANDS([MSVC_Net2010/giomm/giommconfig.h],
- # [cp -f gio/giommconfig.h MSVC_Net2010/giomm/giommconfig.h])
-AC_CONFIG_COMMANDS([MSVC_Net2010/giomm/giommconfig.h],
- [cp -f gio/giommconfig.h MSVC_Net2010/giomm/giommconfig.h])
++#AC_CONFIG_COMMANDS([MSVC_Net2005/giomm/giommconfig.h],
++# [cp -f gio/giommconfig.h MSVC_Net2005/giomm/giommconfig.h])
++#AC_CONFIG_COMMANDS([MSVC_Net2008/giomm/giommconfig.h],
++# [cp -f gio/giommconfig.h MSVC_Net2008/giomm/giommconfig.h])
++#AC_CONFIG_COMMANDS([MSVC_Net2010/giomm/giommconfig.h],
++# [cp -f gio/giommconfig.h MSVC_Net2010/giomm/giommconfig.h])
AC_OUTPUT
diff --cc examples/Makefile.am
index 067b6ab,0de871a..998b350
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@@ -31,29 -38,20 +31,29 @@@ check_PROGRAMS =
thread/thread \
thread/threadpool
+#check_PROGRAMS += \
- # dbus/session_bus_service \
- # dbus/server_without_bus \
- # dbus/client_bus_listnames \
++# dbus/session_bus_service \
++# dbus/server_without_bus \
++# dbus/client_bus_listnames \
+# network/resolver \
+# network/socket-client \
+# network/socket-server \
+# settings/settings
+
glibmm_includes = -I$(top_builddir)/glib $(if $(srcdir:.=),-I$(top_srcdir)/glib)
-giomm_includes = -I$(top_builddir)/gio $(if $(srcdir:.=),-I$(top_srcdir)/gio)
+#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)
- AM_CXXFLAGS = $(GLIBMM_WXXFLAGS)
+ AM_CPPFLAGS = $(local_cppflags)
-AM_CXXFLAGS = $(GIOMM_CFLAGS) $(GLIBMM_WXXFLAGS) -DGLIBMM_DISABLE_DEPRECATED -DGIOMM_DISABLE_DEPRECATED
-
++AM_CXXFLAGS = $(GLIBMM_WXXFLAGS) -DGLIBMM_DISABLE_DEPRECATED -DGIOMM_DISABLE_DEPRECATED
+#AM_CXXFLAGS += $(GIOMM_CFLAGS)
local_libglibmm = $(top_builddir)/glib/glibmm/libglibmm-$(GLIBMM_API_VERSION).la
-local_libgiomm = $(top_builddir)/gio/giomm/libgiomm-$(GIOMM_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_ldadd = $(GIOMM_LIBS) $(local_libglibmm) $(local_libgiomm)
- thread_ldadd = $(GTHREAD_LIBS) $(GLIBMM_LIBS) $(local_libglibmm)
+ thread_ldadd = $(GLIBMM_LIBS) $(local_libglibmm)
child_watch_child_watch_SOURCES = child_watch/main.cc
iochannel_stream_example_SOURCES = \
diff --cc glib/glibmm/Makefile.am
index 2fbdde3,2b6daa9..7443564
--- a/glib/glibmm/Makefile.am
+++ b/glib/glibmm/Makefile.am
@@@ -34,5 -34,6 +34,5 @@@ local_cppflags = $(binding_includes) $(
libglibmm_ GLIBMM_API_VERSION@_la_SOURCES = $(binding_sources)
libglibmm_ GLIBMM_API_VERSION@_la_LDFLAGS = -no-undefined -version-info $(LIBGLIBMM_SO_VERSION)
libglibmm_ GLIBMM_API_VERSION@_la_LIBADD = $(GLIBMM_LIBS)
- libglibmm_ GLIBMM_API_VERSION@_la_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS) $(GLIBMM_CFLAGS)
++libglibmm_ GLIBMM_API_VERSION@_la_CPPFLAGS = $(local_cppflags) $(GLIBMM_CFLAGS)
+libglibmm_ GLIBMM_API_VERSION@_la_CXXFLAGS = $(GLIBMM_WXXFLAGS)
diff --cc glib/src/filelist.am
index 199a1d6,64b8b60..4a9d82b
--- a/glib/src/filelist.am
+++ b/glib/src/filelist.am
@@@ -1,8 -1,23 +1,10 @@@
## This file is part of glibmm.
- # Removed: threads.hg valuearray.hg
-glibmm_files_defs = \
- glib.defs \
- glib_enums.defs \
- glib_deprecated_enums.defs \
- glib_functions.defs \
- glib_extra_objects.defs \
- gmodule_enums.defs \
- gmodule_functions.defs \
- gobject.defs \
- gobject_enums.defs \
- gobject_functions.defs \
- glib_docs.xml \
- glib_docs_override.xml
-
+ # Note that all of thread.hg is deprecated
++# Removed: thread.hg valuearray.hg
glibmm_files_hg = \
balancedtree.hg \
+ bytes.hg \
checksum.hg \
convert.hg \
date.hg \
@@@ -19,6 -34,8 +21,7 @@@
regex.hg \
shell.hg \
spawn.hg \
- thread.hg \
+ threads.hg \
timezone.hg \
unicode.hg \
uriutils.hg \
diff --cc glib/src/thread.hg
index b2b1c1c,b1e6c7b..a0529b7
--- a/glib/src/thread.hg
+++ b/glib/src/thread.hg
@@@ -15,11 -15,41 +15,43 @@@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+_MODULE(GLib-2.0)
+
_DEFS(glibmm,glib)
+ _CONFIGINCLUDE(glibmmconfig.h)
+ _IS_DEPRECATED // This whole file is deprecated.
+
+ #m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+ // Must be included in the .cc file before the generated #ifndef GLIBMM_DISABLE_DEPRECATED,
+ // or else "configure --disable-deprecated-api" + "make" will fail.
#include <glibmmconfig.h>
+ #m4 _POP()
+
+ // We use GThreadFunctions in the (deprecated) API, so we must temporarily undef G_DISABLE_DEPRECATED.
+ // Temporarily undef G_DISABLE_DEPRECATED, redefining it later if appropriate.
+ #if defined(G_DISABLE_DEPRECATED) && !defined(GLIBMM_G_DISABLE_DEPRECATED_UNDEFED)
+
+ //Stop the deprecation ifdef guards around the API declarations:
+ #undef G_DISABLE_DEPRECATED
+
+ //Stop the compiler warnings about using the deprecated API;
+ #define GLIB_DISABLE_DEPRECATION_WARNINGS 1
+
+ #define GLIBMM_G_DISABLE_DEPRECATED_UNDEFED 1
+
+ #endif
+
+ #include <glib.h>
+
+ // Redefine G_DISABLE_DEPRECATED if it was defined before we temporarily undefed it:
+ #if defined(GLIBMM_G_DISABLE_DEPRECATED_UNDEFED)
+ #define G_DISABLE_DEPRECATED 1
+ #undef GLIB_DISABLE_DEPRECATION_WARNINGS
+ #undef GLIBMM_G_DISABLE_DEPRECATED_UNDEFED
+ #endif
+
+
#include <glibmm/error.h>
#include <glibmm/timeval.h>
#include <sigc++/sigc++.h>
diff --cc tests/Makefile.am
index abc9f3e,f58e18c..8b3940d
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -44,31 -41,30 +44,31 @@@ check_PROGRAMS =
TESTS = $(check_PROGRAMS)
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)
+#giomm_includes = -I$(top_builddir)/gio $(if $(srcdir:.=),-I$(top_srcdir)/gio)
+local_cppflags = -I$(top_builddir) $(glibmm_includes)
+#local_cppflags += $(giomm_includes)
- AM_CPPFLAGS = $(local_cppflags) $(GTHREAD_CFLAGS)
-AM_CPPFLAGS = $(local_cppflags) $(GIOMM_CFLAGS)
++AM_CPPFLAGS = $(local_cppflags)
+#AM_CPPFLAGS += $(GIOMM_CFLAGS)
- AM_CXXFLAGS = $(GLIBMM_WXXFLAGS)
+ AM_CXXFLAGS = $(GLIBMM_WXXFLAGS) -DGLIBMM_DISABLE_DEPRECATED -DGIOMM_DISABLE_DEPRECATED
-
local_libglibmm = $(top_builddir)/glib/glibmm/libglibmm-$(GLIBMM_API_VERSION).la
-local_libgiomm = $(top_builddir)/gio/giomm/libgiomm-$(GIOMM_API_VERSION).la
+#local_libgiomm = $(top_builddir)/gio/giomm/libgiomm-$(GIOMM_API_VERSION).la
LDADD = $(local_libglibmm) $(GLIBMM_LIBS)
-giomm_ldadd = $(local_libglibmm) $(local_libgiomm) $(GIOMM_LIBS)
+#giomm_ldadd = $(local_libglibmm) $(local_libgiomm) $(GIOMM_LIBS)
-giomm_ioerror_test_SOURCES = giomm_ioerror/main.cc
-giomm_ioerror_test_LDADD = $(giomm_ldadd)
+#giomm_ioerror_test_SOURCES = giomm_ioerror/main.cc
+#giomm_ioerror_test_LDADD = $(giomm_ldadd)
-giomm_ioerror_and_iodbuserror_test_SOURCES = giomm_ioerror_and_iodbuserror/main.cc
-giomm_ioerror_and_iodbuserror_test_LDADD = $(giomm_ldadd)
+#giomm_ioerror_and_iodbuserror_test_SOURCES = giomm_ioerror_and_iodbuserror/main.cc
+#giomm_ioerror_and_iodbuserror_test_LDADD = $(giomm_ldadd)
-giomm_simple_test_SOURCES = giomm_simple/main.cc
-giomm_simple_test_LDADD = $(giomm_ldadd)
+#giomm_simple_test_SOURCES = giomm_simple/main.cc
+#giomm_simple_test_LDADD = $(giomm_ldadd)
-giomm_asyncresult_sourceobject_test_SOURCES = giomm_asyncresult_sourceobject/main.cc
-giomm_asyncresult_sourceobject_test_LDADD = $(giomm_ldadd)
+#giomm_asyncresult_sourceobject_test_SOURCES = giomm_asyncresult_sourceobject/main.cc
+#giomm_asyncresult_sourceobject_test_LDADD = $(giomm_ldadd)
glibmm_btree_test_SOURCES = glibmm_btree/main.cc
glibmm_buildfilename_test_SOURCES = glibmm_buildfilename/main.cc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
