[gimp/meson: 128/128] Fix rebase: * Backport source filenames changes * Add missing test * Add new tool * Move git-version
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/meson: 128/128] Fix rebase: * Backport source filenames changes * Add missing test * Add new tool * Move git-version
- Date: Mon, 12 Feb 2018 13:50:35 +0000 (UTC)
commit 278d2b52e3f4ad538daa1fe5dc66f16ee80e9a78
Author: Félix Piédallu <felix piedallu me>
Date: Fri Feb 2 17:31:11 2018 +0100
Fix rebase:
* Backport source filenames changes
* Add missing test
* Add new tool
* Move git-version.h definition to root.
app/meson.build | 24 +-----------------------
app/tools/meson.build | 1 +
app/widgets/meson.build | 1 +
desktop/meson.build | 11 +++++++++--
meson.build | 32 ++++++++++++++++++++++++++++++--
tools/meson.build | 26 +++++++++++++++++++++++---
6 files changed, 65 insertions(+), 30 deletions(-)
---
diff --git a/app/meson.build b/app/meson.build
index 9448045..dd78045 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -1,27 +1,5 @@
rootAppInclude = include_directories('.')
-gitversion_h1 = vcs_tag(
- input : 'git-version.h.in',
- output: 'git-version.h.in.1',
- command: [ 'git', 'describe', '--always', ],
- replace_string: '@GIMP_GIT_VERSION@',
- fallback: '',
-)
-gitversion_h2 = vcs_tag(
- input : gitversion_h1,
- output: 'git-version.h.in.2',
- command: [ 'git', 'rev-parse', '--short', 'HEAD', ],
- replace_string: '@GIMP_GIT_VERSION_ABBREV@',
- fallback: '',
-)
-gitversion_h = vcs_tag(
- input : gitversion_h2,
- output: 'git-version.h',
- command: [ 'git', 'log', '-n1', '--date=format:%Y', '--pretty=%cd', ],
- replace_string: '@GIMP_GIT_LAST_COMMIT_YEAR@',
- fallback: '',
-)
-
app_mkenums_custom_target_command = [
gimp_mkenums,
'--fhead','#include "config.h"\n'
@@ -69,12 +47,12 @@ libapp_sources = [
'errors.c',
'gimp-debug.c',
'gimp-log.c',
+ 'gimp-version.c',
'language.c',
'sanity.c',
'signals.c',
'tests.c',
'unique.c',
- 'version.c',
gitversion_h,
gimpdbusservice_gen,
]
diff --git a/app/tools/meson.build b/app/tools/meson.build
index 5fb21f8..5e5110b 100644
--- a/app/tools/meson.build
+++ b/app/tools/meson.build
@@ -48,6 +48,7 @@ libapptools_sources = [
'gimpfreeselecttool.c',
'gimpfuzzyselecttool.c',
'gimpgegltool.c',
+ 'gimpgenerictransformtool.c',
'gimpguidetool.c',
'gimphandletransformoptions.c',
'gimphandletransformtool.c',
diff --git a/app/widgets/meson.build b/app/widgets/meson.build
index 3a18395..1a910d6 100644
--- a/app/widgets/meson.build
+++ b/app/widgets/meson.build
@@ -57,6 +57,7 @@ libappwidgets_sources = [
'gimpcontrollermouse.c',
'gimpcontrollers.c',
'gimpcontrollerwheel.c',
+ 'gimpcriticaldialog.c',
'gimpcursor.c',
'gimpcurveview.c',
'gimpdashboard.c',
diff --git a/desktop/meson.build b/desktop/meson.build
index 5e3f6a5..34df7a0 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -47,9 +47,9 @@ desktopfile = custom_target(desktopfilename,
install_dir: join_paths(get_option('datadir'), 'applications'),
)
-appdatafilename = 'gimp.appdata.xml'
+appdatafilename = 'org.gimp.GIMP.appdata.xml'
appdatafile = custom_target(appdatafilename,
- input : [ appdatafilename+'.in', ],
+ input : [ appdatafilename+'.in.in', ],
output: [ appdatafilename, ],
command: [
intltool_merge,
@@ -90,3 +90,10 @@ custom_target('validate-desktop',
build_always: false,
build_by_default: false,
)
+
+test('test_appdata',
+ find_program('test-appdata.sh'),
+ env: [
+ 'GIMP_TESTING_ABS_TOP_BUILDDIR=' + meson.build_root(),
+ ],
+)
diff --git a/meson.build b/meson.build
index 9c2c424..bb95721 100644
--- a/meson.build
+++ b/meson.build
@@ -120,7 +120,7 @@ math = cc.find_library('m')
atk = dependency('atk', version: '>=2.2.0')
-babl_minver = '>=0.1.38'
+babl_minver = '>=0.1.42'
babl = dependency('babl', version: babl_minver)
cairo_minver = '>=1.12.2'
@@ -138,7 +138,7 @@ freetype2 = dependency('freetype2', version: '>=2.1.7')
gdk_pixbuf_minver = '>=2.30.8'
gdk_pixbuf = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_minver)
-gegl_minver = '>=0.3.27'
+gegl_minver = '>=0.3.29'
gegl = dependency('gegl-0.3', version: gegl_minver)
gexiv2 = dependency('gexiv2', version: '>=0.10.6')
@@ -309,6 +309,9 @@ if have_screenshot and not have_xlibs
error('Screenshot requires x libs')
endif
+if not cc.has_header('execinfo.h')
+ error('The compiler does not provide required header "execinfo.h"')
+endif
################################################################################
# MIME types
# The list of MIME types that are supported by plug-ins
@@ -430,6 +433,8 @@ endif
if get_option('with-poppler')
+ # All modern distributions have at least this version and CJK/Cyrillic
+ # support should not be considered as "second-zone citizen".
poppler = [
dependency('poppler-glib', version: '>=0.44.0'),
dependency('poppler-data', version: '>=0.4.7'),
@@ -838,6 +843,29 @@ add_project_arguments(
rootInclude = include_directories('.')
appInclude = include_directories('app')
+
+gitversion_h1 = vcs_tag(
+ input : 'app/git-version.h.in',
+ output: 'git-version.h.in.1',
+ command: [ 'git', 'describe', '--always', ],
+ replace_string: '@GIMP_GIT_VERSION@',
+ fallback: '',
+)
+gitversion_h2 = vcs_tag(
+ input : gitversion_h1,
+ output: 'git-version.h.in.2',
+ command: [ 'git', 'rev-parse', '--short', 'HEAD', ],
+ replace_string: '@GIMP_GIT_VERSION_ABBREV@',
+ fallback: '',
+)
+gitversion_h = vcs_tag(
+ input : gitversion_h2,
+ output: 'git-version.h',
+ command: [ 'git', 'log', '-n1', '--date=format:%Y', '--pretty=%cd', ],
+ replace_string: '@GIMP_GIT_LAST_COMMIT_YEAR@',
+ fallback: '',
+)
+
################################################################################
# Subdirs
subdir('build/windows')
diff --git a/tools/meson.build b/tools/meson.build
index 9ec481f..5229662 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -1,12 +1,13 @@
if platform_win32
- gimp_debug_resume = executable('gimp-debug-resume', 'gimp-debug-resume.c')
+ gimp_debug_resume = executable('gimp-debug-resume',
+ 'gimp-debug-resume.c',
+ )
endif
-gimptool = executable('gimptool-2.0',
+gimptool = executable('gimptool-' + api_version,
'gimptool.c',
-
include_directories: rootInclude,
dependencies: [
gtk2,
@@ -17,6 +18,25 @@ gimptool = executable('gimptool-2.0',
install: true,
)
+gimpdebug = executable('gimpdebug-' + api_version,
+ [
+ '../app/gimp-version.c',
+ '../app/widgets/gimpcriticaldialog.c',
+ 'gimpdebug.c',
+ ],
+ include_directories: [ rootInclude, appInclude, ],
+ dependencies: [
+ fontconfig,
+ gegl,
+ gio,
+ gtk2,
+ ],
+ link_with: [
+ libgimpbase,
+ ],
+ install: true,
+)
+
executable('kernelgen',
'kernelgen.c',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]