procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 01:43:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

app, app-tools, data, plug-ins, tools: Do not hardcode python executable

Browse source 
Use 'python' module instead.
This commit is contained in:
Bruno Lopes 2025-04-17 14:27:44 -03:00
parent 49065eb635
commit d88966b272
No known key found for this signature in database
6 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app-tools/meson.build
View file

@ -32,9 +32,9 @@ if enable_default_bin
pointing_to: fs.name(gimp_debug_tool.full_path()), pointing_to: fs.name(gimp_debug_tool.full_path()),
install_dir: gimp_debug_tool_dir) install_dir: gimp_debug_tool_dir)
else else
meson.add_install_script('python3', '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))', meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))',
gimp_debug_tool.full_path(), get_option('prefix'), fs.name(gimp_debug_tool.name()).replace(exec_ver, '.exe')) gimp_debug_tool.full_path(), get_option('prefix'), fs.name(gimp_debug_tool.name()).replace(exec_ver, '.exe'))
meson.add_install_script('python3', '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))', meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))',
gimp_debug_tool.full_path(), get_option('prefix'), fs.name(gimp_debug_tool.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string()) gimp_debug_tool.full_path(), get_option('prefix'), fs.name(gimp_debug_tool.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
endif endif
endif endif

8
app/meson.build
View file

@ -240,9 +240,9 @@ if enable_default_bin
pointing_to: fs.name(gimpmain_exe.full_path()), pointing_to: fs.name(gimpmain_exe.full_path()),
install_dir: get_option('bindir')) install_dir: get_option('bindir'))
else else
meson.add_install_script('python3', '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))', meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))',
gimpmain_exe.full_path(), get_option('prefix'), fs.name(gimpmain_exe.name()).replace(exec_ver, '.exe')) gimpmain_exe.full_path(), get_option('prefix'), fs.name(gimpmain_exe.name()).replace(exec_ver, '.exe'))
meson.add_install_script('python3', '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))', meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))',
gimpmain_exe.full_path(), get_option('prefix'), fs.name(gimpmain_exe.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string()) gimpmain_exe.full_path(), get_option('prefix'), fs.name(gimpmain_exe.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
endif endif
if enable_console_bin if enable_console_bin
@ -254,9 +254,9 @@ if enable_default_bin
pointing_to: fs.name(gimpconsole_exe.full_path()), pointing_to: fs.name(gimpconsole_exe.full_path()),
install_dir: get_option('bindir')) install_dir: get_option('bindir'))
else else
meson.add_install_script('python3', '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))', meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))',
gimpconsole_exe.full_path(), get_option('prefix'), fs.name(gimpconsole_exe.name()).replace(exec_ver, '.exe')) gimpconsole_exe.full_path(), get_option('prefix'), fs.name(gimpconsole_exe.name()).replace(exec_ver, '.exe'))
meson.add_install_script('python3', '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))', meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))',
gimpconsole_exe.full_path(), get_option('prefix'), fs.name(gimpconsole_exe.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string()) gimpconsole_exe.full_path(), get_option('prefix'), fs.name(gimpconsole_exe.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
endif endif
endif endif

2
data/meson.build
View file

@ -8,7 +8,7 @@ subdir('tips')
subdir('tool-presets') subdir('tool-presets')
meson.add_install_script('python3', '-c', meson.add_install_script(python, '-c',
'from pathlib import Path; from sys import argv; Path(argv[1]).mkdir(parents=True, exist_ok=True)', get_option('prefix') / gimpdatadir / 'fonts' 'from pathlib import Path; from sys import argv; Path(argv[1]).mkdir(parents=True, exist_ok=True)', get_option('prefix') / gimpdatadir / 'fonts'
) )

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

@ -26,7 +26,7 @@ xml_content += '</gresources>\n'
xml_file = configure_file( xml_file = configure_file(
output: resourcename + '.gresource.xml', output: resourcename + '.gresource.xml',
command: [ 'python3','-c','import sys; sys.stdout.write(sys.argv[1])',xml_content ], command: [ python,'-c','import sys; sys.stdout.write(sys.argv[1])',xml_content ],
capture: true, capture: true,
) )

2
plug-ins/screenshot/meson.build
View file

@ -24,7 +24,7 @@ xml_content += '</gresources>\n'
xml_file = configure_file( xml_file = configure_file(
output: resourcename + '.gresource.xml', output: resourcename + '.gresource.xml',
command: [ 'python3','-c','import sys; sys.stdout.write(sys.argv[1])',xml_content ], command: [ python,'-c','import sys; sys.stdout.write(sys.argv[1])',xml_content ],
capture: true, capture: true,
) )

9
tools/meson.build
View file

@ -61,13 +61,14 @@ if enable_default_bin
pointing_to: fs.name(gimp_test_clipboard.full_path()), pointing_to: fs.name(gimp_test_clipboard.full_path()),
install_dir: get_option('bindir')) install_dir: get_option('bindir'))
else else
meson.add_install_script('python3', '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))', meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))',
gimptool.full_path(), get_option('prefix'), fs.name(gimptool.name()).replace(exec_ver, '.exe')) gimptool.full_path(), get_option('prefix'), fs.name(gimptool.name()).replace(exec_ver, '.exe'))
meson.add_install_script('python3', '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))', meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))',
gimptool.full_path(), get_option('prefix'), fs.name(gimptool.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string()) gimptool.full_path(), get_option('prefix'), fs.name(gimptool.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
meson.add_install_script('python3', '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))',
meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3]))',
gimp_test_clipboard.full_path(), get_option('prefix'), fs.name(gimp_test_clipboard.name()).replace(exec_ver, '.exe')) gimp_test_clipboard.full_path(), get_option('prefix'), fs.name(gimp_test_clipboard.name()).replace(exec_ver, '.exe'))
meson.add_install_script('python3', '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))', meson.add_install_script(python, '-c', 'from shutil import copy2; from pathlib import Path; from sys import argv; copy2(argv[1], str(Path(argv[2]) / "bin" / argv[3].replace("@0@", argv[4])))',
gimp_test_clipboard.full_path(), get_option('prefix'), fs.name(gimp_test_clipboard.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string()) gimp_test_clipboard.full_path(), get_option('prefix'), fs.name(gimp_test_clipboard.name()).replace(exec_ver, '-@0@.exe'), api_version_major.to_string())
endif endif
endif endif