mirror of https://github.com/GNOME/gimp.git
meson: fix warnings of deprecated features.
Now that we bumped our meson requirement, meson is complaining about several features now deprecated even in the minimum required meson version: s/meson.source_root/meson.project_source_root/ to fix: > WARNING: Project targets '>=0.56.0' but uses feature deprecated since '0.56.0': meson.source_root. use meson.project_source_root() or meson.global_source_root() instead. s/meson.build_root/meson.project_build_root/ to fix: > WARNING: Project targets '>=0.56.0' but uses feature deprecated since '0.56.0': meson.build_root. use meson.project_build_root() or meson.global_build_root() instead. Fixing using path() on xdg_email and python ExternalProgram variables: > WARNING: Project targets '>=0.56.0' but uses feature deprecated since '0.55.0': ExternalProgram.path. use ExternalProgram.full_path() instead s/get_pkgconfig_variable *(\([^)]*\))/get_variable(pkgconfig: \1)/ to fix: > WARNING: Project targets '>=0.56.0' but uses feature deprecated since '0.56.0': dependency.get_pkgconfig_variable. use dependency.get_variable(pkgconfig : ...) instead
This commit is contained in:
parent
9ff1358e0b
commit
ca230cb770
|
@ -7,7 +7,7 @@ stamp_config_enums = custom_target('stamp-config-enums.h',
|
||||||
output: [ 'stamp-config-enums.h', ],
|
output: [ 'stamp-config-enums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'config-',
|
'config-',
|
||||||
'#include <gio/gio.h>\n' +
|
'#include <gio/gio.h>\n' +
|
||||||
|
|
|
@ -7,7 +7,7 @@ stamp_core_enums = custom_target('stamp-core-enums.h',
|
||||||
output: [ 'stamp-core-enums.h', ],
|
output: [ 'stamp-core-enums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'core-',
|
'core-',
|
||||||
'#include <gio/gio.h>\n' +
|
'#include <gio/gio.h>\n' +
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
welcome_dialog_data_h = custom_target('welcome-dialog-data-h',
|
welcome_dialog_data_h = custom_target('welcome-dialog-data-h',
|
||||||
input : [meson.source_root() / 'tools/generate-welcome-dialog-data.py',
|
input : [meson.project_source_root() / 'tools/generate-welcome-dialog-data.py',
|
||||||
meson.source_root() / 'desktop/org.gimp.GIMP.appdata.xml.in.in'],
|
meson.project_source_root() / 'desktop/org.gimp.GIMP.appdata.xml.in.in'],
|
||||||
output : ['welcome-dialog-data.h'],
|
output : ['welcome-dialog-data.h'],
|
||||||
command : ['python3', '@INPUT0@', gimp_version, '--header'],
|
command : ['python3', '@INPUT0@', gimp_version, '--header'],
|
||||||
capture: true)
|
capture: true)
|
||||||
welcome_dialog_data_c = custom_target('welcome-dialog-data-c',
|
welcome_dialog_data_c = custom_target('welcome-dialog-data-c',
|
||||||
input : [meson.source_root() / 'tools/generate-welcome-dialog-data.py',
|
input : [meson.project_source_root() / 'tools/generate-welcome-dialog-data.py',
|
||||||
meson.source_root() / 'desktop/org.gimp.GIMP.appdata.xml.in.in'],
|
meson.project_source_root() / 'desktop/org.gimp.GIMP.appdata.xml.in.in'],
|
||||||
output : ['welcome-dialog-data.c'],
|
output : ['welcome-dialog-data.c'],
|
||||||
command : ['python3', '@INPUT0@', gimp_version],
|
command : ['python3', '@INPUT0@', gimp_version],
|
||||||
capture: true)
|
capture: true)
|
||||||
|
@ -65,7 +65,7 @@ libappdialogs_sources = [
|
||||||
# Auto-generated sources
|
# Auto-generated sources
|
||||||
libappdialogs_sources += [
|
libappdialogs_sources += [
|
||||||
custom_target('authors.h',
|
custom_target('authors.h',
|
||||||
input : [ 'authors.xsl', meson.source_root() / 'authors.xml' ],
|
input : [ 'authors.xsl', meson.project_source_root() / 'authors.xml' ],
|
||||||
output: [ 'authors.h' ],
|
output: [ 'authors.h' ],
|
||||||
command: [ xsltproc, '-o', '@OUTPUT@', '@INPUT0@', '@INPUT1@' ],
|
command: [ xsltproc, '-o', '@OUTPUT@', '@INPUT0@', '@INPUT1@' ],
|
||||||
)
|
)
|
||||||
|
|
|
@ -7,7 +7,7 @@ stamp_display_enums = custom_target('stamp-display-enums.h',
|
||||||
output: [ 'stamp-display-enums.h', ],
|
output: [ 'stamp-display-enums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'display-',
|
'display-',
|
||||||
'#include <gio/gio.h>\n' +
|
'#include <gio/gio.h>\n' +
|
||||||
|
|
|
@ -7,7 +7,7 @@ stamp_gegl_enums = custom_target('stamp-gimp-gegl-enums.h',
|
||||||
output: [ 'stamp-gimp-gegl-enums.h', ],
|
output: [ 'stamp-gimp-gegl-enums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'gimp-gegl-',
|
'gimp-gegl-',
|
||||||
'#include <gio/gio.h>\n' +
|
'#include <gio/gio.h>\n' +
|
||||||
|
|
|
@ -153,7 +153,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(console_rc_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(console_rc_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(console_rc_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(console_rc_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
@ -171,7 +171,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(gui_rc_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(gui_rc_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(gui_rc_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(gui_rc_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -7,7 +7,7 @@ stamp_operations_enums = custom_target('stamp-operations-enums.h',
|
||||||
output: [ 'stamp-operations-enums.h', ],
|
output: [ 'stamp-operations-enums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'operations-',
|
'operations-',
|
||||||
'#include <gio/gio.h>\n' +
|
'#include <gio/gio.h>\n' +
|
||||||
|
|
|
@ -7,7 +7,7 @@ stamp_paint_enums = custom_target('stamp-paint-enums.h',
|
||||||
output: [ 'stamp-paint-enums.h', ],
|
output: [ 'stamp-paint-enums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'paint-',
|
'paint-',
|
||||||
'#include <gio/gio.h>\n' +
|
'#include <gio/gio.h>\n' +
|
||||||
|
|
|
@ -7,7 +7,7 @@ stamp_plug_in_enums = custom_target('stamp-plug-in-enums.h',
|
||||||
output: [ 'stamp-plug-in-enums.h', ],
|
output: [ 'stamp-plug-in-enums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'plug-in-',
|
'plug-in-',
|
||||||
'#include <gio/gio.h>\n' +
|
'#include <gio/gio.h>\n' +
|
||||||
|
|
|
@ -59,9 +59,9 @@ foreach test_name : app_tests
|
||||||
test(test_name,
|
test(test_name,
|
||||||
test_exe,
|
test_exe,
|
||||||
env: [
|
env: [
|
||||||
'GIMP_TESTING_ABS_TOP_SRCDIR=' + meson.source_root(),
|
'GIMP_TESTING_ABS_TOP_SRCDIR=' + meson.project_source_root(),
|
||||||
'GIMP_TESTING_ABS_TOP_BUILDDIR='+ meson.build_root(),
|
'GIMP_TESTING_ABS_TOP_BUILDDIR='+ meson.project_build_root(),
|
||||||
'GIMP_TESTING_PLUGINDIRS=' + meson.build_root()/'plug-ins'/'common',
|
'GIMP_TESTING_PLUGINDIRS=' + meson.project_build_root()/'plug-ins'/'common',
|
||||||
'GIMP_TESTING_PLUGINDIRS_BASENAME_IGNORES=mkgen.pl',
|
'GIMP_TESTING_PLUGINDIRS_BASENAME_IGNORES=mkgen.pl',
|
||||||
'UI_TEST=yes',
|
'UI_TEST=yes',
|
||||||
],
|
],
|
||||||
|
|
|
@ -7,7 +7,7 @@ stamp_text_enums = custom_target('stamp-text-enums.h',
|
||||||
output: [ 'stamp-text-enums.h', ],
|
output: [ 'stamp-text-enums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'text-',
|
'text-',
|
||||||
'#include <gio/gio.h>\n' +
|
'#include <gio/gio.h>\n' +
|
||||||
|
|
|
@ -7,7 +7,7 @@ stamp_tools_enums = custom_target('stamp-tools-enums.h',
|
||||||
output: [ 'stamp-tools-enums.h', ],
|
output: [ 'stamp-tools-enums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'tools-',
|
'tools-',
|
||||||
'#include <gio/gio.h>\n' +
|
'#include <gio/gio.h>\n' +
|
||||||
|
|
|
@ -7,7 +7,7 @@ stamp_widgets_enums = custom_target('stamp-widgets-enums.h',
|
||||||
output: [ 'stamp-widgets-enums.h', ],
|
output: [ 'stamp-widgets-enums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'widgets-',
|
'widgets-',
|
||||||
'#include <gtk/gtk.h>\n' +
|
'#include <gtk/gtk.h>\n' +
|
||||||
|
|
|
@ -126,6 +126,6 @@ endforeach
|
||||||
test('windows-installer-langs',
|
test('windows-installer-langs',
|
||||||
find_program('test-installer-langs.sh'),
|
find_program('test-installer-langs.sh'),
|
||||||
env: [
|
env: [
|
||||||
'GIMP_TESTING_ABS_TOP_SRCDIR=' + meson.source_root(),
|
'GIMP_TESTING_ABS_TOP_SRCDIR=' + meson.project_source_root(),
|
||||||
],
|
],
|
||||||
suite: 'build')
|
suite: 'build')
|
||||||
|
|
|
@ -69,7 +69,7 @@ if appstreamcli.found()
|
||||||
appstreamcli,
|
appstreamcli,
|
||||||
args: [ 'validate', appdatafile ],
|
args: [ 'validate', appdatafile ],
|
||||||
env: [
|
env: [
|
||||||
'GIMP_TESTING_ABS_TOP_BUILDDIR=' + meson.build_root(),
|
'GIMP_TESTING_ABS_TOP_BUILDDIR=' + meson.project_build_root(),
|
||||||
],
|
],
|
||||||
suite: 'desktop',
|
suite: 'desktop',
|
||||||
)
|
)
|
||||||
|
|
|
@ -36,10 +36,10 @@ foreach lang : [ 'python', 'gjs' ]
|
||||||
command: [
|
command: [
|
||||||
gir_doc_tool,
|
gir_doc_tool,
|
||||||
'-I', prefix / 'share/gir-1.0/',
|
'-I', prefix / 'share/gir-1.0/',
|
||||||
'-I', meson.build_root() / 'libgimp',
|
'-I', meson.project_build_root() / 'libgimp',
|
||||||
'--language=' + lang,
|
'--language=' + lang,
|
||||||
'-o', '@OUTDIR@' + '/pages/' + lang + '/Gimp-' + gimp_api_version,
|
'-o', '@OUTDIR@' + '/pages/' + lang + '/Gimp-' + gimp_api_version,
|
||||||
meson.build_root() / '@INPUT@'
|
meson.project_build_root() / '@INPUT@'
|
||||||
],
|
],
|
||||||
build_by_default: true)
|
build_by_default: true)
|
||||||
|
|
||||||
|
@ -101,10 +101,10 @@ foreach lang : [ 'python', 'gjs' ]
|
||||||
command: [
|
command: [
|
||||||
gir_doc_tool,
|
gir_doc_tool,
|
||||||
'-I', prefix / 'share/gir-1.0/',
|
'-I', prefix / 'share/gir-1.0/',
|
||||||
'-I', meson.build_root() / 'libgimp',
|
'-I', meson.project_build_root() / 'libgimp',
|
||||||
'--language=' + lang,
|
'--language=' + lang,
|
||||||
'-o', '@OUTDIR@' + '/pages/' + lang + '/GimpUi-' + gimp_api_version,
|
'-o', '@OUTDIR@' + '/pages/' + lang + '/GimpUi-' + gimp_api_version,
|
||||||
meson.build_root() / '@INPUT@'
|
meson.project_build_root() / '@INPUT@'
|
||||||
],
|
],
|
||||||
build_by_default: true)
|
build_by_default: true)
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ gimp_ui_docs = custom_target('gimp-ui-docs',
|
||||||
'--output-dir=@OUTPUT@',
|
'--output-dir=@OUTPUT@',
|
||||||
'--no-namespace-dir',
|
'--no-namespace-dir',
|
||||||
'--content-dir=@0@'.format(meson.current_source_dir()),
|
'--content-dir=@0@'.format(meson.current_source_dir()),
|
||||||
'--add-include-path=@0@'.format(meson.build_root() / 'libgimp'),
|
'--add-include-path=@0@'.format(meson.project_build_root() / 'libgimp'),
|
||||||
'@INPUT@',
|
'@INPUT@',
|
||||||
],
|
],
|
||||||
depends: libgimp_gir[0],
|
depends: libgimp_gir[0],
|
||||||
|
|
|
@ -13,7 +13,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plug_in_name + '-c.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plug_in_name + '-c.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plug_in_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plug_in_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -552,7 +552,7 @@ if have_python and not platform_windows and not platform_osx
|
||||||
],
|
],
|
||||||
output: [ 'check-def-files', ],
|
output: [ 'check-def-files', ],
|
||||||
command: [
|
command: [
|
||||||
python, meson.source_root() / 'tools' / 'defcheck.py', meson.source_root(),
|
python, meson.project_source_root() / 'tools' / 'defcheck.py', meson.project_source_root(),
|
||||||
],
|
],
|
||||||
build_by_default: true,
|
build_by_default: true,
|
||||||
)
|
)
|
||||||
|
|
|
@ -17,7 +17,7 @@ stamp_base_enums = custom_target('stamp-gimpbaseenums.h',
|
||||||
output: [ 'stamp-gimpbaseenums.h', ],
|
output: [ 'stamp-gimpbaseenums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'gimpbase',
|
'gimpbase',
|
||||||
'#include <glib-object.h>\n' +
|
'#include <glib-object.h>\n' +
|
||||||
|
@ -39,7 +39,7 @@ stamp_compat_enums = custom_target('stamp-gimpcompatenums.h',
|
||||||
output: [ 'stamp-gimpcompatenums.h', ],
|
output: [ 'stamp-gimpcompatenums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(), meson.current_build_dir(),
|
meson.project_source_root(), meson.current_source_dir(), meson.current_build_dir(),
|
||||||
'gimpcompat',
|
'gimpcompat',
|
||||||
'#include <glib-object.h>\n' +
|
'#include <glib-object.h>\n' +
|
||||||
'#include "gimpbasetypes.h"\n',
|
'#include "gimpbasetypes.h"\n',
|
||||||
|
|
|
@ -8,7 +8,7 @@ stamp_config_enums = custom_target('stamp-gimpconfigenums.h',
|
||||||
output: [ 'stamp-gimpconfigenums.h', ],
|
output: [ 'stamp-gimpconfigenums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'gimpconfig',
|
'gimpconfig',
|
||||||
'#include <gio/gio.h>\n' +
|
'#include <gio/gio.h>\n' +
|
||||||
|
|
|
@ -7,7 +7,7 @@ stamp_widgets_enums = custom_target('stamp-gimpwidgetsenums.h',
|
||||||
output: [ 'stamp-gimpwidgetsenums.h', ],
|
output: [ 'stamp-gimpwidgetsenums.h', ],
|
||||||
command: [
|
command: [
|
||||||
mkenums_wrap, perl,
|
mkenums_wrap, perl,
|
||||||
meson.source_root(), meson.current_source_dir(),
|
meson.project_source_root(), meson.current_source_dir(),
|
||||||
meson.current_build_dir(),
|
meson.current_build_dir(),
|
||||||
'gimpwidgets',
|
'gimpwidgets',
|
||||||
'#include <gio/gio.h>\n' +
|
'#include <gio/gio.h>\n' +
|
||||||
|
|
22
meson.build
22
meson.build
|
@ -385,7 +385,7 @@ if relocatable_bundle
|
||||||
mypaint_brushes_dir = '${gimp_installation_dir}'\
|
mypaint_brushes_dir = '${gimp_installation_dir}'\
|
||||||
/'share'/'mypaint-data'/'1.0'/'brushes'
|
/'share'/'mypaint-data'/'1.0'/'brushes'
|
||||||
else
|
else
|
||||||
mypaint_brushes_dir = mypaint_brushes.get_pkgconfig_variable('brushesdir')
|
mypaint_brushes_dir = mypaint_brushes.get_variable(pkgconfig: 'brushesdir')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
conf.set_quoted('MYPAINT_BRUSHES_DIR', mypaint_brushes_dir)
|
conf.set_quoted('MYPAINT_BRUSHES_DIR', mypaint_brushes_dir)
|
||||||
|
@ -576,7 +576,7 @@ detailed_backtraces = (
|
||||||
################################################################################
|
################################################################################
|
||||||
# Check for x11 support
|
# Check for x11 support
|
||||||
|
|
||||||
x11_target = gtk3.get_pkgconfig_variable('targets').contains('x11')
|
x11_target = gtk3.get_variable(pkgconfig: 'targets').contains('x11')
|
||||||
|
|
||||||
x11 = x11_target ? dependency('x11') : no_dep
|
x11 = x11_target ? dependency('x11') : no_dep
|
||||||
xmu = x11_target ? dependency('xmu') : no_dep
|
xmu = x11_target ? dependency('xmu') : no_dep
|
||||||
|
@ -733,8 +733,8 @@ have_heif = libheif.found()
|
||||||
libheif_warning=''
|
libheif_warning=''
|
||||||
if have_heif
|
if have_heif
|
||||||
have_heif = true
|
have_heif = true
|
||||||
can_import_heic = (libheif.get_pkgconfig_variable('builtin_h265_decoder') == 'yes')
|
can_import_heic = (libheif.get_variable(pkgconfig: 'builtin_h265_decoder') == 'yes')
|
||||||
can_export_heic = (libheif.get_pkgconfig_variable('builtin_h265_encoder') == 'yes')
|
can_export_heic = (libheif.get_variable(pkgconfig: 'builtin_h265_encoder') == 'yes')
|
||||||
if can_import_heic
|
if can_import_heic
|
||||||
MIMEtypes += [
|
MIMEtypes += [
|
||||||
'image/heif',
|
'image/heif',
|
||||||
|
@ -742,8 +742,8 @@ if have_heif
|
||||||
]
|
]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
can_import_avif = (libheif.get_pkgconfig_variable('builtin_avif_decoder') == 'yes')
|
can_import_avif = (libheif.get_variable(pkgconfig: 'builtin_avif_decoder') == 'yes')
|
||||||
can_export_avif = (libheif.get_pkgconfig_variable('builtin_avif_encoder') == 'yes')
|
can_export_avif = (libheif.get_variable(pkgconfig: 'builtin_avif_encoder') == 'yes')
|
||||||
if can_import_avif
|
if can_import_avif
|
||||||
MIMEtypes += [
|
MIMEtypes += [
|
||||||
'image/avif'
|
'image/avif'
|
||||||
|
@ -907,7 +907,7 @@ else
|
||||||
xdg_email_path = 'xdg-email'
|
xdg_email_path = 'xdg-email'
|
||||||
xdg_email = find_program(xdg_email_path, required: false)
|
xdg_email = find_program(xdg_email_path, required: false)
|
||||||
if xdg_email.found()
|
if xdg_email.found()
|
||||||
xdg_email_path = xdg_email.path()
|
xdg_email_path = xdg_email.full_path()
|
||||||
else
|
else
|
||||||
mail_warning = 'Xdg-email not found, but required at runtime for email sending.'
|
mail_warning = 'Xdg-email not found, but required at runtime for email sending.'
|
||||||
warning(mail_warning)
|
warning(mail_warning)
|
||||||
|
@ -923,7 +923,7 @@ endif
|
||||||
|
|
||||||
isocodes = dependency('iso-codes', required: false)
|
isocodes = dependency('iso-codes', required: false)
|
||||||
if isocodes.found()
|
if isocodes.found()
|
||||||
isocodes_prefix = isocodes.get_pkgconfig_variable('prefix')
|
isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix')
|
||||||
isocodes_location = isocodes_prefix / get_option('datadir') / 'xml' / 'iso-codes'
|
isocodes_location = isocodes_prefix / get_option('datadir') / 'xml' / 'iso-codes'
|
||||||
isocodes_localedir= isocodes_prefix / get_option('datadir') / 'locale'
|
isocodes_localedir= isocodes_prefix / get_option('datadir') / 'locale'
|
||||||
endif
|
endif
|
||||||
|
@ -1020,7 +1020,7 @@ endif
|
||||||
|
|
||||||
|
|
||||||
# Check for GTK Mac Integration
|
# Check for GTK Mac Integration
|
||||||
if platform_osx and (gtk3.get_pkgconfig_variable('targets').contains('quartz'))
|
if platform_osx and (gtk3.get_variable(pkgconfig: 'targets').contains('quartz'))
|
||||||
# Support for homebrew version of gtk-mac-integration
|
# Support for homebrew version of gtk-mac-integration
|
||||||
gtk3_macos = dependency('gtk-mac-integration-gtk3', version: '>=3.0.1', required: false)
|
gtk3_macos = dependency('gtk-mac-integration-gtk3', version: '>=3.0.1', required: false)
|
||||||
if not gtk3_macos.found()
|
if not gtk3_macos.found()
|
||||||
|
@ -1637,7 +1637,7 @@ custom_target('Changelog',
|
||||||
output: [ 'Changelog', ],
|
output: [ 'Changelog', ],
|
||||||
command: [
|
command: [
|
||||||
generate_changelog,
|
generate_changelog,
|
||||||
meson.source_root(),
|
meson.project_source_root(),
|
||||||
'@OUTPUT@'
|
'@OUTPUT@'
|
||||||
],
|
],
|
||||||
build_by_default: false,
|
build_by_default: false,
|
||||||
|
@ -1645,7 +1645,7 @@ custom_target('Changelog',
|
||||||
|
|
||||||
meson.add_dist_script('meson_dist_script.sh',
|
meson.add_dist_script('meson_dist_script.sh',
|
||||||
generate_version_h ? gitversion_h.full_path() : gitversion_h,
|
generate_version_h ? gitversion_h.full_path() : gitversion_h,
|
||||||
meson.source_root(), meson.build_root())
|
meson.project_source_root(), meson.project_build_root())
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
|
@ -63,11 +63,11 @@ endforeach
|
||||||
|
|
||||||
|
|
||||||
enum_headers = [
|
enum_headers = [
|
||||||
meson.source_root() + '/libgimpbase/gimpbaseenums.h',
|
meson.project_source_root() + '/libgimpbase/gimpbaseenums.h',
|
||||||
meson.source_root() + '/libgimpconfig/gimpconfigenums.h',
|
meson.project_source_root() + '/libgimpconfig/gimpconfigenums.h',
|
||||||
meson.source_root() + '/app/operations/operations-enums.h',
|
meson.project_source_root() + '/app/operations/operations-enums.h',
|
||||||
meson.source_root() + '/app/core/core-enums.h',
|
meson.project_source_root() + '/app/core/core-enums.h',
|
||||||
meson.source_root() + '/app/paint/paint-enums.h'
|
meson.project_source_root() + '/app/paint/paint-enums.h'
|
||||||
]
|
]
|
||||||
|
|
||||||
# Perl environment
|
# Perl environment
|
||||||
|
@ -79,8 +79,8 @@ perl_env = [
|
||||||
'PDBGEN_GROUPS=' + (pdbgen_groups ? '1' : '0'),
|
'PDBGEN_GROUPS=' + (pdbgen_groups ? '1' : '0'),
|
||||||
'rootme=' + perlbindir,
|
'rootme=' + perlbindir,
|
||||||
'srcdir=' + perlsrcdir,
|
'srcdir=' + perlsrcdir,
|
||||||
'destdir=' + meson.build_root(),
|
'destdir=' + meson.project_build_root(),
|
||||||
'builddir=' + meson.build_root(),
|
'builddir=' + meson.project_build_root(),
|
||||||
]
|
]
|
||||||
perl_opts = [
|
perl_opts = [
|
||||||
perl,
|
perl,
|
||||||
|
@ -183,7 +183,7 @@ else
|
||||||
],
|
],
|
||||||
output: [ 'stamp-pdbgen.h', ],
|
output: [ 'stamp-pdbgen.h', ],
|
||||||
command: [
|
command: [
|
||||||
env, perl_env, pdbgen_run, perl, meson.source_root(), meson.build_root()
|
env, perl_env, pdbgen_run, perl, meson.project_source_root(), meson.project_build_root()
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -189,7 +189,7 @@ foreach plugin : common_plugins_list
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -12,7 +12,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -16,7 +16,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -13,7 +13,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -11,7 +11,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -11,7 +11,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -11,7 +11,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -13,7 +13,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -15,7 +15,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -16,7 +16,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -23,7 +23,7 @@ foreach plugin_name : file_raw_exes
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -11,7 +11,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -13,7 +13,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -15,7 +15,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -13,7 +13,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -13,7 +13,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -29,7 +29,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -31,7 +31,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -12,7 +12,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -14,7 +14,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -15,7 +15,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -12,7 +12,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -75,7 +75,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -19,7 +19,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -18,7 +18,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -19,7 +19,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
@ -57,7 +57,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -43,7 +43,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -19,7 +19,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -28,7 +28,7 @@ endforeach
|
||||||
|
|
||||||
if python.found()
|
if python.found()
|
||||||
python_config = configuration_data()
|
python_config = configuration_data()
|
||||||
python_config.set('PYTHON_PATH', python.path())
|
python_config.set('PYTHON_PATH', python.full_path())
|
||||||
|
|
||||||
configure_file(
|
configure_file(
|
||||||
input : 'pygimp.interp.in',
|
input : 'pygimp.interp.in',
|
||||||
|
|
|
@ -14,7 +14,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -33,7 +33,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -14,7 +14,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(executable_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -18,7 +18,7 @@ if platform_windows
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -16,7 +16,7 @@ plugin_sources += windows.compile_resources(
|
||||||
args: [
|
args: [
|
||||||
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
|
||||||
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
'--define', 'INTERNALNAME_STR="@0@"' .format(plugin_name),
|
||||||
'--define', 'TOP_SRCDIR="@0@"' .format(meson.source_root()),
|
'--define', 'TOP_SRCDIR="@0@"' .format(meson.project_source_root()),
|
||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
rootInclude, appInclude,
|
rootInclude, appInclude,
|
||||||
|
|
|
@ -2,5 +2,5 @@ potips_dir = meson.current_source_dir()
|
||||||
i18n.gettext(gettext_package + '-tips',
|
i18n.gettext(gettext_package + '-tips',
|
||||||
preset: 'glib',
|
preset: 'glib',
|
||||||
install: false,
|
install: false,
|
||||||
data_dirs: meson.source_root() / 'data' / 'tips',
|
data_dirs: meson.project_source_root() / 'data' / 'tips',
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
po_windows_installer_dir = meson.current_source_dir()
|
po_windows_installer_dir = meson.current_source_dir()
|
||||||
i18n.gettext(gettext_package + '-windows-installer', preset: 'glib', install: false,
|
i18n.gettext(gettext_package + '-windows-installer', preset: 'glib', install: false,
|
||||||
data_dirs: meson.source_root() / 'build' / 'windows' / 'installer' / 'lang')
|
data_dirs: meson.project_source_root() / 'build' / 'windows' / 'installer' / 'lang')
|
||||||
|
|
Loading…
Reference in New Issue