dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Jehan 2022-08-31 01:07:27 +02:00
parent 9ff1358e0b
commit ca230cb770
60 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/config/meson.build
View File

@ -7,7 +7,7 @@ stamp_config_enums = custom_target('stamp-config-enums.h',
output: [ 'stamp-config-enums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'config-',
'#include <gio/gio.h>\n' +

2
app/core/meson.build
View File

@ -7,7 +7,7 @@ stamp_core_enums = custom_target('stamp-core-enums.h',
output: [ 'stamp-core-enums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'core-',
'#include <gio/gio.h>\n' +

10
app/dialogs/meson.build
View File

@ -1,12 +1,12 @@
welcome_dialog_data_h = custom_target('welcome-dialog-data-h',
input : [meson.source_root() / 'tools/generate-welcome-dialog-data.py',
meson.source_root() / 'desktop/org.gimp.GIMP.appdata.xml.in.in'],
input : [meson.project_source_root() / 'tools/generate-welcome-dialog-data.py',
meson.project_source_root() / 'desktop/org.gimp.GIMP.appdata.xml.in.in'],
output : ['welcome-dialog-data.h'],
command : ['python3', '@INPUT0@', gimp_version, '--header'],
capture: true)
welcome_dialog_data_c = custom_target('welcome-dialog-data-c',
input : [meson.source_root() / 'tools/generate-welcome-dialog-data.py',
meson.source_root() / 'desktop/org.gimp.GIMP.appdata.xml.in.in'],
input : [meson.project_source_root() / 'tools/generate-welcome-dialog-data.py',
meson.project_source_root() / 'desktop/org.gimp.GIMP.appdata.xml.in.in'],
output : ['welcome-dialog-data.c'],
command : ['python3', '@INPUT0@', gimp_version],
capture: true)
@ -65,7 +65,7 @@ libappdialogs_sources = [
# Auto-generated sources
libappdialogs_sources += [
custom_target('authors.h',
input : [ 'authors.xsl', meson.source_root() / 'authors.xml' ],
input : [ 'authors.xsl', meson.project_source_root() / 'authors.xml' ],
output: [ 'authors.h' ],
command: [ xsltproc, '-o', '@OUTPUT@', '@INPUT0@', '@INPUT1@' ],
)

2
app/display/meson.build
View File

@ -7,7 +7,7 @@ stamp_display_enums = custom_target('stamp-display-enums.h',
output: [ 'stamp-display-enums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'display-',
'#include <gio/gio.h>\n' +

2
app/gegl/meson.build
View File

@ -7,7 +7,7 @@ stamp_gegl_enums = custom_target('stamp-gimp-gegl-enums.h',
output: [ 'stamp-gimp-gegl-enums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'gimp-gegl-',
'#include <gio/gio.h>\n' +

4
app/meson.build
View File

@ -153,7 +153,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(console_rc_name+'.exe'),
'--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: [
rootInclude, appInclude,
@ -171,7 +171,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(gui_rc_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
app/operations/meson.build
View File

@ -7,7 +7,7 @@ stamp_operations_enums = custom_target('stamp-operations-enums.h',
output: [ 'stamp-operations-enums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'operations-',
'#include <gio/gio.h>\n' +

2
app/paint/meson.build
View File

@ -7,7 +7,7 @@ stamp_paint_enums = custom_target('stamp-paint-enums.h',
output: [ 'stamp-paint-enums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'paint-',
'#include <gio/gio.h>\n' +

2
app/plug-in/meson.build
View File

@ -7,7 +7,7 @@ stamp_plug_in_enums = custom_target('stamp-plug-in-enums.h',
output: [ 'stamp-plug-in-enums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'plug-in-',
'#include <gio/gio.h>\n' +

6
app/tests/meson.build
View File

@ -59,9 +59,9 @@ foreach test_name : app_tests
test(test_name,
test_exe,
env: [
'GIMP_TESTING_ABS_TOP_SRCDIR=' + meson.source_root(),
'GIMP_TESTING_ABS_TOP_BUILDDIR='+ meson.build_root(),
'GIMP_TESTING_PLUGINDIRS=' + meson.build_root()/'plug-ins'/'common',
'GIMP_TESTING_ABS_TOP_SRCDIR=' + meson.project_source_root(),
'GIMP_TESTING_ABS_TOP_BUILDDIR='+ meson.project_build_root(),
'GIMP_TESTING_PLUGINDIRS=' + meson.project_build_root()/'plug-ins'/'common',
'GIMP_TESTING_PLUGINDIRS_BASENAME_IGNORES=mkgen.pl',
'UI_TEST=yes',
],

2
app/text/meson.build
View File

@ -7,7 +7,7 @@ stamp_text_enums = custom_target('stamp-text-enums.h',
output: [ 'stamp-text-enums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'text-',
'#include <gio/gio.h>\n' +

2
app/tools/meson.build
View File

@ -7,7 +7,7 @@ stamp_tools_enums = custom_target('stamp-tools-enums.h',
output: [ 'stamp-tools-enums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'tools-',
'#include <gio/gio.h>\n' +

2
app/widgets/meson.build
View File

@ -7,7 +7,7 @@ stamp_widgets_enums = custom_target('stamp-widgets-enums.h',
output: [ 'stamp-widgets-enums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'widgets-',
'#include <gtk/gtk.h>\n' +

2
build/windows/installer/lang/meson.build
View File

@ -126,6 +126,6 @@ endforeach
test('windows-installer-langs',
find_program('test-installer-langs.sh'),
env: [
'GIMP_TESTING_ABS_TOP_SRCDIR=' + meson.source_root(),
'GIMP_TESTING_ABS_TOP_SRCDIR=' + meson.project_source_root(),
],
suite: 'build')

2
desktop/meson.build
View File

@ -69,7 +69,7 @@ if appstreamcli.found()
appstreamcli,
args: [ 'validate', appdatafile ],
env: [
'GIMP_TESTING_ABS_TOP_BUILDDIR=' + meson.build_root(),
'GIMP_TESTING_ABS_TOP_BUILDDIR=' + meson.project_build_root(),
],
suite: 'desktop',
)

8
devel-docs/g-ir-docs/meson.build
View File

@ -36,10 +36,10 @@ foreach lang : [ 'python', 'gjs' ]
command: [
gir_doc_tool,
'-I', prefix / 'share/gir-1.0/',
'-I', meson.build_root() / 'libgimp',
'-I', meson.project_build_root() / 'libgimp',
'--language=' + lang,
'-o', '@OUTDIR@' + '/pages/' + lang + '/Gimp-' + gimp_api_version,
meson.build_root() / '@INPUT@'
meson.project_build_root() / '@INPUT@'
],
build_by_default: true)
@ -101,10 +101,10 @@ foreach lang : [ 'python', 'gjs' ]
command: [
gir_doc_tool,
'-I', prefix / 'share/gir-1.0/',
'-I', meson.build_root() / 'libgimp',
'-I', meson.project_build_root() / 'libgimp',
'--language=' + lang,
'-o', '@OUTDIR@' + '/pages/' + lang + '/GimpUi-' + gimp_api_version,
meson.build_root() / '@INPUT@'
meson.project_build_root() / '@INPUT@'
],
build_by_default: true)

2
devel-docs/reference/gimp-ui/meson.build
View File

@ -24,7 +24,7 @@ gimp_ui_docs = custom_target('gimp-ui-docs',
'--output-dir=@OUTPUT@',
'--no-namespace-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@',
],
depends: libgimp_gir[0],

2
extensions/goat-exercises/meson.build
View File

@ -13,7 +13,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plug_in_name + '-c.exe'),
'--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: [
rootInclude, appInclude,

2
libgimp/meson.build
View File

@ -552,7 +552,7 @@ if have_python and not platform_windows and not platform_osx
],
output: [ 'check-def-files', ],
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,
)

4
libgimpbase/meson.build
View File

@ -17,7 +17,7 @@ stamp_base_enums = custom_target('stamp-gimpbaseenums.h',
output: [ 'stamp-gimpbaseenums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'gimpbase',
'#include <glib-object.h>\n' +
@ -39,7 +39,7 @@ stamp_compat_enums = custom_target('stamp-gimpcompatenums.h',
output: [ 'stamp-gimpcompatenums.h', ],
command: [
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',
'#include <glib-object.h>\n' +
'#include "gimpbasetypes.h"\n',

2
libgimpconfig/meson.build
View File

@ -8,7 +8,7 @@ stamp_config_enums = custom_target('stamp-gimpconfigenums.h',
output: [ 'stamp-gimpconfigenums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'gimpconfig',
'#include <gio/gio.h>\n' +

2
libgimpwidgets/meson.build
View File

@ -7,7 +7,7 @@ stamp_widgets_enums = custom_target('stamp-gimpwidgetsenums.h',
output: [ 'stamp-gimpwidgetsenums.h', ],
command: [
mkenums_wrap, perl,
meson.source_root(), meson.current_source_dir(),
meson.project_source_root(), meson.current_source_dir(),
meson.current_build_dir(),
'gimpwidgets',
'#include <gio/gio.h>\n' +

22
meson.build
View File

@ -385,7 +385,7 @@ if relocatable_bundle
mypaint_brushes_dir = '${gimp_installation_dir}'\
/'share'/'mypaint-data'/'1.0'/'brushes'
else
mypaint_brushes_dir = mypaint_brushes.get_pkgconfig_variable('brushesdir')
mypaint_brushes_dir = mypaint_brushes.get_variable(pkgconfig: 'brushesdir')
endif
conf.set_quoted('MYPAINT_BRUSHES_DIR', mypaint_brushes_dir)
@ -576,7 +576,7 @@ detailed_backtraces = (
################################################################################
# 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
xmu = x11_target ? dependency('xmu') : no_dep
@ -733,8 +733,8 @@ have_heif = libheif.found()
libheif_warning=''
if have_heif
have_heif = true
can_import_heic = (libheif.get_pkgconfig_variable('builtin_h265_decoder') == 'yes')
can_export_heic = (libheif.get_pkgconfig_variable('builtin_h265_encoder') == 'yes')
can_import_heic = (libheif.get_variable(pkgconfig: 'builtin_h265_decoder') == 'yes')
can_export_heic = (libheif.get_variable(pkgconfig: 'builtin_h265_encoder') == 'yes')
if can_import_heic
MIMEtypes += [
'image/heif',
@ -742,8 +742,8 @@ if have_heif
]
endif
can_import_avif = (libheif.get_pkgconfig_variable('builtin_avif_decoder') == 'yes')
can_export_avif = (libheif.get_pkgconfig_variable('builtin_avif_encoder') == 'yes')
can_import_avif = (libheif.get_variable(pkgconfig: 'builtin_avif_decoder') == 'yes')
can_export_avif = (libheif.get_variable(pkgconfig: 'builtin_avif_encoder') == 'yes')
if can_import_avif
MIMEtypes += [
'image/avif'
@ -907,7 +907,7 @@ else
xdg_email_path = 'xdg-email'
xdg_email = find_program(xdg_email_path, required: false)
if xdg_email.found()
xdg_email_path = xdg_email.path()
xdg_email_path = xdg_email.full_path()
else
mail_warning = 'Xdg-email not found, but required at runtime for email sending.'
warning(mail_warning)
@ -923,7 +923,7 @@ endif
isocodes = dependency('iso-codes', required: false)
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_localedir= isocodes_prefix / get_option('datadir') / 'locale'
endif
@ -1020,7 +1020,7 @@ endif
# 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
gtk3_macos = dependency('gtk-mac-integration-gtk3', version: '>=3.0.1', required: false)
if not gtk3_macos.found()
@ -1637,7 +1637,7 @@ custom_target('Changelog',
output: [ 'Changelog', ],
command: [
generate_changelog,
meson.source_root(),
meson.project_source_root(),
'@OUTPUT@'
],
build_by_default: false,
@ -1645,7 +1645,7 @@ custom_target('Changelog',
meson.add_dist_script('meson_dist_script.sh',
generate_version_h ? gitversion_h.full_path() : gitversion_h,
meson.source_root(), meson.build_root())
meson.project_source_root(), meson.project_build_root())
################################################################################

16
pdb/meson.build
View File

@ -63,11 +63,11 @@ endforeach
enum_headers = [
meson.source_root() + '/libgimpbase/gimpbaseenums.h',
meson.source_root() + '/libgimpconfig/gimpconfigenums.h',
meson.source_root() + '/app/operations/operations-enums.h',
meson.source_root() + '/app/core/core-enums.h',
meson.source_root() + '/app/paint/paint-enums.h'
meson.project_source_root() + '/libgimpbase/gimpbaseenums.h',
meson.project_source_root() + '/libgimpconfig/gimpconfigenums.h',
meson.project_source_root() + '/app/operations/operations-enums.h',
meson.project_source_root() + '/app/core/core-enums.h',
meson.project_source_root() + '/app/paint/paint-enums.h'
]
# Perl environment
@ -79,8 +79,8 @@ perl_env = [
'PDBGEN_GROUPS=' + (pdbgen_groups ? '1' : '0'),
'rootme=' + perlbindir,
'srcdir=' + perlsrcdir,
'destdir=' + meson.build_root(),
'builddir=' + meson.build_root(),
'destdir=' + meson.project_build_root(),
'builddir=' + meson.project_build_root(),
]
perl_opts = [
perl,
@ -183,7 +183,7 @@ else
],
output: [ 'stamp-pdbgen.h', ],
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()
],
)

2
plug-ins/common/meson.build
View File

@ -189,7 +189,7 @@ foreach plugin : common_plugins_list
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-bmp/meson.build
View File

@ -12,7 +12,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-dds/meson.build
View File

@ -16,7 +16,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-exr/meson.build
View File

@ -13,7 +13,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-faxg3/meson.build
View File

@ -11,7 +11,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-fits/meson.build
View File

@ -11,7 +11,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-fli/meson.build
View File

@ -11,7 +11,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-ico/meson.build
View File

@ -13,7 +13,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-jpeg/meson.build
View File

@ -15,7 +15,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-psd/meson.build
View File

@ -16,7 +16,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-raw/meson.build
View File

@ -23,7 +23,7 @@ foreach plugin_name : file_raw_exes
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-sgi/meson.build
View File

@ -11,7 +11,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-tiff/meson.build
View File

@ -13,7 +13,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/file-webp/meson.build
View File

@ -15,7 +15,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/flame/meson.build
View File

@ -13,7 +13,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/fractal-explorer/meson.build
View File

@ -13,7 +13,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/gfig/meson.build
View File

@ -29,7 +29,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/gimpressionist/meson.build
View File

@ -31,7 +31,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/gradient-flare/meson.build
View File

@ -12,7 +12,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/help-browser/meson.build
View File

@ -14,7 +14,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/help/meson.build
View File

@ -15,7 +15,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/ifs-compose/meson.build
View File

@ -12,7 +12,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/imagemap/meson.build
View File

@ -75,7 +75,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/lighting/meson.build
View File

@ -19,7 +19,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/map-object/meson.build
View File

@ -18,7 +18,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

4
plug-ins/metadata/meson.build
View File

@ -19,7 +19,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,
@ -57,7 +57,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/pagecurl/meson.build
View File

@ -43,7 +43,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/print/meson.build
View File

@ -19,7 +19,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/python/meson.build
View File

@ -28,7 +28,7 @@ endforeach
if python.found()
python_config = configuration_data()
python_config.set('PYTHON_PATH', python.path())
python_config.set('PYTHON_PATH', python.full_path())
configure_file(
input : 'pygimp.interp.in',

2
plug-ins/script-fu/interpreter/meson.build
View File

@ -14,7 +14,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/script-fu/meson.build
View File

@ -33,7 +33,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/script-fu/server/meson.build
View File

@ -14,7 +14,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(executable_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/selection-to-path/meson.build
View File

@ -18,7 +18,7 @@ if platform_windows
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
plug-ins/twain/meson.build
View File

@ -16,7 +16,7 @@ plugin_sources += windows.compile_resources(
args: [
'--define', 'ORIGINALFILENAME_STR="@0@"'.format(plugin_name+'.exe'),
'--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: [
rootInclude, appInclude,

2
po-tips/meson.build
View File

@ -2,5 +2,5 @@ potips_dir = meson.current_source_dir()
i18n.gettext(gettext_package + '-tips',
preset: 'glib',
install: false,
data_dirs: meson.source_root() / 'data' / 'tips',
data_dirs: meson.project_source_root() / 'data' / 'tips',
)

2
po-windows-installer/meson.build
View File

@ -1,3 +1,3 @@
po_windows_installer_dir = meson.current_source_dir()
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')