Skip to content

Include schema files in Linux standalone #38161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Include schema files in Linux standalone #38161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions buildconfig/CMake/LinuxPackageScripts.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,15 @@ if [ -n \"\$1\" ] && [ \"\$1\" = \"--debug\" ]; then
fi"
)

# Without specifying these schema files, the standalone can fail to launch on Linux. Inside a conda environment this
# environment variable is set by something else.
set(GSETTINGS_SCHEMA_DEFINITIONS
"# Specify path to schema files
if [ -z \"\${GSETTINGS_SCHEMA_DIR}\" ]; then
GSETTINGS_MANTID_PATH=\${INSTALLDIR}/share/glib-2.0/schemas
fi"
)

set(ERROR_CMD "-m mantidqt.dialogs.errorreports.main --exitcode=\$?")

# Local dev version
Expand Down
3 changes: 3 additions & 0 deletions buildconfig/CMake/Packaging/launch_mantidworkbench.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ fi

@GDB_DEFINITIONS@

@GSETTINGS_SCHEMA_DEFINITIONS@

# Launch the workbench
LD_PRELOAD=${LOCAL_PRELOAD} \
PYTHONPATH=${LOCAL_PYTHONPATH} @QT_QPA@ \
GSETTINGS_SCHEMA_DIR=${GSETTINGS_SCHEMA_DIR}:${GSETTINGS_MANTID_PATH} \
@WRAPPER_PREFIX@$VGLRUN $GDB \
@PYTHON_EXEC_LOCAL@@PYTHON_ARGS@ @MANTIDWORKBENCH_EXEC@ $SINGLEPROCESS "$@"@WRAPPER_POSTFIX@
1 change: 1 addition & 0 deletions docs/source/release/v6.11.0/Workbench/Bugfixes/38160.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fixed the standalone not launching on Linux, especially IDAaaS.
2 changes: 2 additions & 0 deletions installers/conda/common/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ function trim_conda() {
mv "$bundle_conda_prefix"/share "$bundle_conda_prefix"/share_tmp
mkdir "$bundle_conda_prefix"/share
mv "$bundle_conda_prefix"/share_tmp/doc "$bundle_conda_prefix"/share/
mkdir -p "$bundle_conda_prefix"/share/glib-2.0/schemas
mv "$bundle_conda_prefix"/share_tmp/glib-2.0/schemas "$bundle_conda_prefix"/share/glib-2.0/
# Heavily cut down translations
mv "$bundle_conda_prefix"/translations "$bundle_conda_prefix"/translations_tmp
mkdir -p "$bundle_conda_prefix"/translations/qtwebengine_locales
Expand Down
Loading