data: Fix obscure environ files on Windows
Following 36b660e2b2
- PATH was being set due to the Installer and MSIX but
on my tests on both relocatable and Unix-style builds it
was bogus. C and Py plug-ins worked without problems
- Same aplies to GI_TYPELIB_PATH, it is obscure and useless
This commit is contained in:
parent
36b660e2b2
commit
ff1bd20577
5 changed files with 22 additions and 28 deletions
|
|
@ -1,4 +1,2 @@
|
||||||
# Example entry in files like these
|
# Example entry in files like these
|
||||||
# FOOPATH=/path/to/foo/stuff
|
# FOOPATH=/path/to/foo/stuff
|
||||||
|
|
||||||
@BIN_PATH@
|
|
||||||
|
|
@ -1,33 +1,30 @@
|
||||||
#.env files read by gimp_environ_table_load_env_file in gimpenvirontable.c
|
#.env files read by gimp_environ_table_load_env_file in gimpenvirontable.c
|
||||||
|
|
||||||
|
|
||||||
environ_config = configuration_data()
|
install_data(
|
||||||
if platform_windows and relocatable_bundle
|
'default.env',
|
||||||
environ_config.set('BIN_PATH', 'PATH=${gimp_installation_dir}\\bin')
|
|
||||||
else
|
|
||||||
environ_config.set('BIN_PATH', '')
|
|
||||||
endif
|
|
||||||
|
|
||||||
configure_file(
|
|
||||||
input : 'default.env.in',
|
|
||||||
output: 'default.env',
|
|
||||||
configuration: environ_config,
|
|
||||||
install: true,
|
|
||||||
install_dir: gimpplugindir / 'environ',
|
install_dir: gimpplugindir / 'environ',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
if not meson.is_cross_build() and python.found()
|
if relocatable_bundle or platform_windows and not meson.is_cross_build()
|
||||||
install_data(
|
pygimp_config = configuration_data()
|
||||||
'python.env',
|
if relocatable_bundle
|
||||||
install_dir: gimpplugindir / 'environ',
|
pygimp_config.set('DONTWRITEBYTECODE_SETTING', 'PYTHONDONTWRITEBYTECODE=1')
|
||||||
)
|
else
|
||||||
endif
|
pygimp_config.set('DONTWRITEBYTECODE_SETTING', '')
|
||||||
|
endif
|
||||||
|
if platform_windows
|
||||||
if platform_windows and not meson.is_cross_build() and python.found()
|
pygimp_config.set('HIGHDPI_SETTING', '__COMPAT_LAYER=HIGHDPIAWARE')
|
||||||
install_data(
|
else
|
||||||
'pygimp.env',
|
pygimp_config.set('HIGHDPI_SETTING', '')
|
||||||
|
endif
|
||||||
|
|
||||||
|
configure_file(
|
||||||
|
input : 'pygimp.env.in',
|
||||||
|
output: 'pygimp.env',
|
||||||
|
configuration: pygimp_config,
|
||||||
|
install: true,
|
||||||
install_dir: gimpplugindir / 'environ',
|
install_dir: gimpplugindir / 'environ',
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
__COMPAT_LAYER=HIGHDPIAWARE
|
|
||||||
PYTHONDONTWRITEBYTECODE=1
|
|
||||||
2
data/environ/pygimp.env.in
Normal file
2
data/environ/pygimp.env.in
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
@DONTWRITEBYTECODE_SETTING@
|
||||||
|
@HIGHDPI_SETTING@
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
: GI_TYPELIB_PATH=${gimp_installation_dir}/lib/girepository-1.0/
|
|
||||||
Loading…
Reference in a new issue