Rework the build system for a new tests approach
Perform a substantial cleanup of the build system with respect to
building and installing testcases.
First, Makefile.decl has been renamed glib.mk and substantially
expanded. We intend to add more stuff here in the future, like canned
rules for mkenums, marshallers, resources, etc.
By default, tests are no longer compiled as part of 'make'. They will
be built when 'make check' is run. The old behaviour can be obtained
with --enable-always-build-tests.
--disable-modular-tests is gone (because tests are no longer built by
default). There is no longer any way to cause 'make check' to be a
no-op, but that's not very useful anyway.
A new glibtests.m4 file is introduced. Along with glib.mk, this
provides for consistent handling of --enable-installed-tests and
--enable-always-build-tests (mentioned above).
Port our various test-installing Makefiles to the new framework.
This patch substantially improves the situation in the toplevel tests/
directory. Things are now somewhat under control there. There were
some tests being built that weren't even being run and we run those now.
The long-running GObject performance tests in this directory have been
removed from 'make check' because they take too long.
As an experiment, 'make check' now runs the testcases on win32 builds,
by default. We can't run them under gtester (since it uses a pipe to
communicate with the subprocess) so just toss them in TESTS. Most of
them are passing on win32.
Things are not quite done here, but this patch is already a substantial
improvement. More to come.
2013-05-30 06:07:32 +02:00
|
|
|
include $(top_srcdir)/glib.mk
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2011-08-23 07:32:18 +02:00
|
|
|
SUBDIRS = gdbus-2.0/codegen
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
|
if OS_UNIX
|
2011-08-31 20:33:33 +02:00
|
|
|
SUBDIRS += xdgmime
|
2007-11-26 17:13:05 +01:00
|
|
|
endif
|
|
|
|
|
|
2008-04-21 10:38:36 +02:00
|
|
|
if OS_WIN32_AND_DLL_COMPILATION
|
2008-03-13 18:10:04 +01:00
|
|
|
if MS_LIB_AVAILABLE
|
Rework the build system for a new tests approach
Perform a substantial cleanup of the build system with respect to
building and installing testcases.
First, Makefile.decl has been renamed glib.mk and substantially
expanded. We intend to add more stuff here in the future, like canned
rules for mkenums, marshallers, resources, etc.
By default, tests are no longer compiled as part of 'make'. They will
be built when 'make check' is run. The old behaviour can be obtained
with --enable-always-build-tests.
--disable-modular-tests is gone (because tests are no longer built by
default). There is no longer any way to cause 'make check' to be a
no-op, but that's not very useful anyway.
A new glibtests.m4 file is introduced. Along with glib.mk, this
provides for consistent handling of --enable-installed-tests and
--enable-always-build-tests (mentioned above).
Port our various test-installing Makefiles to the new framework.
This patch substantially improves the situation in the toplevel tests/
directory. Things are now somewhat under control there. There were
some tests being built that weren't even being run and we run those now.
The long-running GObject performance tests in this directory have been
removed from 'make check' because they take too long.
As an experiment, 'make check' now runs the testcases on win32 builds,
by default. We can't run them under gtester (since it uses a pipe to
communicate with the subprocess) so just toss them in TESTS. Most of
them are passing on win32.
Things are not quite done here, but this patch is already a substantial
improvement. More to come.
2013-05-30 06:07:32 +02:00
|
|
|
noinst_DATA += gio-2.0.lib
|
2008-03-13 18:10:04 +01:00
|
|
|
|
2008-04-21 10:38:36 +02:00
|
|
|
install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
|
|
|
|
|
uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib
|
|
|
|
|
endif
|
|
|
|
|
endif
|
2008-03-13 18:10:04 +01:00
|
|
|
|
|
|
|
|
install-ms-lib:
|
2008-04-21 10:38:36 +02:00
|
|
|
$(install_ms_lib_cmd)
|
|
|
|
|
|
2008-03-13 18:10:04 +01:00
|
|
|
uninstall-ms-lib:
|
2008-04-21 10:38:36 +02:00
|
|
|
$(uninstall_ms_lib_cmd)
|
2008-03-13 18:10:04 +01:00
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
AM_CPPFLAGS = \
|
|
|
|
|
-DG_LOG_DOMAIN=\"GLib-GIO\" \
|
2010-08-06 19:09:26 +02:00
|
|
|
$(gmodule_INCLUDES) \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(GLIB_DEBUG_FLAGS) \
|
2007-12-14 11:35:24 +01:00
|
|
|
-DGIO_COMPILATION \
|
2007-11-27 13:39:14 +01:00
|
|
|
-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2013-02-26 17:19:51 +01:00
|
|
|
AM_CFLAGS = $(GLIB_WARN_CFLAGS)
|
|
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
lib_LTLIBRARIES = libgio-2.0.la
|
|
|
|
|
|
2010-05-06 20:13:59 +02:00
|
|
|
gdbus_headers = \
|
|
|
|
|
gdbusauthobserver.h \
|
|
|
|
|
gcredentials.h \
|
|
|
|
|
gdbusutils.h \
|
|
|
|
|
gdbuserror.h \
|
|
|
|
|
gdbusaddress.h \
|
|
|
|
|
gdbusconnection.h \
|
|
|
|
|
gdbusmessage.h \
|
|
|
|
|
gdbusnameowning.h \
|
|
|
|
|
gdbusnamewatching.h \
|
|
|
|
|
gdbusproxy.h \
|
|
|
|
|
gdbusintrospection.h \
|
|
|
|
|
gdbusmethodinvocation.h \
|
|
|
|
|
gdbusserver.h \
|
2011-04-08 21:14:47 +02:00
|
|
|
gdbusinterface.h \
|
2011-04-13 22:33:51 +02:00
|
|
|
gdbusinterfaceskeleton.h \
|
2011-04-08 21:14:47 +02:00
|
|
|
gdbusobject.h \
|
2011-04-13 22:33:51 +02:00
|
|
|
gdbusobjectskeleton.h \
|
2011-04-08 21:14:47 +02:00
|
|
|
gdbusobjectproxy.h \
|
|
|
|
|
gdbusobjectmanager.h \
|
|
|
|
|
gdbusobjectmanagerclient.h \
|
|
|
|
|
gdbusobjectmanagerserver.h \
|
2012-04-18 23:21:13 +02:00
|
|
|
gtestdbus.h \
|
2010-05-06 20:13:59 +02:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
gdbus_sources = \
|
|
|
|
|
gdbusutils.h gdbusutils.c \
|
|
|
|
|
gdbusaddress.h gdbusaddress.c \
|
|
|
|
|
gdbusauthobserver.h gdbusauthobserver.c \
|
|
|
|
|
gdbusauth.h gdbusauth.c \
|
|
|
|
|
gdbusauthmechanism.h gdbusauthmechanism.c \
|
|
|
|
|
gdbusauthmechanismanon.h gdbusauthmechanismanon.c \
|
|
|
|
|
gdbusauthmechanismexternal.h gdbusauthmechanismexternal.c \
|
|
|
|
|
gdbusauthmechanismsha1.h gdbusauthmechanismsha1.c \
|
|
|
|
|
gdbuserror.h gdbuserror.c \
|
|
|
|
|
gdbusconnection.h gdbusconnection.c \
|
|
|
|
|
gdbusmessage.h gdbusmessage.c \
|
|
|
|
|
gdbusnameowning.h gdbusnameowning.c \
|
|
|
|
|
gdbusnamewatching.h gdbusnamewatching.c \
|
|
|
|
|
gdbusproxy.h gdbusproxy.c \
|
|
|
|
|
gdbusprivate.h gdbusprivate.c \
|
|
|
|
|
gdbusintrospection.h gdbusintrospection.c \
|
|
|
|
|
gdbusmethodinvocation.h gdbusmethodinvocation.c \
|
|
|
|
|
gdbusserver.h gdbusserver.c \
|
2011-04-08 21:14:47 +02:00
|
|
|
gdbusinterface.h gdbusinterface.c \
|
2011-04-13 22:33:51 +02:00
|
|
|
gdbusinterfaceskeleton.h gdbusinterfaceskeleton.c \
|
2011-04-08 21:14:47 +02:00
|
|
|
gdbusobject.h gdbusobject.c \
|
2011-04-13 22:33:51 +02:00
|
|
|
gdbusobjectskeleton.h gdbusobjectskeleton.c \
|
2011-04-08 21:14:47 +02:00
|
|
|
gdbusobjectproxy.h gdbusobjectproxy.c \
|
|
|
|
|
gdbusobjectmanager.h gdbusobjectmanager.c \
|
|
|
|
|
gdbusobjectmanagerclient.h gdbusobjectmanagerclient.c \
|
|
|
|
|
gdbusobjectmanagerserver.h gdbusobjectmanagerserver.c \
|
2012-04-18 23:21:13 +02:00
|
|
|
gtestdbus.h gtestdbus.c \
|
2010-05-06 20:13:59 +02:00
|
|
|
$(NULL)
|
|
|
|
|
|
2012-04-16 10:16:04 +02:00
|
|
|
# These are not built into the library yet
|
2012-04-26 10:05:41 +02:00
|
|
|
EXTRA_DIST += gdbusdaemon.c gdbusdaemon.h dbus-daemon.xml
|
2012-04-16 10:16:04 +02:00
|
|
|
|
2012-04-26 10:05:41 +02:00
|
|
|
gdbus-daemon-generated.h gdbus-daemon-generated.c: $(srcdir)/dbus-daemon.xml $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in
|
2012-04-16 10:16:04 +02:00
|
|
|
$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
|
|
|
|
|
UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
|
2012-04-26 10:05:41 +02:00
|
|
|
$(PYTHON) $(srcdir)/gdbus-2.0/codegen/gdbus-codegen.in \
|
2012-04-16 10:16:04 +02:00
|
|
|
--interface-prefix org. \
|
|
|
|
|
--generate-c-code gdbus-daemon-generated \
|
|
|
|
|
--c-namespace _G \
|
|
|
|
|
$(srcdir)/dbus-daemon.xml \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2010-04-17 05:17:01 +02:00
|
|
|
settings_headers = \
|
|
|
|
|
gsettingsbackend.h \
|
2011-11-15 09:00:16 +01:00
|
|
|
gsettingsschema.h \
|
2010-04-17 05:17:01 +02:00
|
|
|
gsettings.h
|
|
|
|
|
|
2010-04-15 20:59:41 +02:00
|
|
|
settings_sources = \
|
2010-04-17 05:17:01 +02:00
|
|
|
gvdb/gvdb-format.h \
|
|
|
|
|
gvdb/gvdb-reader.h \
|
|
|
|
|
gvdb/gvdb-reader.c \
|
2010-04-16 18:02:44 +02:00
|
|
|
gdelayedsettingsbackend.h \
|
2010-04-17 05:17:01 +02:00
|
|
|
gdelayedsettingsbackend.c \
|
2010-04-17 05:57:26 +02:00
|
|
|
gkeyfilesettingsbackend.c \
|
2010-04-17 07:02:57 +02:00
|
|
|
gmemorysettingsbackend.c \
|
2010-04-16 00:22:14 +02:00
|
|
|
gnullsettingsbackend.c \
|
2010-04-17 05:17:01 +02:00
|
|
|
gsettingsbackendinternal.h \
|
2010-04-16 04:30:11 +02:00
|
|
|
gsettingsbackend.c \
|
|
|
|
|
gsettingsschema.h \
|
2011-11-17 05:24:46 +01:00
|
|
|
gsettingsschema-internal.h \
|
2010-04-17 05:17:01 +02:00
|
|
|
gsettingsschema.c \
|
|
|
|
|
gsettings-mapping.h \
|
|
|
|
|
gsettings-mapping.c \
|
|
|
|
|
gsettings.c
|
2010-04-15 20:59:41 +02:00
|
|
|
|
2010-08-12 17:10:23 +02:00
|
|
|
if OS_WIN32
|
|
|
|
|
settings_sources += \
|
|
|
|
|
gregistrysettingsbackend.h \
|
|
|
|
|
gregistrysettingsbackend.c
|
|
|
|
|
endif
|
|
|
|
|
|
2012-04-12 05:25:09 +02:00
|
|
|
if OS_COCOA
|
2011-12-26 16:04:38 +01:00
|
|
|
settings_sources += \
|
|
|
|
|
gnextstepsettingsbackend.c
|
|
|
|
|
endif
|
|
|
|
|
|
2010-08-18 06:30:44 +02:00
|
|
|
application_headers = \
|
2011-12-10 23:21:53 +01:00
|
|
|
gapplication.h \
|
|
|
|
|
gapplicationcommandline.h \
|
|
|
|
|
\
|
2010-08-18 06:30:44 +02:00
|
|
|
gactiongroup.h \
|
2011-11-30 17:36:08 +01:00
|
|
|
gactionmap.h \
|
2010-08-18 08:15:09 +02:00
|
|
|
gsimpleactiongroup.h \
|
2011-12-17 06:17:08 +01:00
|
|
|
gremoteactiongroup.h \
|
2011-12-10 23:21:53 +01:00
|
|
|
gactiongroupexporter.h \
|
|
|
|
|
gdbusactiongroup.h \
|
2010-08-18 07:45:15 +02:00
|
|
|
gaction.h \
|
2013-06-28 17:41:43 +02:00
|
|
|
gpropertyaction.h \
|
2010-08-30 18:58:49 +02:00
|
|
|
gsimpleaction.h \
|
2011-12-10 23:21:53 +01:00
|
|
|
\
|
2011-11-27 04:46:51 +01:00
|
|
|
gmenumodel.h \
|
2011-12-10 23:21:53 +01:00
|
|
|
gmenu.h \
|
2011-11-27 03:02:15 +01:00
|
|
|
gmenuexporter.h \
|
2011-12-10 23:21:53 +01:00
|
|
|
gdbusmenumodel.h \
|
2013-10-15 17:21:10 +02:00
|
|
|
gnotification.h \
|
2011-11-27 04:46:51 +01:00
|
|
|
$(NULL)
|
2010-08-18 06:30:44 +02:00
|
|
|
|
|
|
|
|
application_sources = \
|
2011-12-10 23:21:53 +01:00
|
|
|
gapplication.c \
|
|
|
|
|
gapplicationcommandline.c \
|
|
|
|
|
gapplicationimpl-dbus.c \
|
|
|
|
|
gapplicationimpl.h \
|
|
|
|
|
\
|
2010-10-06 19:08:26 +02:00
|
|
|
gactiongroup.c \
|
2011-11-30 17:36:08 +01:00
|
|
|
gactionmap.c \
|
2010-10-06 19:08:26 +02:00
|
|
|
gsimpleactiongroup.c \
|
2011-12-17 06:17:08 +01:00
|
|
|
gremoteactiongroup.c \
|
2011-12-10 23:21:53 +01:00
|
|
|
gactiongroupexporter.c \
|
2012-11-02 00:43:02 +01:00
|
|
|
gdbusactiongroup-private.h \
|
2011-12-10 23:21:53 +01:00
|
|
|
gdbusactiongroup.c \
|
2010-10-06 19:08:26 +02:00
|
|
|
gaction.c \
|
2013-06-28 17:41:43 +02:00
|
|
|
gpropertyaction.c \
|
2010-10-06 19:08:26 +02:00
|
|
|
gsimpleaction.c \
|
2011-12-10 23:21:53 +01:00
|
|
|
\
|
2011-11-27 04:46:51 +01:00
|
|
|
gmenumodel.c \
|
2011-12-10 23:21:53 +01:00
|
|
|
gmenu.c \
|
2011-11-27 03:02:15 +01:00
|
|
|
gmenuexporter.c \
|
2011-12-10 23:21:53 +01:00
|
|
|
gdbusmenumodel.c \
|
2013-10-21 21:05:45 +02:00
|
|
|
gnotification-private.h \
|
|
|
|
|
gnotificationbackend.h \
|
2013-10-15 17:21:10 +02:00
|
|
|
gnotification.c \
|
|
|
|
|
gnotificationbackend.c \
|
2011-11-27 04:46:51 +01:00
|
|
|
$(NULL)
|
2010-08-18 06:30:44 +02:00
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
local_sources = \
|
|
|
|
|
glocaldirectorymonitor.c \
|
|
|
|
|
glocaldirectorymonitor.h \
|
|
|
|
|
glocalfile.c \
|
|
|
|
|
glocalfile.h \
|
|
|
|
|
glocalfileenumerator.c \
|
|
|
|
|
glocalfileenumerator.h \
|
|
|
|
|
glocalfileinfo.c \
|
|
|
|
|
glocalfileinfo.h \
|
|
|
|
|
glocalfileinputstream.c \
|
|
|
|
|
glocalfileinputstream.h \
|
|
|
|
|
glocalfilemonitor.c \
|
|
|
|
|
glocalfilemonitor.h \
|
|
|
|
|
glocalfileoutputstream.c \
|
|
|
|
|
glocalfileoutputstream.h \
|
2009-05-13 13:03:47 +02:00
|
|
|
glocalfileiostream.c \
|
|
|
|
|
glocalfileiostream.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
glocalvfs.c \
|
|
|
|
|
glocalvfs.h \
|
2010-05-25 22:02:42 +02:00
|
|
|
gsocks4proxy.c \
|
|
|
|
|
gsocks4proxy.h \
|
|
|
|
|
gsocks4aproxy.c \
|
|
|
|
|
gsocks4aproxy.h \
|
2010-04-29 21:22:55 +02:00
|
|
|
gsocks5proxy.c \
|
|
|
|
|
gsocks5proxy.h \
|
2013-10-11 12:22:31 +02:00
|
|
|
thumbnail-verify.h \
|
|
|
|
|
thumbnail-verify.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(NULL)
|
|
|
|
|
|
|
|
|
|
platform_libadd =
|
2008-08-11 14:35:09 +02:00
|
|
|
platform_deps =
|
2007-11-26 17:13:05 +01:00
|
|
|
appinfo_sources =
|
|
|
|
|
|
|
|
|
|
if HAVE_INOTIFY
|
|
|
|
|
SUBDIRS += inotify
|
|
|
|
|
platform_libadd += inotify/libinotify.la
|
2008-08-11 14:35:09 +02:00
|
|
|
platform_deps += inotify/libinotify.la
|
2007-11-26 17:13:05 +01:00
|
|
|
endif
|
|
|
|
|
|
2012-11-14 12:57:42 +01:00
|
|
|
if HAVE_KQUEUE
|
|
|
|
|
SUBDIRS += kqueue
|
|
|
|
|
platform_libadd += kqueue/libkqueue.la
|
|
|
|
|
platform_deps += kqueue/libkqueue.la
|
|
|
|
|
endif
|
|
|
|
|
|
2008-03-14 09:58:24 +01:00
|
|
|
if HAVE_FEN
|
|
|
|
|
AM_CPPFLAGS += -DHAVE_FEN
|
|
|
|
|
SUBDIRS += fen
|
|
|
|
|
platform_libadd += fen/libfen.la
|
2008-08-11 14:35:09 +02:00
|
|
|
platform_deps += fen/libfen.la
|
2008-03-14 09:58:24 +01:00
|
|
|
endif
|
|
|
|
|
|
2008-03-12 20:09:11 +01:00
|
|
|
if OS_WIN32
|
|
|
|
|
SUBDIRS += win32
|
|
|
|
|
platform_libadd += win32/libgiowin32.la
|
2008-08-11 14:35:09 +02:00
|
|
|
platform_deps += win32/libgiowin32.la
|
2008-03-12 20:09:11 +01:00
|
|
|
endif
|
|
|
|
|
|
Rework the build system for a new tests approach
Perform a substantial cleanup of the build system with respect to
building and installing testcases.
First, Makefile.decl has been renamed glib.mk and substantially
expanded. We intend to add more stuff here in the future, like canned
rules for mkenums, marshallers, resources, etc.
By default, tests are no longer compiled as part of 'make'. They will
be built when 'make check' is run. The old behaviour can be obtained
with --enable-always-build-tests.
--disable-modular-tests is gone (because tests are no longer built by
default). There is no longer any way to cause 'make check' to be a
no-op, but that's not very useful anyway.
A new glibtests.m4 file is introduced. Along with glib.mk, this
provides for consistent handling of --enable-installed-tests and
--enable-always-build-tests (mentioned above).
Port our various test-installing Makefiles to the new framework.
This patch substantially improves the situation in the toplevel tests/
directory. Things are now somewhat under control there. There were
some tests being built that weren't even being run and we run those now.
The long-running GObject performance tests in this directory have been
removed from 'make check' because they take too long.
As an experiment, 'make check' now runs the testcases on win32 builds,
by default. We can't run them under gtester (since it uses a pipe to
communicate with the subprocess) so just toss them in TESTS. Most of
them are passing on win32.
Things are not quite done here, but this patch is already a substantial
improvement. More to come.
2013-05-30 06:07:32 +02:00
|
|
|
SUBDIRS += . tests
|
2007-11-26 17:13:05 +01:00
|
|
|
|
|
|
|
|
if HAVE_FAM
|
|
|
|
|
SUBDIRS += fam
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
if OS_UNIX
|
2010-05-09 18:41:02 +02:00
|
|
|
appinfo_sources += gdesktopappinfo.c
|
2013-10-28 18:07:49 +01:00
|
|
|
platform_libadd += xdgmime/libxdgmime.la
|
2011-08-31 20:33:33 +02:00
|
|
|
platform_deps += xdgmime/libxdgmime.la
|
2007-11-26 17:13:05 +01:00
|
|
|
unix_sources = \
|
2010-05-09 18:41:02 +02:00
|
|
|
gfiledescriptorbased.c \
|
2009-05-15 21:26:24 +02:00
|
|
|
gunixconnection.c \
|
2010-05-09 18:41:02 +02:00
|
|
|
gunixcredentialsmessage.c \
|
2009-11-12 04:40:28 +01:00
|
|
|
gunixfdlist.c \
|
2009-05-14 15:26:37 +02:00
|
|
|
gunixfdmessage.c \
|
Rework how volumes, drives and volume monitoring is done. Previosly the
2007-12-11 David Zeuthen <davidz@redhat.com>
Rework how volumes, drives and volume monitoring is
done. Previosly the model was
GDrive <1-1> GVolume
where a GDrive instance represented a mount point and a GVolume
instance represented a mounted file system. This patch changes it
the model to
GDrive <1-N> GVolume <1-1> GMount
where GMount now serves the purpose of the old GVolume and the new
GVolume serves the purpose of the old GDrive. In addition the new
GDrive interface is used to represent a collection of GVolume
instances (typically partitions) and also contains utility to query
the state of the physical drive the GDrive object represents (such
as checking for media, polling the drive, ejecting the media etc.).
Also implement mounting and unmounting in the Unix volume monitor
backend. A subquent patch will introduce GDrive support for ejection
of media.
* Makefile.am:
* gdrive.c: (g_drive_is_media_check_automatic),
(g_drive_is_media_removable), (g_drive_has_media),
(g_drive_can_poll_for_media), (g_drive_eject),
(g_drive_eject_finish), (g_drive_poll_for_media),
(g_drive_poll_for_media_finish):
* gdrive.h:
* gfile.c: (g_file_find_enclosing_mount):
* gfile.h:
* gio.symbols:
* glocaldirectorymonitor.c:
(g_local_directory_monitor_constructor), (mounts_changed):
* glocalfile.c: (get_mount_info),
(g_local_file_find_enclosing_mount),
(g_local_file_file_iface_init):
* gnativevolumemonitor.h:
* gunionvolumemonitor.c: (get_mounts), (get_volumes),
(get_connected_drives), (g_union_volume_monitor_class_init),
(child_volume_added), (child_volume_removed),
(child_volume_changed), (child_mount_added), (child_mount_removed),
(child_mount_pre_unmount), (child_mount_changed),
(child_drive_changed), (g_union_volume_monitor_add_monitor),
(g_union_volume_monitor_remove_monitor),
(_g_mount_get_for_mount_path):
* gunixmounts.c: (g_unix_is_mount_path_system_internal),
(guess_system_internal), (_g_get_unix_mounts),
(_g_get_unix_mount_points), (g_get_unix_mount_at),
(g_unix_mount_free), (g_unix_mount_compare),
(g_unix_mount_get_mount_path), (g_unix_mount_get_device_path),
(g_unix_mount_get_fs_type), (g_unix_mount_is_readonly),
(g_unix_mount_is_system_internal), (g_unix_mount_guess_type),
(type_to_icon), (g_unix_mount_guess_name),
(g_unix_mount_guess_icon), (g_unix_mount_point_guess_name),
(g_unix_mount_point_guess_icon), (_canonicalize_filename),
(_resolve_symlink), (_resolve_dev_root):
* gunixmounts.h:
* gunixvolume.c: (g_unix_volume_finalize), (_g_unix_volume_new),
(_g_unix_volume_disconnected), (_g_unix_volume_set_mount),
(_g_unix_volume_unset_mount), (g_unix_volume_get_icon),
(g_unix_volume_get_name), (g_unix_volume_can_mount),
(g_unix_volume_get_drive), (g_unix_volume_get_mount),
(_g_unix_volume_has_mount_path), (mount_cb), (mount_read_error),
(g_unix_volume_mount), (g_unix_volume_mount_finish),
(g_unix_volume_volume_iface_init):
* gunixvolume.h:
* gunixvolumemonitor.c: (g_unix_volume_monitor_finalize),
(get_mounts), (get_volumes), (get_connected_drives),
(get_mount_for_mount_path), (g_unix_volume_monitor_class_init),
(mountpoints_changed), (mounts_changed),
(g_unix_volume_monitor_init),
(_g_unix_volume_monitor_lookup_volume_for_mount_path),
(find_mount_by_mountpath), (update_volumes), (update_mounts):
* gunixvolumemonitor.h:
* gvolume.c: (g_volume_get_mount), (g_volume_can_mount),
(g_volume_mount), (g_volume_mount_finish):
* gvolume.h:
* gvolumemonitor.c: (g_volume_monitor_class_init),
(g_volume_monitor_get_connected_drives),
(g_volume_monitor_get_volumes), (g_volume_monitor_get_mounts):
* gvolumemonitor.h:
svn path=/trunk/; revision=6095
2007-12-11 22:23:55 +01:00
|
|
|
gunixmount.c \
|
|
|
|
|
gunixmount.h \
|
2007-11-27 16:08:03 +01:00
|
|
|
gunixmounts.c \
|
2008-12-12 19:13:55 +01:00
|
|
|
gunixsocketaddress.c \
|
2007-11-27 16:08:03 +01:00
|
|
|
gunixvolume.c \
|
|
|
|
|
gunixvolume.h \
|
|
|
|
|
gunixvolumemonitor.c \
|
|
|
|
|
gunixvolumemonitor.h \
|
|
|
|
|
gunixinputstream.c \
|
|
|
|
|
gunixoutputstream.c \
|
2012-07-04 03:13:32 +02:00
|
|
|
gcontenttype.c \
|
|
|
|
|
gcontenttypeprivate.h \
|
2013-10-15 17:21:10 +02:00
|
|
|
gfdonotificationbackend.c \
|
2013-10-15 18:19:09 +02:00
|
|
|
ggtknotificationbackend.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(NULL)
|
|
|
|
|
|
Rework how volumes, drives and volume monitoring is done. Previosly the
2007-12-11 David Zeuthen <davidz@redhat.com>
Rework how volumes, drives and volume monitoring is
done. Previosly the model was
GDrive <1-1> GVolume
where a GDrive instance represented a mount point and a GVolume
instance represented a mounted file system. This patch changes it
the model to
GDrive <1-N> GVolume <1-1> GMount
where GMount now serves the purpose of the old GVolume and the new
GVolume serves the purpose of the old GDrive. In addition the new
GDrive interface is used to represent a collection of GVolume
instances (typically partitions) and also contains utility to query
the state of the physical drive the GDrive object represents (such
as checking for media, polling the drive, ejecting the media etc.).
Also implement mounting and unmounting in the Unix volume monitor
backend. A subquent patch will introduce GDrive support for ejection
of media.
* Makefile.am:
* gdrive.c: (g_drive_is_media_check_automatic),
(g_drive_is_media_removable), (g_drive_has_media),
(g_drive_can_poll_for_media), (g_drive_eject),
(g_drive_eject_finish), (g_drive_poll_for_media),
(g_drive_poll_for_media_finish):
* gdrive.h:
* gfile.c: (g_file_find_enclosing_mount):
* gfile.h:
* gio.symbols:
* glocaldirectorymonitor.c:
(g_local_directory_monitor_constructor), (mounts_changed):
* glocalfile.c: (get_mount_info),
(g_local_file_find_enclosing_mount),
(g_local_file_file_iface_init):
* gnativevolumemonitor.h:
* gunionvolumemonitor.c: (get_mounts), (get_volumes),
(get_connected_drives), (g_union_volume_monitor_class_init),
(child_volume_added), (child_volume_removed),
(child_volume_changed), (child_mount_added), (child_mount_removed),
(child_mount_pre_unmount), (child_mount_changed),
(child_drive_changed), (g_union_volume_monitor_add_monitor),
(g_union_volume_monitor_remove_monitor),
(_g_mount_get_for_mount_path):
* gunixmounts.c: (g_unix_is_mount_path_system_internal),
(guess_system_internal), (_g_get_unix_mounts),
(_g_get_unix_mount_points), (g_get_unix_mount_at),
(g_unix_mount_free), (g_unix_mount_compare),
(g_unix_mount_get_mount_path), (g_unix_mount_get_device_path),
(g_unix_mount_get_fs_type), (g_unix_mount_is_readonly),
(g_unix_mount_is_system_internal), (g_unix_mount_guess_type),
(type_to_icon), (g_unix_mount_guess_name),
(g_unix_mount_guess_icon), (g_unix_mount_point_guess_name),
(g_unix_mount_point_guess_icon), (_canonicalize_filename),
(_resolve_symlink), (_resolve_dev_root):
* gunixmounts.h:
* gunixvolume.c: (g_unix_volume_finalize), (_g_unix_volume_new),
(_g_unix_volume_disconnected), (_g_unix_volume_set_mount),
(_g_unix_volume_unset_mount), (g_unix_volume_get_icon),
(g_unix_volume_get_name), (g_unix_volume_can_mount),
(g_unix_volume_get_drive), (g_unix_volume_get_mount),
(_g_unix_volume_has_mount_path), (mount_cb), (mount_read_error),
(g_unix_volume_mount), (g_unix_volume_mount_finish),
(g_unix_volume_volume_iface_init):
* gunixvolume.h:
* gunixvolumemonitor.c: (g_unix_volume_monitor_finalize),
(get_mounts), (get_volumes), (get_connected_drives),
(get_mount_for_mount_path), (g_unix_volume_monitor_class_init),
(mountpoints_changed), (mounts_changed),
(g_unix_volume_monitor_init),
(_g_unix_volume_monitor_lookup_volume_for_mount_path),
(find_mount_by_mountpath), (update_volumes), (update_mounts):
* gunixvolumemonitor.h:
* gvolume.c: (g_volume_get_mount), (g_volume_can_mount),
(g_volume_mount), (g_volume_mount_finish):
* gvolume.h:
* gvolumemonitor.c: (g_volume_monitor_class_init),
(g_volume_monitor_get_connected_drives),
(g_volume_monitor_get_volumes), (g_volume_monitor_get_mounts):
* gvolumemonitor.h:
svn path=/trunk/; revision=6095
2007-12-11 22:23:55 +01:00
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
giounixincludedir=$(includedir)/gio-unix-2.0/gio
|
|
|
|
|
giounixinclude_HEADERS = \
|
2007-12-10 19:51:21 +01:00
|
|
|
gdesktopappinfo.h \
|
2010-02-07 14:51:01 +01:00
|
|
|
gfiledescriptorbased.h \
|
2009-05-15 21:26:24 +02:00
|
|
|
gunixconnection.h \
|
2010-05-09 18:41:02 +02:00
|
|
|
gunixcredentialsmessage.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gunixmounts.h \
|
2009-11-12 04:40:28 +01:00
|
|
|
gunixfdlist.h \
|
2009-05-14 15:26:37 +02:00
|
|
|
gunixfdmessage.h \
|
2007-11-27 16:08:03 +01:00
|
|
|
gunixinputstream.h \
|
|
|
|
|
gunixoutputstream.h \
|
2008-12-12 19:13:55 +01:00
|
|
|
gunixsocketaddress.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(NULL)
|
2011-06-12 21:59:36 +02:00
|
|
|
|
|
|
|
|
if HAVE_NETLINK
|
|
|
|
|
unix_sources += \
|
|
|
|
|
gnetworkmonitornetlink.c \
|
|
|
|
|
gnetworkmonitornetlink.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
endif
|
2007-11-26 17:13:05 +01:00
|
|
|
endif
|
|
|
|
|
|
2012-04-18 17:09:37 +02:00
|
|
|
gdbus_daemon_sources = \
|
|
|
|
|
gdbusdaemon.c \
|
|
|
|
|
gdbusdaemon.h \
|
|
|
|
|
gdbus-daemon-generated.c \
|
|
|
|
|
gdbus-daemon-generated.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2010-06-22 11:13:21 +02:00
|
|
|
win32_actual_sources = \
|
2012-04-18 17:09:37 +02:00
|
|
|
$(gdbus_daemon_sources) \
|
2012-07-04 03:13:32 +02:00
|
|
|
gcontenttype-win32.c \
|
2008-06-17 23:40:04 +02:00
|
|
|
gwin32mount.c \
|
|
|
|
|
gwin32mount.h \
|
|
|
|
|
gwin32volumemonitor.c \
|
|
|
|
|
gwin32volumemonitor.h \
|
2010-04-19 10:32:05 +02:00
|
|
|
gwin32inputstream.c \
|
|
|
|
|
gwin32outputstream.c \
|
|
|
|
|
gwin32outputstream.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2010-05-03 18:56:46 +02:00
|
|
|
win32_more_sources_for_vcproj = \
|
|
|
|
|
gwin32appinfo.c \
|
2011-07-04 15:47:59 +02:00
|
|
|
gregistrysettingsbackend.c \
|
2010-05-03 18:56:46 +02:00
|
|
|
win32/gwin32directorymonitor.c \
|
|
|
|
|
win32/gwinhttpfile.c \
|
|
|
|
|
win32/gwinhttpfileinputstream.c \
|
|
|
|
|
win32/gwinhttpfileoutputstream.c \
|
|
|
|
|
win32/gwinhttpvfs.c
|
|
|
|
|
|
2010-06-22 11:13:21 +02:00
|
|
|
if OS_WIN32
|
|
|
|
|
appinfo_sources += gwin32appinfo.c gwin32appinfo.h
|
2013-07-31 14:11:55 +02:00
|
|
|
platform_libadd += -lshlwapi -lws2_32 -ldnsapi -liphlpapi
|
2010-06-22 11:13:21 +02:00
|
|
|
win32_sources = $(win32_actual_sources)
|
|
|
|
|
|
2010-04-19 10:32:05 +02:00
|
|
|
giowin32includedir=$(includedir)/gio-win32-2.0/gio
|
|
|
|
|
giowin32include_HEADERS = \
|
|
|
|
|
gwin32inputstream.h \
|
|
|
|
|
gwin32outputstream.h \
|
2008-06-17 23:40:04 +02:00
|
|
|
$(NULL)
|
|
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
libgio_2_0_la_SOURCES = \
|
|
|
|
|
gappinfo.c \
|
2013-11-07 17:37:13 +01:00
|
|
|
gappinfoprivate.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gasynchelper.c \
|
|
|
|
|
gasynchelper.h \
|
2009-05-14 15:26:37 +02:00
|
|
|
gasyncinitable.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gasyncresult.c \
|
|
|
|
|
gbufferedinputstream.c \
|
|
|
|
|
gbufferedoutputstream.c \
|
2013-04-20 23:23:31 +02:00
|
|
|
gbytesicon.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gcancellable.c \
|
2009-10-21 21:25:36 +02:00
|
|
|
gcharsetconverter.c \
|
2009-11-18 13:14:13 +01:00
|
|
|
gconverter.c \
|
2009-10-22 22:50:52 +02:00
|
|
|
gconverterinputstream.c \
|
2009-11-23 15:03:57 +01:00
|
|
|
gconverteroutputstream.c \
|
2010-05-09 18:41:02 +02:00
|
|
|
gcredentials.c \
|
2013-09-18 19:40:09 +02:00
|
|
|
gcredentialsprivate.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gdatainputstream.c \
|
|
|
|
|
gdataoutputstream.c \
|
|
|
|
|
gdrive.c \
|
2007-11-27 11:46:45 +01:00
|
|
|
gdummyfile.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gdummyfile.c \
|
2010-05-07 21:55:54 +02:00
|
|
|
gdummyproxyresolver.c \
|
|
|
|
|
gdummyproxyresolver.h \
|
2009-12-21 20:50:32 +01:00
|
|
|
gdummytlsbackend.c \
|
|
|
|
|
gdummytlsbackend.h \
|
2008-08-04 19:19:30 +02:00
|
|
|
gemblem.h \
|
|
|
|
|
gemblem.c \
|
2008-07-28 17:35:07 +02:00
|
|
|
gemblemedicon.h \
|
|
|
|
|
gemblemedicon.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gfile.c \
|
|
|
|
|
gfileattribute.c \
|
2007-12-14 16:56:56 +01:00
|
|
|
gfileattribute-priv.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gfileenumerator.c \
|
|
|
|
|
gfileicon.c \
|
|
|
|
|
gfileinfo.c \
|
2009-06-29 13:55:22 +02:00
|
|
|
gfileinfo-priv.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gfileinputstream.c \
|
|
|
|
|
gfilemonitor.c \
|
|
|
|
|
gfilenamecompleter.c \
|
|
|
|
|
gfileoutputstream.c \
|
2009-05-12 16:59:36 +02:00
|
|
|
gfileiostream.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gfilterinputstream.c \
|
|
|
|
|
gfilteroutputstream.c \
|
|
|
|
|
gicon.c \
|
2008-12-12 19:13:55 +01:00
|
|
|
ginetaddress.c \
|
2011-10-01 14:31:54 +02:00
|
|
|
ginetaddressmask.c \
|
2008-12-12 19:13:55 +01:00
|
|
|
ginetsocketaddress.c \
|
2009-05-14 15:26:37 +02:00
|
|
|
ginitable.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
ginputstream.c \
|
2008-07-01 08:32:35 +02:00
|
|
|
gioenums.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gioerror.c \
|
|
|
|
|
giomodule.c \
|
2007-12-05 12:10:21 +01:00
|
|
|
giomodule-priv.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gioscheduler.c \
|
2009-05-12 16:30:15 +02:00
|
|
|
giostream.c \
|
2013-02-24 00:32:31 +01:00
|
|
|
gioprivate.h \
|
2012-05-22 22:06:10 +02:00
|
|
|
giowin32-priv.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gloadableicon.c \
|
Rework how volumes, drives and volume monitoring is done. Previosly the
2007-12-11 David Zeuthen <davidz@redhat.com>
Rework how volumes, drives and volume monitoring is
done. Previosly the model was
GDrive <1-1> GVolume
where a GDrive instance represented a mount point and a GVolume
instance represented a mounted file system. This patch changes it
the model to
GDrive <1-N> GVolume <1-1> GMount
where GMount now serves the purpose of the old GVolume and the new
GVolume serves the purpose of the old GDrive. In addition the new
GDrive interface is used to represent a collection of GVolume
instances (typically partitions) and also contains utility to query
the state of the physical drive the GDrive object represents (such
as checking for media, polling the drive, ejecting the media etc.).
Also implement mounting and unmounting in the Unix volume monitor
backend. A subquent patch will introduce GDrive support for ejection
of media.
* Makefile.am:
* gdrive.c: (g_drive_is_media_check_automatic),
(g_drive_is_media_removable), (g_drive_has_media),
(g_drive_can_poll_for_media), (g_drive_eject),
(g_drive_eject_finish), (g_drive_poll_for_media),
(g_drive_poll_for_media_finish):
* gdrive.h:
* gfile.c: (g_file_find_enclosing_mount):
* gfile.h:
* gio.symbols:
* glocaldirectorymonitor.c:
(g_local_directory_monitor_constructor), (mounts_changed):
* glocalfile.c: (get_mount_info),
(g_local_file_find_enclosing_mount),
(g_local_file_file_iface_init):
* gnativevolumemonitor.h:
* gunionvolumemonitor.c: (get_mounts), (get_volumes),
(get_connected_drives), (g_union_volume_monitor_class_init),
(child_volume_added), (child_volume_removed),
(child_volume_changed), (child_mount_added), (child_mount_removed),
(child_mount_pre_unmount), (child_mount_changed),
(child_drive_changed), (g_union_volume_monitor_add_monitor),
(g_union_volume_monitor_remove_monitor),
(_g_mount_get_for_mount_path):
* gunixmounts.c: (g_unix_is_mount_path_system_internal),
(guess_system_internal), (_g_get_unix_mounts),
(_g_get_unix_mount_points), (g_get_unix_mount_at),
(g_unix_mount_free), (g_unix_mount_compare),
(g_unix_mount_get_mount_path), (g_unix_mount_get_device_path),
(g_unix_mount_get_fs_type), (g_unix_mount_is_readonly),
(g_unix_mount_is_system_internal), (g_unix_mount_guess_type),
(type_to_icon), (g_unix_mount_guess_name),
(g_unix_mount_guess_icon), (g_unix_mount_point_guess_name),
(g_unix_mount_point_guess_icon), (_canonicalize_filename),
(_resolve_symlink), (_resolve_dev_root):
* gunixmounts.h:
* gunixvolume.c: (g_unix_volume_finalize), (_g_unix_volume_new),
(_g_unix_volume_disconnected), (_g_unix_volume_set_mount),
(_g_unix_volume_unset_mount), (g_unix_volume_get_icon),
(g_unix_volume_get_name), (g_unix_volume_can_mount),
(g_unix_volume_get_drive), (g_unix_volume_get_mount),
(_g_unix_volume_has_mount_path), (mount_cb), (mount_read_error),
(g_unix_volume_mount), (g_unix_volume_mount_finish),
(g_unix_volume_volume_iface_init):
* gunixvolume.h:
* gunixvolumemonitor.c: (g_unix_volume_monitor_finalize),
(get_mounts), (get_volumes), (get_connected_drives),
(get_mount_for_mount_path), (g_unix_volume_monitor_class_init),
(mountpoints_changed), (mounts_changed),
(g_unix_volume_monitor_init),
(_g_unix_volume_monitor_lookup_volume_for_mount_path),
(find_mount_by_mountpath), (update_volumes), (update_mounts):
* gunixvolumemonitor.h:
* gvolume.c: (g_volume_get_mount), (g_volume_can_mount),
(g_volume_mount), (g_volume_mount_finish):
* gvolume.h:
* gvolumemonitor.c: (g_volume_monitor_class_init),
(g_volume_monitor_get_connected_drives),
(g_volume_monitor_get_volumes), (g_volume_monitor_get_mounts):
* gvolumemonitor.h:
svn path=/trunk/; revision=6095
2007-12-11 22:23:55 +01:00
|
|
|
gmount.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gmemoryinputstream.c \
|
|
|
|
|
gmemoryoutputstream.c \
|
|
|
|
|
gmountoperation.c \
|
|
|
|
|
gnativevolumemonitor.c \
|
|
|
|
|
gnativevolumemonitor.h \
|
2008-12-29 19:38:28 +01:00
|
|
|
gnetworkaddress.c \
|
2010-11-11 15:57:25 +01:00
|
|
|
gnetworking.c \
|
2008-12-12 19:13:55 +01:00
|
|
|
gnetworkingprivate.h \
|
2011-06-12 21:59:36 +02:00
|
|
|
gnetworkmonitor.c \
|
|
|
|
|
gnetworkmonitorbase.c \
|
|
|
|
|
gnetworkmonitorbase.h \
|
2008-12-29 19:38:28 +01:00
|
|
|
gnetworkservice.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
goutputstream.c \
|
2010-06-03 22:58:52 +02:00
|
|
|
gpermission.c \
|
2010-09-18 19:05:25 +02:00
|
|
|
gpollableinputstream.c \
|
|
|
|
|
gpollableoutputstream.c \
|
2012-02-11 23:22:49 +01:00
|
|
|
gpollableutils.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gpollfilemonitor.c \
|
|
|
|
|
gpollfilemonitor.h \
|
2013-01-26 15:54:03 +01:00
|
|
|
gproxy.c \
|
|
|
|
|
gproxyaddress.c \
|
|
|
|
|
gproxyaddressenumerator.c \
|
2010-05-07 21:55:54 +02:00
|
|
|
gproxyresolver.c \
|
2008-12-29 18:53:47 +01:00
|
|
|
gresolver.c \
|
2011-12-21 21:38:23 +01:00
|
|
|
gresource.c \
|
2011-12-21 23:37:56 +01:00
|
|
|
gresourcefile.c \
|
|
|
|
|
gresourcefile.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gseekable.c \
|
|
|
|
|
gsimpleasyncresult.c \
|
2010-06-04 22:32:01 +02:00
|
|
|
gsimplepermission.c \
|
2009-05-14 15:26:37 +02:00
|
|
|
gsocket.c \
|
2008-12-12 19:13:55 +01:00
|
|
|
gsocketaddress.c \
|
2008-12-29 19:38:28 +01:00
|
|
|
gsocketaddressenumerator.c \
|
2009-05-15 21:26:24 +02:00
|
|
|
gsocketclient.c \
|
2008-12-29 19:38:28 +01:00
|
|
|
gsocketconnectable.c \
|
2009-05-15 21:26:24 +02:00
|
|
|
gsocketconnection.c \
|
|
|
|
|
gsocketcontrolmessage.c \
|
|
|
|
|
gsocketinputstream.c \
|
|
|
|
|
gsocketinputstream.h \
|
|
|
|
|
gsocketlistener.c \
|
|
|
|
|
gsocketoutputstream.c \
|
|
|
|
|
gsocketoutputstream.h \
|
2012-05-17 20:37:17 +02:00
|
|
|
gsubprocesslauncher.c \
|
|
|
|
|
gsubprocess.c \
|
|
|
|
|
gsubprocesslauncher-private.h \
|
2009-05-15 21:26:24 +02:00
|
|
|
gsocketservice.c \
|
2008-12-29 18:53:47 +01:00
|
|
|
gsrvtarget.c \
|
2013-01-26 15:54:03 +01:00
|
|
|
gsimpleproxyresolver.c \
|
2011-10-05 16:05:50 +02:00
|
|
|
gtask.c \
|
2009-05-15 21:26:24 +02:00
|
|
|
gtcpconnection.c \
|
make GProxyConnection public, as GTcpWrapperConnection
GProxyConnection is a class that was added for proxy support;
g_socket_client_connect() returns a GSocketConnection, but in some
cases (eg, encrypted SOCKS), GProxy might return a GIOStream that is
not a GSocketConnection. In that case, GSocketClient would wrap the
stream up in a GProxyConnection, which is a subclass of
GSocketConnection but uses the input/output streams of the wrapped
connection.
GTlsConnection is not a GSocketConnection, so it has the same problem,
so it will need the same treatment. Rename the class to
GTcpWrapperStream, and make it public, so people can extract the base
stream from it when necessary.
(This is not ideal and GSocketClient will need to be revisited as an
API at some point...)
https://bugzilla.gnome.org/show_bug.cgi?id=588189
2010-11-02 01:22:24 +01:00
|
|
|
gtcpwrapperconnection.c \
|
2009-05-15 21:26:24 +02:00
|
|
|
gthreadedsocketservice.c\
|
2007-11-26 17:13:05 +01:00
|
|
|
gthemedicon.c \
|
2008-12-29 18:53:47 +01:00
|
|
|
gthreadedresolver.c \
|
|
|
|
|
gthreadedresolver.h \
|
2009-12-21 20:50:32 +01:00
|
|
|
gtlsbackend.c \
|
|
|
|
|
gtlscertificate.c \
|
|
|
|
|
gtlsclientconnection.c \
|
|
|
|
|
gtlsconnection.c \
|
2011-08-04 08:54:55 +02:00
|
|
|
gtlsdatabase.c \
|
|
|
|
|
gtlsfiledatabase.c \
|
|
|
|
|
gtlsinteraction.c \
|
|
|
|
|
gtlspassword.c \
|
2009-12-21 20:50:32 +01:00
|
|
|
gtlsserverconnection.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
gunionvolumemonitor.c \
|
|
|
|
|
gunionvolumemonitor.h \
|
|
|
|
|
gvfs.c \
|
|
|
|
|
gvolume.c \
|
|
|
|
|
gvolumemonitor.c \
|
2009-11-20 12:04:31 +01:00
|
|
|
gzlibcompressor.c \
|
2009-11-19 17:20:20 +01:00
|
|
|
gzlibdecompressor.c \
|
Rework how volumes, drives and volume monitoring is done. Previosly the
2007-12-11 David Zeuthen <davidz@redhat.com>
Rework how volumes, drives and volume monitoring is
done. Previosly the model was
GDrive <1-1> GVolume
where a GDrive instance represented a mount point and a GVolume
instance represented a mounted file system. This patch changes it
the model to
GDrive <1-N> GVolume <1-1> GMount
where GMount now serves the purpose of the old GVolume and the new
GVolume serves the purpose of the old GDrive. In addition the new
GDrive interface is used to represent a collection of GVolume
instances (typically partitions) and also contains utility to query
the state of the physical drive the GDrive object represents (such
as checking for media, polling the drive, ejecting the media etc.).
Also implement mounting and unmounting in the Unix volume monitor
backend. A subquent patch will introduce GDrive support for ejection
of media.
* Makefile.am:
* gdrive.c: (g_drive_is_media_check_automatic),
(g_drive_is_media_removable), (g_drive_has_media),
(g_drive_can_poll_for_media), (g_drive_eject),
(g_drive_eject_finish), (g_drive_poll_for_media),
(g_drive_poll_for_media_finish):
* gdrive.h:
* gfile.c: (g_file_find_enclosing_mount):
* gfile.h:
* gio.symbols:
* glocaldirectorymonitor.c:
(g_local_directory_monitor_constructor), (mounts_changed):
* glocalfile.c: (get_mount_info),
(g_local_file_find_enclosing_mount),
(g_local_file_file_iface_init):
* gnativevolumemonitor.h:
* gunionvolumemonitor.c: (get_mounts), (get_volumes),
(get_connected_drives), (g_union_volume_monitor_class_init),
(child_volume_added), (child_volume_removed),
(child_volume_changed), (child_mount_added), (child_mount_removed),
(child_mount_pre_unmount), (child_mount_changed),
(child_drive_changed), (g_union_volume_monitor_add_monitor),
(g_union_volume_monitor_remove_monitor),
(_g_mount_get_for_mount_path):
* gunixmounts.c: (g_unix_is_mount_path_system_internal),
(guess_system_internal), (_g_get_unix_mounts),
(_g_get_unix_mount_points), (g_get_unix_mount_at),
(g_unix_mount_free), (g_unix_mount_compare),
(g_unix_mount_get_mount_path), (g_unix_mount_get_device_path),
(g_unix_mount_get_fs_type), (g_unix_mount_is_readonly),
(g_unix_mount_is_system_internal), (g_unix_mount_guess_type),
(type_to_icon), (g_unix_mount_guess_name),
(g_unix_mount_guess_icon), (g_unix_mount_point_guess_name),
(g_unix_mount_point_guess_icon), (_canonicalize_filename),
(_resolve_symlink), (_resolve_dev_root):
* gunixmounts.h:
* gunixvolume.c: (g_unix_volume_finalize), (_g_unix_volume_new),
(_g_unix_volume_disconnected), (_g_unix_volume_set_mount),
(_g_unix_volume_unset_mount), (g_unix_volume_get_icon),
(g_unix_volume_get_name), (g_unix_volume_can_mount),
(g_unix_volume_get_drive), (g_unix_volume_get_mount),
(_g_unix_volume_has_mount_path), (mount_cb), (mount_read_error),
(g_unix_volume_mount), (g_unix_volume_mount_finish),
(g_unix_volume_volume_iface_init):
* gunixvolume.h:
* gunixvolumemonitor.c: (g_unix_volume_monitor_finalize),
(get_mounts), (get_volumes), (get_connected_drives),
(get_mount_for_mount_path), (g_unix_volume_monitor_class_init),
(mountpoints_changed), (mounts_changed),
(g_unix_volume_monitor_init),
(_g_unix_volume_monitor_lookup_volume_for_mount_path),
(find_mount_by_mountpath), (update_volumes), (update_mounts):
* gunixvolumemonitor.h:
* gvolume.c: (g_volume_get_mount), (g_volume_can_mount),
(g_volume_mount), (g_volume_mount_finish):
* gvolume.h:
* gvolumemonitor.c: (g_volume_monitor_class_init),
(g_volume_monitor_get_connected_drives),
(g_volume_monitor_get_volumes), (g_volume_monitor_get_mounts):
* gvolumemonitor.h:
svn path=/trunk/; revision=6095
2007-12-11 22:23:55 +01:00
|
|
|
gmountprivate.h \
|
2007-12-01 02:53:00 +01:00
|
|
|
gioenumtypes.h \
|
|
|
|
|
gioenumtypes.c \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(appinfo_sources) \
|
|
|
|
|
$(unix_sources) \
|
2008-06-17 23:40:04 +02:00
|
|
|
$(win32_sources) \
|
2010-08-18 06:30:44 +02:00
|
|
|
$(application_sources) \
|
2010-04-15 20:59:41 +02:00
|
|
|
$(settings_sources) \
|
2010-05-06 20:13:59 +02:00
|
|
|
$(gdbus_sources) \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(local_sources) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2010-10-19 12:38:01 +02:00
|
|
|
EXTRA_DIST += strinfo.c
|
2010-06-07 19:25:39 +02:00
|
|
|
|
2007-11-26 17:13:05 +01:00
|
|
|
libgio_2_0_la_LIBADD = \
|
|
|
|
|
$(top_builddir)/glib/libglib-2.0.la \
|
|
|
|
|
$(top_builddir)/gobject/libgobject-2.0.la \
|
|
|
|
|
$(top_builddir)/gmodule/libgmodule-2.0.la \
|
|
|
|
|
$(platform_libadd) \
|
2009-11-19 17:16:29 +01:00
|
|
|
$(ZLIB_LIBS) \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(SELINUX_LIBS) \
|
|
|
|
|
$(GLIB_LIBS) \
|
|
|
|
|
$(XATTR_LIBS) \
|
2011-09-04 00:37:43 +02:00
|
|
|
$(NETWORK_LIBS) \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(NULL)
|
|
|
|
|
|
2011-08-03 14:46:04 +02:00
|
|
|
libgio_2_0_la_CPPFLAGS = $(ZLIB_CFLAGS) $(AM_CPPFLAGS)
|
|
|
|
|
|
2008-03-13 18:10:04 +01:00
|
|
|
if PLATFORM_WIN32
|
2007-11-26 17:13:05 +01:00
|
|
|
no_undefined = -no-undefined
|
|
|
|
|
endif
|
|
|
|
|
|
2008-04-21 10:38:36 +02:00
|
|
|
if OS_WIN32_AND_DLL_COMPILATION
|
2010-02-03 23:37:13 +01:00
|
|
|
gio_win32_res = gio-win32-res.o
|
|
|
|
|
gio_win32_res_ldflag = -Wl,$(gio_win32_res)
|
2008-03-13 18:10:04 +01:00
|
|
|
endif
|
|
|
|
|
|
2013-01-13 21:41:03 +01:00
|
|
|
install-data-local: install-ms-lib
|
2008-10-10 07:00:17 +02:00
|
|
|
$(mkinstalldirs) $(DESTDIR)$(GIO_MODULE_DIR)
|
2008-03-13 18:10:04 +01:00
|
|
|
|
2013-01-13 21:41:03 +01:00
|
|
|
uninstall-local: uninstall-ms-lib
|
2008-03-13 18:10:04 +01:00
|
|
|
|
2013-01-15 05:24:53 +01:00
|
|
|
libgio_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS)
|
2010-06-21 19:55:28 +02:00
|
|
|
libgio_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
|
2010-02-03 23:37:13 +01:00
|
|
|
$(gio_win32_res_ldflag) \
|
2008-04-22 15:51:37 +02:00
|
|
|
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
2013-01-14 05:12:23 +01:00
|
|
|
-export-dynamic $(no_undefined)
|
2008-04-22 15:51:37 +02:00
|
|
|
|
2012-04-12 05:25:09 +02:00
|
|
|
if OS_COCOA
|
2012-04-11 07:44:29 +02:00
|
|
|
# This is dumb. The ObjC source file should be properly named .m
|
2013-01-15 05:24:53 +01:00
|
|
|
libgio_2_0_la_CFLAGS += -xobjective-c
|
2012-06-06 01:20:13 +02:00
|
|
|
libgio_2_0_la_LDFLAGS += -Wl,-framework,Foundation
|
2012-04-11 07:44:29 +02:00
|
|
|
endif
|
|
|
|
|
|
2010-02-03 23:37:13 +01:00
|
|
|
libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
|
|
|
|
|
|
|
|
|
|
gio-win32-res.o: gio.rc
|
|
|
|
|
$(WINDRES) gio.rc $@
|
2007-11-26 17:13:05 +01:00
|
|
|
|
2007-12-01 02:53:00 +01:00
|
|
|
gio_headers = \
|
2007-11-26 17:13:05 +01:00
|
|
|
gappinfo.h \
|
2009-05-14 15:26:37 +02:00
|
|
|
gasyncinitable.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gasyncresult.h \
|
|
|
|
|
gbufferedinputstream.h \
|
|
|
|
|
gbufferedoutputstream.h \
|
2013-04-20 23:23:31 +02:00
|
|
|
gbytesicon.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gcancellable.h \
|
|
|
|
|
gcontenttype.h \
|
2009-10-21 21:25:36 +02:00
|
|
|
gcharsetconverter.h \
|
2009-11-18 13:14:13 +01:00
|
|
|
gconverter.h \
|
2009-10-22 22:50:52 +02:00
|
|
|
gconverterinputstream.h \
|
2009-11-23 15:03:57 +01:00
|
|
|
gconverteroutputstream.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gdatainputstream.h \
|
|
|
|
|
gdataoutputstream.h \
|
|
|
|
|
gdrive.h \
|
2008-08-04 19:19:30 +02:00
|
|
|
gemblem.h \
|
2008-07-28 20:25:49 +02:00
|
|
|
gemblemedicon.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gfile.h \
|
|
|
|
|
gfileattribute.h \
|
|
|
|
|
gfileenumerator.h \
|
|
|
|
|
gfileicon.h \
|
|
|
|
|
gfileinfo.h \
|
|
|
|
|
gfileinputstream.h \
|
|
|
|
|
gfilemonitor.h \
|
|
|
|
|
gfilenamecompleter.h \
|
|
|
|
|
gfileoutputstream.h \
|
2009-05-12 16:59:36 +02:00
|
|
|
gfileiostream.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gfilterinputstream.h \
|
|
|
|
|
gfilteroutputstream.h \
|
|
|
|
|
gicon.h \
|
2008-12-12 19:13:55 +01:00
|
|
|
ginetaddress.h \
|
2011-10-01 14:31:54 +02:00
|
|
|
ginetaddressmask.h \
|
2008-12-12 19:13:55 +01:00
|
|
|
ginetsocketaddress.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
ginputstream.h \
|
2009-05-14 15:26:37 +02:00
|
|
|
ginitable.h \
|
2007-11-27 11:46:45 +01:00
|
|
|
gio.h \
|
2008-07-01 08:32:35 +02:00
|
|
|
giotypes.h \
|
|
|
|
|
gioenums.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gioerror.h \
|
|
|
|
|
giomodule.h \
|
|
|
|
|
gioscheduler.h \
|
2009-05-12 16:30:15 +02:00
|
|
|
giostream.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gloadableicon.h \
|
Rework how volumes, drives and volume monitoring is done. Previosly the
2007-12-11 David Zeuthen <davidz@redhat.com>
Rework how volumes, drives and volume monitoring is
done. Previosly the model was
GDrive <1-1> GVolume
where a GDrive instance represented a mount point and a GVolume
instance represented a mounted file system. This patch changes it
the model to
GDrive <1-N> GVolume <1-1> GMount
where GMount now serves the purpose of the old GVolume and the new
GVolume serves the purpose of the old GDrive. In addition the new
GDrive interface is used to represent a collection of GVolume
instances (typically partitions) and also contains utility to query
the state of the physical drive the GDrive object represents (such
as checking for media, polling the drive, ejecting the media etc.).
Also implement mounting and unmounting in the Unix volume monitor
backend. A subquent patch will introduce GDrive support for ejection
of media.
* Makefile.am:
* gdrive.c: (g_drive_is_media_check_automatic),
(g_drive_is_media_removable), (g_drive_has_media),
(g_drive_can_poll_for_media), (g_drive_eject),
(g_drive_eject_finish), (g_drive_poll_for_media),
(g_drive_poll_for_media_finish):
* gdrive.h:
* gfile.c: (g_file_find_enclosing_mount):
* gfile.h:
* gio.symbols:
* glocaldirectorymonitor.c:
(g_local_directory_monitor_constructor), (mounts_changed):
* glocalfile.c: (get_mount_info),
(g_local_file_find_enclosing_mount),
(g_local_file_file_iface_init):
* gnativevolumemonitor.h:
* gunionvolumemonitor.c: (get_mounts), (get_volumes),
(get_connected_drives), (g_union_volume_monitor_class_init),
(child_volume_added), (child_volume_removed),
(child_volume_changed), (child_mount_added), (child_mount_removed),
(child_mount_pre_unmount), (child_mount_changed),
(child_drive_changed), (g_union_volume_monitor_add_monitor),
(g_union_volume_monitor_remove_monitor),
(_g_mount_get_for_mount_path):
* gunixmounts.c: (g_unix_is_mount_path_system_internal),
(guess_system_internal), (_g_get_unix_mounts),
(_g_get_unix_mount_points), (g_get_unix_mount_at),
(g_unix_mount_free), (g_unix_mount_compare),
(g_unix_mount_get_mount_path), (g_unix_mount_get_device_path),
(g_unix_mount_get_fs_type), (g_unix_mount_is_readonly),
(g_unix_mount_is_system_internal), (g_unix_mount_guess_type),
(type_to_icon), (g_unix_mount_guess_name),
(g_unix_mount_guess_icon), (g_unix_mount_point_guess_name),
(g_unix_mount_point_guess_icon), (_canonicalize_filename),
(_resolve_symlink), (_resolve_dev_root):
* gunixmounts.h:
* gunixvolume.c: (g_unix_volume_finalize), (_g_unix_volume_new),
(_g_unix_volume_disconnected), (_g_unix_volume_set_mount),
(_g_unix_volume_unset_mount), (g_unix_volume_get_icon),
(g_unix_volume_get_name), (g_unix_volume_can_mount),
(g_unix_volume_get_drive), (g_unix_volume_get_mount),
(_g_unix_volume_has_mount_path), (mount_cb), (mount_read_error),
(g_unix_volume_mount), (g_unix_volume_mount_finish),
(g_unix_volume_volume_iface_init):
* gunixvolume.h:
* gunixvolumemonitor.c: (g_unix_volume_monitor_finalize),
(get_mounts), (get_volumes), (get_connected_drives),
(get_mount_for_mount_path), (g_unix_volume_monitor_class_init),
(mountpoints_changed), (mounts_changed),
(g_unix_volume_monitor_init),
(_g_unix_volume_monitor_lookup_volume_for_mount_path),
(find_mount_by_mountpath), (update_volumes), (update_mounts):
* gunixvolumemonitor.h:
* gvolume.c: (g_volume_get_mount), (g_volume_can_mount),
(g_volume_mount), (g_volume_mount_finish):
* gvolume.h:
* gvolumemonitor.c: (g_volume_monitor_class_init),
(g_volume_monitor_get_connected_drives),
(g_volume_monitor_get_volumes), (g_volume_monitor_get_mounts):
* gvolumemonitor.h:
svn path=/trunk/; revision=6095
2007-12-11 22:23:55 +01:00
|
|
|
gmount.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gmemoryinputstream.h \
|
|
|
|
|
gmemoryoutputstream.h \
|
|
|
|
|
gmountoperation.h \
|
Provide eject() on both GMount and GVolume and utility functions to guess
2007-12-14 David Zeuthen <davidz@redhat.com>
* Makefile.am:
* gio.symbols:
* gmount.c: (g_mount_get_uuid), (g_mount_can_eject),
(g_mount_eject), (g_mount_eject_finish):
* gmount.h:
* gunionvolumemonitor.c: (g_union_volume_monitor_finalize),
(get_volume_for_uuid), (get_mount_for_uuid),
(g_union_volume_monitor_class_init),
(get_default_native_type_with_exclude), (get_default_native_type),
(get_native_type), (update_native_type),
(g_union_volume_monitor_init), (_g_mount_get_for_mount_path):
* gunixmount.c: (_g_unix_mount_new), (g_unix_mount_get_uuid),
(g_unix_mount_can_eject), (eject_unmount_cb),
(eject_unmount_read_error), (eject_unmount_do),
(g_unix_mount_unmount), (g_unix_mount_eject),
(g_unix_mount_eject_finish), (g_unix_mount_mount_iface_init):
* gunixmounts.c: (g_unix_mount_guess_can_eject),
(g_unix_mount_point_guess_can_eject):
* gunixmounts.h:
* gunixvolume.c: (_g_unix_volume_new), (g_unix_volume_get_uuid),
(g_unix_volume_can_eject), (g_unix_volume_get_drive),
(eject_mount_cb), (eject_mount_read_error), (eject_mount_do),
(g_unix_volume_mount), (g_unix_volume_eject),
(g_unix_volume_eject_finish), (g_unix_volume_volume_iface_init):
* gunixvolumemonitor.c: (get_volume_for_uuid),
(get_mount_for_uuid), (g_unix_volume_monitor_class_init),
(update_mounts):
* gvolume.c: (g_volume_get_uuid), (g_volume_can_eject),
(g_volume_eject), (g_volume_eject_finish):
* gvolume.h:
* gvolumemonitor.c: (g_volume_monitor_get_volume_for_uuid),
(g_volume_monitor_get_mount_for_uuid):
* gvolumemonitor.h:
Provide eject() on both GMount and GVolume and utility functions
to guess whether a GUnixMountPoint or GUnixMountEntry should be
ejected. Introduce the concept of UUID's and wire it into GVolume
and GMount and provide API on GVolumeMonitor to find such
instances. Also handle the case where an external
GNativeVolumeMonitor fails to initialize. Lock around the
_g_get_mount_for_mount_path() function such that volume monitor
implementations won't have to do locking themselves.
svn path=/trunk/; revision=6140
2007-12-17 10:31:08 +01:00
|
|
|
gnativevolumemonitor.h \
|
2008-12-29 19:38:28 +01:00
|
|
|
gnetworkaddress.h \
|
2011-06-12 21:59:36 +02:00
|
|
|
gnetworkmonitor.h \
|
2008-12-29 19:38:28 +01:00
|
|
|
gnetworkservice.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
goutputstream.h \
|
2010-06-03 22:58:52 +02:00
|
|
|
gpermission.h \
|
2010-09-18 19:05:25 +02:00
|
|
|
gpollableinputstream.h \
|
|
|
|
|
gpollableoutputstream.h \
|
2012-02-11 23:22:49 +01:00
|
|
|
gpollableutils.h \
|
2010-04-26 23:27:33 +02:00
|
|
|
gproxyaddress.h \
|
2010-08-10 21:24:37 +02:00
|
|
|
gproxy.h \
|
2010-08-10 21:25:11 +02:00
|
|
|
gproxyaddressenumerator.h \
|
2010-05-07 21:55:54 +02:00
|
|
|
gproxyresolver.h \
|
2008-12-29 18:53:47 +01:00
|
|
|
gresolver.h \
|
2011-12-21 21:38:23 +01:00
|
|
|
gresource.h \
|
2007-11-26 17:36:52 +01:00
|
|
|
gseekable.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gsimpleasyncresult.h \
|
2010-06-04 22:32:01 +02:00
|
|
|
gsimplepermission.h \
|
2009-05-14 15:26:37 +02:00
|
|
|
gsocket.h \
|
2008-12-12 19:13:55 +01:00
|
|
|
gsocketaddress.h \
|
2008-12-29 19:38:28 +01:00
|
|
|
gsocketaddressenumerator.h \
|
2009-05-15 21:26:24 +02:00
|
|
|
gsocketclient.h \
|
2008-12-29 19:38:28 +01:00
|
|
|
gsocketconnectable.h \
|
2009-05-15 21:26:24 +02:00
|
|
|
gsocketconnection.h \
|
|
|
|
|
gsocketcontrolmessage.h \
|
|
|
|
|
gsocketlistener.h \
|
|
|
|
|
gsocketservice.h \
|
2008-12-29 18:53:47 +01:00
|
|
|
gsrvtarget.h \
|
2013-01-26 15:54:03 +01:00
|
|
|
gsimpleproxyresolver.h \
|
2011-10-05 16:05:50 +02:00
|
|
|
gtask.h \
|
2012-05-17 20:37:17 +02:00
|
|
|
gsubprocess.h \
|
|
|
|
|
gsubprocesslauncher.h \
|
2009-05-15 21:26:24 +02:00
|
|
|
gtcpconnection.h \
|
make GProxyConnection public, as GTcpWrapperConnection
GProxyConnection is a class that was added for proxy support;
g_socket_client_connect() returns a GSocketConnection, but in some
cases (eg, encrypted SOCKS), GProxy might return a GIOStream that is
not a GSocketConnection. In that case, GSocketClient would wrap the
stream up in a GProxyConnection, which is a subclass of
GSocketConnection but uses the input/output streams of the wrapped
connection.
GTlsConnection is not a GSocketConnection, so it has the same problem,
so it will need the same treatment. Rename the class to
GTcpWrapperStream, and make it public, so people can extract the base
stream from it when necessary.
(This is not ideal and GSocketClient will need to be revisited as an
API at some point...)
https://bugzilla.gnome.org/show_bug.cgi?id=588189
2010-11-02 01:22:24 +01:00
|
|
|
gtcpwrapperconnection.h \
|
2009-05-15 21:26:24 +02:00
|
|
|
gthreadedsocketservice.h\
|
2007-11-26 17:13:05 +01:00
|
|
|
gthemedicon.h \
|
2009-12-21 20:50:32 +01:00
|
|
|
gtlsbackend.h \
|
|
|
|
|
gtlscertificate.h \
|
|
|
|
|
gtlsclientconnection.h \
|
|
|
|
|
gtlsconnection.h \
|
2011-08-04 08:54:55 +02:00
|
|
|
gtlsdatabase.h \
|
|
|
|
|
gtlsfiledatabase.h \
|
|
|
|
|
gtlsinteraction.h \
|
|
|
|
|
gtlspassword.h \
|
2009-12-21 20:50:32 +01:00
|
|
|
gtlsserverconnection.h \
|
2007-11-26 17:13:05 +01:00
|
|
|
gvfs.h \
|
|
|
|
|
gvolume.h \
|
|
|
|
|
gvolumemonitor.h \
|
2009-11-20 12:04:31 +01:00
|
|
|
gzlibcompressor.h \
|
2009-11-19 17:20:20 +01:00
|
|
|
gzlibdecompressor.h \
|
2010-08-18 06:30:44 +02:00
|
|
|
$(application_headers) \
|
2010-04-17 05:17:01 +02:00
|
|
|
$(settings_headers) \
|
2010-05-06 20:13:59 +02:00
|
|
|
$(gdbus_headers) \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(NULL)
|
|
|
|
|
|
2007-12-01 02:53:00 +01:00
|
|
|
gioincludedir=$(includedir)/glib-2.0/gio/
|
|
|
|
|
gioinclude_HEADERS = \
|
|
|
|
|
$(gio_headers) \
|
|
|
|
|
gioenumtypes.h
|
2007-11-28 13:39:07 +01:00
|
|
|
|
2013-09-28 18:18:14 +02:00
|
|
|
nodist_gioinclude_HEADERS = \
|
|
|
|
|
gnetworking.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2007-11-28 13:39:07 +01:00
|
|
|
# these sources (also mentioned above) are generated.
|
Rework the build system for a new tests approach
Perform a substantial cleanup of the build system with respect to
building and installing testcases.
First, Makefile.decl has been renamed glib.mk and substantially
expanded. We intend to add more stuff here in the future, like canned
rules for mkenums, marshallers, resources, etc.
By default, tests are no longer compiled as part of 'make'. They will
be built when 'make check' is run. The old behaviour can be obtained
with --enable-always-build-tests.
--disable-modular-tests is gone (because tests are no longer built by
default). There is no longer any way to cause 'make check' to be a
no-op, but that's not very useful anyway.
A new glibtests.m4 file is introduced. Along with glib.mk, this
provides for consistent handling of --enable-installed-tests and
--enable-always-build-tests (mentioned above).
Port our various test-installing Makefiles to the new framework.
This patch substantially improves the situation in the toplevel tests/
directory. Things are now somewhat under control there. There were
some tests being built that weren't even being run and we run those now.
The long-running GObject performance tests in this directory have been
removed from 'make check' because they take too long.
As an experiment, 'make check' now runs the testcases on win32 builds,
by default. We can't run them under gtester (since it uses a pipe to
communicate with the subprocess) so just toss them in TESTS. Most of
them are passing on win32.
Things are not quite done here, but this patch is already a substantial
improvement. More to come.
2013-05-30 06:07:32 +02:00
|
|
|
BUILT_SOURCES += \
|
2012-01-30 16:57:54 +01:00
|
|
|
gconstructor_as_data.h \
|
2007-12-01 02:53:00 +01:00
|
|
|
gioenumtypes.h \
|
|
|
|
|
gioenumtypes.c \
|
2012-04-16 10:16:04 +02:00
|
|
|
gdbus-daemon-generated.c \
|
|
|
|
|
gdbus-daemon-generated.h \
|
2010-11-11 15:57:25 +01:00
|
|
|
gnetworking.h \
|
2007-12-01 02:53:00 +01:00
|
|
|
$(NULL)
|
2007-11-28 13:39:07 +01:00
|
|
|
|
2007-12-04 01:35:42 +01:00
|
|
|
EXTRA_DIST += \
|
2012-02-01 17:44:15 +01:00
|
|
|
data-to-c.pl \
|
2007-12-01 02:53:00 +01:00
|
|
|
gioenumtypes.h.template \
|
|
|
|
|
gioenumtypes.c.template \
|
2008-05-19 07:18:10 +02:00
|
|
|
makefile.msc \
|
2010-02-03 23:37:13 +01:00
|
|
|
gio.rc.in \
|
2010-04-19 20:04:42 +02:00
|
|
|
gschema.dtd \
|
2012-02-10 01:57:21 +01:00
|
|
|
gconstructor_as_data.h \
|
2012-12-13 16:45:04 +01:00
|
|
|
gnetworking.h.win32 \
|
2007-11-26 17:13:05 +01:00
|
|
|
$(NULL)
|
|
|
|
|
|
Rework the build system for a new tests approach
Perform a substantial cleanup of the build system with respect to
building and installing testcases.
First, Makefile.decl has been renamed glib.mk and substantially
expanded. We intend to add more stuff here in the future, like canned
rules for mkenums, marshallers, resources, etc.
By default, tests are no longer compiled as part of 'make'. They will
be built when 'make check' is run. The old behaviour can be obtained
with --enable-always-build-tests.
--disable-modular-tests is gone (because tests are no longer built by
default). There is no longer any way to cause 'make check' to be a
no-op, but that's not very useful anyway.
A new glibtests.m4 file is introduced. Along with glib.mk, this
provides for consistent handling of --enable-installed-tests and
--enable-always-build-tests (mentioned above).
Port our various test-installing Makefiles to the new framework.
This patch substantially improves the situation in the toplevel tests/
directory. Things are now somewhat under control there. There were
some tests being built that weren't even being run and we run those now.
The long-running GObject performance tests in this directory have been
removed from 'make check' because they take too long.
As an experiment, 'make check' now runs the testcases on win32 builds,
by default. We can't run them under gtester (since it uses a pipe to
communicate with the subprocess) so just toss them in TESTS. Most of
them are passing on win32.
Things are not quite done here, but this patch is already a substantial
improvement. More to come.
2013-05-30 06:07:32 +02:00
|
|
|
BUILT_EXTRA_DIST += \
|
2010-02-03 23:37:13 +01:00
|
|
|
gio.rc
|
|
|
|
|
|
2011-06-03 20:53:27 +02:00
|
|
|
# This is read by gobject-introspection/misc/ and gtk-doc
|
|
|
|
|
gio-public-headers.txt: Makefile
|
2012-05-29 19:10:57 +02:00
|
|
|
$(AM_V_GEN) echo $(gioinclude_HEADERS) $(giowin32include_HEADERS) $(giounixinclude_HEADERS) > $@.tmp && mv $@.tmp $@
|
2011-06-03 20:53:27 +02:00
|
|
|
|
Rework the build system for a new tests approach
Perform a substantial cleanup of the build system with respect to
building and installing testcases.
First, Makefile.decl has been renamed glib.mk and substantially
expanded. We intend to add more stuff here in the future, like canned
rules for mkenums, marshallers, resources, etc.
By default, tests are no longer compiled as part of 'make'. They will
be built when 'make check' is run. The old behaviour can be obtained
with --enable-always-build-tests.
--disable-modular-tests is gone (because tests are no longer built by
default). There is no longer any way to cause 'make check' to be a
no-op, but that's not very useful anyway.
A new glibtests.m4 file is introduced. Along with glib.mk, this
provides for consistent handling of --enable-installed-tests and
--enable-always-build-tests (mentioned above).
Port our various test-installing Makefiles to the new framework.
This patch substantially improves the situation in the toplevel tests/
directory. Things are now somewhat under control there. There were
some tests being built that weren't even being run and we run those now.
The long-running GObject performance tests in this directory have been
removed from 'make check' because they take too long.
As an experiment, 'make check' now runs the testcases on win32 builds,
by default. We can't run them under gtester (since it uses a pipe to
communicate with the subprocess) so just toss them in TESTS. Most of
them are passing on win32.
Things are not quite done here, but this patch is already a substantial
improvement. More to come.
2013-05-30 06:07:32 +02:00
|
|
|
CLEANFILES += gdbus-daemon-generated.c gdbus-daemon-generated.h gio-public-headers.txt gconstructor_as_data.h
|
2011-06-03 20:53:27 +02:00
|
|
|
|
2012-12-18 01:14:22 +01:00
|
|
|
|
Rework the build system for a new tests approach
Perform a substantial cleanup of the build system with respect to
building and installing testcases.
First, Makefile.decl has been renamed glib.mk and substantially
expanded. We intend to add more stuff here in the future, like canned
rules for mkenums, marshallers, resources, etc.
By default, tests are no longer compiled as part of 'make'. They will
be built when 'make check' is run. The old behaviour can be obtained
with --enable-always-build-tests.
--disable-modular-tests is gone (because tests are no longer built by
default). There is no longer any way to cause 'make check' to be a
no-op, but that's not very useful anyway.
A new glibtests.m4 file is introduced. Along with glib.mk, this
provides for consistent handling of --enable-installed-tests and
--enable-always-build-tests (mentioned above).
Port our various test-installing Makefiles to the new framework.
This patch substantially improves the situation in the toplevel tests/
directory. Things are now somewhat under control there. There were
some tests being built that weren't even being run and we run those now.
The long-running GObject performance tests in this directory have been
removed from 'make check' because they take too long.
As an experiment, 'make check' now runs the testcases on win32 builds,
by default. We can't run them under gtester (since it uses a pipe to
communicate with the subprocess) so just toss them in TESTS. Most of
them are passing on win32.
Things are not quite done here, but this patch is already a substantial
improvement. More to come.
2013-05-30 06:07:32 +02:00
|
|
|
DISTCLEANFILES += \
|
2012-12-18 01:14:22 +01:00
|
|
|
gioenumtypes.h \
|
|
|
|
|
gioenumtypes.c
|
|
|
|
|
|
2011-06-03 20:53:27 +02:00
|
|
|
all-local: gio-public-headers.txt
|
|
|
|
|
|
2007-12-01 18:40:19 +01:00
|
|
|
gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
|
2013-01-21 17:25:26 +01:00
|
|
|
$(AM_V_GEN) $(top_builddir)/gobject/glib-mkenums --template $(filter %.template,$^) $(filter-out %.template,$^) > \
|
2007-12-14 15:28:35 +01:00
|
|
|
gioenumtypes.h.tmp && mv gioenumtypes.h.tmp gioenumtypes.h
|
|
|
|
|
|
2007-12-01 18:40:19 +01:00
|
|
|
gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
|
2013-01-21 17:25:26 +01:00
|
|
|
$(AM_V_GEN) $(top_builddir)/gobject/glib-mkenums --template $(filter %.template,$^) $(filter-out %.template,$^) > \
|
2007-12-14 15:28:35 +01:00
|
|
|
gioenumtypes.c.tmp && mv gioenumtypes.c.tmp gioenumtypes.c
|
2008-03-13 18:10:04 +01:00
|
|
|
|
|
|
|
|
gio-2.0.lib: libgio-2.0.la gio.def
|
2012-03-18 04:10:01 +01:00
|
|
|
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@
|
2009-06-22 21:33:41 +02:00
|
|
|
|
2011-12-21 21:43:20 +01:00
|
|
|
bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings
|
|
|
|
|
|
|
|
|
|
glib_compile_resources_LDADD = \
|
|
|
|
|
$(top_builddir)/glib/libglib-2.0.la \
|
|
|
|
|
$(top_builddir)/gobject/libgobject-2.0.la \
|
|
|
|
|
libgio-2.0.la
|
|
|
|
|
|
|
|
|
|
glib_compile_resources_SOURCES = \
|
|
|
|
|
gvdb/gvdb-format.h \
|
|
|
|
|
gvdb/gvdb-builder.h \
|
|
|
|
|
gvdb/gvdb-builder.c \
|
|
|
|
|
glib-compile-resources.c
|
2010-04-19 11:25:22 +02:00
|
|
|
|
2010-01-12 13:11:22 +01:00
|
|
|
gio_querymodules_SOURCES = gio-querymodules.c
|
|
|
|
|
gio_querymodules_LDADD = \
|
|
|
|
|
$(top_builddir)/glib/libglib-2.0.la \
|
|
|
|
|
$(top_builddir)/gobject/libgobject-2.0.la \
|
|
|
|
|
$(top_builddir)/gmodule/libgmodule-2.0.la \
|
|
|
|
|
libgio-2.0.la \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2012-02-01 17:44:15 +01:00
|
|
|
gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl
|
|
|
|
|
$(AM_V_GEN) $(srcdir)/data-to-c.pl $(top_srcdir)/glib/gconstructor.h gconstructor_code > $@.tmp && mv $@.tmp $@
|
2012-01-30 16:57:54 +01:00
|
|
|
|
2010-04-23 23:27:26 +02:00
|
|
|
glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la
|
|
|
|
|
glib_compile_schemas_SOURCES = \
|
2012-01-30 16:57:54 +01:00
|
|
|
gconstructor_as_data.h \
|
2010-04-17 05:17:01 +02:00
|
|
|
gvdb/gvdb-format.h \
|
|
|
|
|
gvdb/gvdb-builder.h \
|
|
|
|
|
gvdb/gvdb-builder.c \
|
2010-09-09 22:12:45 +02:00
|
|
|
glib-compile-schemas.c
|
2010-04-16 05:35:49 +02:00
|
|
|
|
2010-04-22 07:15:54 +02:00
|
|
|
gsettings_LDADD = \
|
2010-04-21 02:54:53 +02:00
|
|
|
$(top_builddir)/glib/libglib-2.0.la \
|
2010-05-10 09:48:49 +02:00
|
|
|
$(top_builddir)/gobject/libgobject-2.0.la \
|
2010-04-21 02:54:53 +02:00
|
|
|
libgio-2.0.la
|
2010-04-22 07:15:54 +02:00
|
|
|
gsettings_SOURCES = gsettings-tool.c
|
2010-04-21 02:54:53 +02:00
|
|
|
|
2010-04-19 20:04:42 +02:00
|
|
|
schemadir = $(datadir)/glib-2.0/schemas
|
|
|
|
|
dist_schema_DATA = gschema.dtd
|
|
|
|
|
|
2010-05-06 20:13:59 +02:00
|
|
|
# ------------------------------------------------------------------------
|
|
|
|
|
# gdbus(1) tool
|
|
|
|
|
|
|
|
|
|
bin_PROGRAMS += gdbus
|
|
|
|
|
gdbus_SOURCES = gdbus-tool.c
|
2010-05-15 10:13:28 +02:00
|
|
|
gdbus_LDADD = libgio-2.0.la \
|
|
|
|
|
$(top_builddir)/glib/libglib-2.0.la \
|
|
|
|
|
$(top_builddir)/gobject/libgobject-2.0.la
|
2010-05-06 20:13:59 +02:00
|
|
|
|
2013-10-21 20:55:52 +02:00
|
|
|
if OS_UNIX
|
2013-07-15 01:43:19 +02:00
|
|
|
# ------------------------------------------------------------------------
|
|
|
|
|
# gapplication(1) tool
|
|
|
|
|
bin_PROGRAMS += gapplication
|
|
|
|
|
gapplication_SOURCES = gapplication-tool.c
|
|
|
|
|
gapplication_LDADD = libgio-2.0.la \
|
|
|
|
|
$(top_builddir)/glib/libglib-2.0.la \
|
|
|
|
|
$(top_builddir)/gobject/libgobject-2.0.la
|
2013-10-21 20:55:52 +02:00
|
|
|
endif
|
2013-07-15 01:43:19 +02:00
|
|
|
|
2012-06-21 12:11:58 +02:00
|
|
|
completiondir = $(datadir)/bash-completion/completions
|
2011-07-03 17:37:35 +02:00
|
|
|
completion_DATA = \
|
2013-07-15 01:43:19 +02:00
|
|
|
completion/gapplication \
|
2012-06-21 12:11:58 +02:00
|
|
|
completion/gdbus \
|
|
|
|
|
completion/gsettings \
|
|
|
|
|
completion/gresource
|
2011-07-04 22:03:33 +02:00
|
|
|
EXTRA_DIST += $(completion_DATA)
|
2010-05-06 20:13:59 +02:00
|
|
|
|
2012-01-22 08:39:11 +01:00
|
|
|
# ------------------------------------------------------------------------
|
|
|
|
|
# gresource tool
|
|
|
|
|
|
|
|
|
|
bin_PROGRAMS += gresource
|
|
|
|
|
gresource_SOURCES = gresource-tool.c
|
2012-03-31 20:20:19 +02:00
|
|
|
gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS)
|
2012-01-22 08:39:11 +01:00
|
|
|
gresource_LDADD = libgio-2.0.la \
|
|
|
|
|
$(top_builddir)/glib/libglib-2.0.la \
|
|
|
|
|
$(top_builddir)/gobject/libgobject-2.0.la \
|
2012-03-31 20:20:19 +02:00
|
|
|
$(LIBELF_LIBS)
|
2012-01-22 08:39:11 +01:00
|
|
|
|
2010-05-06 20:13:59 +02:00
|
|
|
# ------------------------------------------------------------------------
|
|
|
|
|
|
2011-02-22 12:58:18 +01:00
|
|
|
dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gio.vcproj ../build/win32/vs10/gio.vcxproj ../build/win32/vs10/gio.vcxproj.filters
|
2010-02-03 23:37:13 +01:00
|
|
|
files='$(BUILT_EXTRA_DIST)'; \
|
|
|
|
|
for f in $$files; do \
|
|
|
|
|
if test -f $$f; then d=.; else d=$(srcdir); fi; \
|
|
|
|
|
cp $$d/$$f $(distdir) || exit 1; done
|
2010-01-12 13:11:22 +01:00
|
|
|
|
2010-03-21 15:11:49 +01:00
|
|
|
../build/win32/vs9/gio.vcproj: $(top_srcdir)/build/win32/vs9/gio.vcprojin
|
2011-07-04 15:47:59 +02:00
|
|
|
for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
|
2010-03-21 15:11:49 +01:00
|
|
|
case $$F in \
|
2012-07-19 17:15:59 +02:00
|
|
|
gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
|
2010-03-21 15:11:49 +01:00
|
|
|
*.c) echo ' <File RelativePath="..\..\..\gio\'$$F'" />' \
|
|
|
|
|
;; \
|
|
|
|
|
esac; \
|
2010-05-03 18:56:46 +02:00
|
|
|
done | sort -u >libgio.sourcefiles
|
2010-03-21 15:11:49 +01:00
|
|
|
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/gio.vcprojin >$@
|
2010-05-03 18:56:46 +02:00
|
|
|
rm libgio.sourcefiles
|
2011-06-03 20:53:27 +02:00
|
|
|
|
2011-02-22 12:58:18 +01:00
|
|
|
../build/win32/vs10/gio.vcxproj: $(top_srcdir)/build/win32/vs10/gio.vcxprojin
|
2011-07-04 15:47:59 +02:00
|
|
|
for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
|
2011-02-22 12:58:18 +01:00
|
|
|
case $$F in \
|
2012-07-19 17:15:59 +02:00
|
|
|
gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
|
2011-02-22 12:58:18 +01:00
|
|
|
*.c) echo ' <ClCompile Include="..\..\..\gio\'$$F'" />' \
|
|
|
|
|
;; \
|
|
|
|
|
esac; \
|
|
|
|
|
done | sort -u >libgio.vs10.sourcefiles
|
|
|
|
|
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gio.vcxprojin >$@
|
|
|
|
|
rm libgio.vs10.sourcefiles
|
|
|
|
|
|
|
|
|
|
../build/win32/vs10/gio.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin
|
2011-07-04 15:47:59 +02:00
|
|
|
for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \
|
2011-02-22 12:58:18 +01:00
|
|
|
case $$F in \
|
2012-07-19 17:15:59 +02:00
|
|
|
gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c) ;; \
|
2011-02-22 12:58:18 +01:00
|
|
|
*.c) echo ' <ClCompile Include="..\..\..\gio\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
|
|
|
|
|
;; \
|
|
|
|
|
esac; \
|
|
|
|
|
done | sort -u >libgio.vs10.sourcefiles.filters
|
|
|
|
|
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin >$@
|
|
|
|
|
rm libgio.vs10.sourcefiles.filters
|
2010-03-21 15:11:49 +01:00
|
|
|
|
2009-06-22 21:33:41 +02:00
|
|
|
if HAVE_GLIB_RUNTIME_LIBDIR
|
|
|
|
|
install-data-hook:
|
|
|
|
|
mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
|
|
|
|
mv $(DESTDIR)$(libdir)/libgio-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
2009-09-30 05:06:45 +02:00
|
|
|
mv $(DESTDIR)$(libdir)/libgio-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
|
2009-06-22 21:33:41 +02:00
|
|
|
rm -f $(DESTDIR)$(libdir)/libgio-2.0.so
|
2009-09-30 05:06:45 +02:00
|
|
|
ln -s $(GLIB_RUNTIME_LIBDIR)/libgio-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/libgio-2.0.so
|
2009-06-22 21:33:41 +02:00
|
|
|
endif
|
