[gnome-photos/wip/rishi/buffer-decoder: 8/18] build: Split some code into a private shared library
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos/wip/rishi/buffer-decoder: 8/18] build: Split some code into a private shared library
- Date: Fri, 5 Oct 2018 12:06:39 +0000 (UTC)
commit eac55908d0eb8a0327e2f5a057d08074bc0860d1
Author: Debarshi Ray <debarshir gnome org>
Date: Wed Oct 3 08:44:37 2018 +0200
build: Split some code into a private shared library
The overall idea is to start adding unit tests, wherever possible.
Putting the tested code in a private library makes it accessible from
test cases because they can link to it.
Subsequent commits will add a new codec API for GeglBuffer. It will be
very important to have unit tests for those code paths because:
* That code will be inherently testable and tests are great.
* That code is likely to be security sensitive, will handle all
sorts of dodgy input from untrusted sources, and written using
very old APIs with brittle error handling.
This is a step towards that.
A private shared library seems better than a private static archive
because the most easily testable code paths are shared across the main
application and the thumbnailer. Therefore, the assumption is that the
benefits of sharing that code across both processes outweigh the
drawbacks of having to resolve yet another shared library on startup.
However, this is just an assumption. There's no data behind it.
https://gitlab.gnome.org/GNOME/gnome-photos/issues/63
meson.build | 1 +
src/Makefile.am | 67 ++++++++++++++++++++++++++++++++++++++-------------------
src/meson.build | 54 ++++++++++++++++++++++++++++++++++------------
3 files changed, 86 insertions(+), 36 deletions(-)
---
diff --git a/meson.build b/meson.build
index 633cf56a..3f6e1552 100644
--- a/meson.build
+++ b/meson.build
@@ -13,6 +13,7 @@ photos_libexecdir = join_paths(photos_prefix, get_option('libexecdir'))
photos_localedir = join_paths(photos_prefix, get_option('localedir'))
photos_docdir = join_paths(photos_datadir, 'doc', meson.project_name())
+photos_libdir = join_paths(photos_prefix, get_option('libdir'), meson.project_name())
photos_installed_test_metadir = join_paths(photos_datadir, 'installed-tests', meson.project_name())
photos_installed_test_execdir = join_paths(photos_libexecdir, 'installed-tests', meson.project_name())
diff --git a/src/Makefile.am b/src/Makefile.am
index 94d7e940..db6892fa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,54 @@
+pkglib_LTLIBRARIES = libgnome-photos.la
+
bin_PROGRAMS = gnome-photos
libexec_PROGRAMS = gnome-photos-thumbnailer
+libgnome_photos_la_built_sources = \
+ photos-enums-gegl.c \
+ photos-enums-gegl.h \
+ $(NULL)
+
+nodist_libgnome_photos_la_SOURCES = \
+ $(libgnome_photos_la_built_sources) \
+ $(NULL)
+
+libgnome_photos_la_SOURCES = \
+ photos-debug.c \
+ photos-debug.h \
+ photos-error.c \
+ photos-error.h \
+ photos-operation-insta-common.h \
+ photos-operation-svg-multiply.c \
+ photos-operation-svg-multiply.h \
+ photos-quarks.c \
+ photos-quarks.h \
+ $(NULL)
+
+libgnome_photos_la_CPPFLAGS = \
+ $(BABL_CFLAGS) \
+ $(GEGL_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GOBJECT_CFLAGS) \
+ $(NULL)
+
+libgnome_photos_la_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ -avoid-version \
+ $(NULL)
+
+libgnome_photos_la_LIBADD = \
+ $(BABL_LIBS) \
+ $(GEGL_LIBS) \
+ $(GLIB_LIBS) \
+ $(GOBJECT_LIBS) \
+ $(NULL)
+
gnome_photos_built_sources = \
photos-about-data.c \
photos-about-data.h \
photos-enums.c \
photos-enums.h \
- photos-enums-gegl.c \
- photos-enums-gegl.h \
photos-dleyna-renderer-device.c \
photos-dleyna-renderer-device.h \
photos-dleyna-renderer-manager.c \
@@ -56,8 +96,6 @@ gnome_photos_SOURCES = \
photos-create-collection-icon-job.h \
photos-create-collection-job.c \
photos-create-collection-job.h \
- photos-debug.c \
- photos-debug.h \
photos-delete-item-job.c \
photos-delete-item-job.h \
photos-delete-notification.c \
@@ -74,8 +112,6 @@ gnome_photos_SOURCES = \
photos-done-notification.h \
photos-dropdown.c \
photos-dropdown.h \
- photos-error.c \
- photos-error.h \
photos-export-dialog.c \
photos-export-dialog.h \
photos-export-notification.c \
@@ -150,7 +186,6 @@ gnome_photos_SOURCES = \
photos-offset-overview-controller.h \
photos-offset-search-controller.c \
photos-offset-search-controller.h \
- photos-operation-insta-common.h \
photos-operation-insta-curve.c \
photos-operation-insta-curve.h \
photos-operation-insta-filter.c \
@@ -167,8 +202,6 @@ gnome_photos_SOURCES = \
photos-operation-png-guess-sizes.h \
photos-operation-saturation.c \
photos-operation-saturation.h \
- photos-operation-svg-multiply.c \
- photos-operation-svg-multiply.h \
photos-organize-collection-dialog.c \
photos-organize-collection-dialog.h \
photos-organize-collection-model.c \
@@ -195,8 +228,6 @@ gnome_photos_SOURCES = \
photos-print-setup.h \
photos-properties-dialog.c \
photos-properties-dialog.h \
- photos-quarks.c \
- photos-quarks.h \
photos-query.c \
photos-query.h \
photos-query-builder.h \
@@ -353,11 +384,10 @@ gnome_photos_LDADD = \
$(TRACKER_LIBS) \
$(LIBM) \
$(top_builddir)/subprojects/libgd/libgd.la \
+ libgnome-photos.la \
$(NULL)
gnome_photos_thumbnailer_built_sources = \
- photos-enums-gegl.c \
- photos-enums-gegl.h \
photos-resources-gegl.c \
photos-resources-gegl.h \
photos-thumbnailer-dbus.c \
@@ -369,15 +399,10 @@ nodist_gnome_photos_thumbnailer_SOURCES = \
$(NULL)
gnome_photos_thumbnailer_SOURCES = \
- photos-debug.c \
- photos-debug.h \
- photos-error.c \
- photos-error.h \
photos-gegl.c \
photos-gegl.h \
photos-jpeg-count.c \
photos-jpeg-count.h \
- photos-operation-insta-common.h \
photos-operation-insta-curve.c \
photos-operation-insta-curve.h \
photos-operation-insta-filter.c \
@@ -394,16 +419,12 @@ gnome_photos_thumbnailer_SOURCES = \
photos-operation-png-guess-sizes.h \
photos-operation-saturation.c \
photos-operation-saturation.h \
- photos-operation-svg-multiply.c \
- photos-operation-svg-multiply.h \
photos-pipeline.c \
photos-pipeline.h \
photos-pixbuf.c \
photos-pixbuf.h \
photos-png-count.c \
photos-png-count.h \
- photos-quarks.c \
- photos-quarks.h \
photos-thumbnailer.c \
photos-thumbnailer.h \
photos-thumbnailer-main.c \
@@ -436,11 +457,13 @@ gnome_photos_thumbnailer_LDADD = \
$(JPEG_LIBS) \
$(PNG_LIBS) \
$(LIBM) \
+ libgnome-photos.la \
$(NULL)
BUILT_SOURCES = \
$(gnome_photos_built_sources) \
$(gnome_photos_thumbnailer_built_sources) \
+ $(libgnome_photos_la_built_sources) \
$(NULL)
EXTRA_DIST = \
diff --git a/src/meson.build b/src/meson.build
index 9cb0dd83..ade7b3b5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,19 +1,7 @@
-common_sources = files(
+sources = files(
'photos-debug.c',
'photos-error.c',
- 'photos-gegl.c',
- 'photos-jpeg-count.c',
- 'photos-operation-insta-curve.c',
- 'photos-operation-insta-filter.c',
- 'photos-operation-insta-hefe.c',
- 'photos-operation-insta-hefe-curve.c',
- 'photos-operation-insta-hefe-vignette.c',
- 'photos-operation-jpg-guess-sizes.c',
- 'photos-operation-png-guess-sizes.c',
- 'photos-operation-saturation.c',
'photos-operation-svg-multiply.c',
- 'photos-pipeline.c',
- 'photos-png-count.c',
'photos-quarks.c',
)
@@ -23,13 +11,48 @@ enum_headers = files(
enum = 'photos-enums-gegl'
-common_sources += gnome.mkenums(
+sources += gnome.mkenums(
enum,
sources: enum_headers,
c_template: enum + '.c.template',
h_template: enum + '.h.template',
)
+deps = [
+ babl_dep,
+ gegl_dep,
+ glib_dep,
+ gobject_dep,
+]
+
+libgnome_photos = shared_library(
+ meson.project_name(),
+ sources,
+ dependencies: deps,
+ include_directories: top_inc,
+ install: true,
+ install_dir: photos_libdir,
+)
+
+libgnome_photos_dep = declare_dependency(
+ link_with: libgnome_photos,
+)
+
+common_sources = files(
+ 'photos-gegl.c',
+ 'photos-jpeg-count.c',
+ 'photos-operation-insta-curve.c',
+ 'photos-operation-insta-filter.c',
+ 'photos-operation-insta-hefe.c',
+ 'photos-operation-insta-hefe-curve.c',
+ 'photos-operation-insta-hefe-vignette.c',
+ 'photos-operation-jpg-guess-sizes.c',
+ 'photos-operation-png-guess-sizes.c',
+ 'photos-operation-saturation.c',
+ 'photos-pipeline.c',
+ 'photos-png-count.c',
+)
+
resource_data = files('../data/vignette.png')
common_sources += gnome.compile_resources(
@@ -64,6 +87,7 @@ common_deps = [
glib_dep,
gobject_dep,
libdazzle_dep,
+ libgnome_photos_dep,
libjpeg_dep,
libpng_dep,
m_dep,
@@ -376,6 +400,7 @@ executable(
c_args: cflags,
install: true,
install_dir: photos_bindir,
+ install_rpath: photos_libdir,
)
sources = common_sources + files(
@@ -392,4 +417,5 @@ executable(
c_args: cflags,
install: true,
install_dir: photos_libexecdir,
+ install_rpath: photos_libdir,
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]