Unverified Commit 9b1cd6ed authored by Daniel Mensinger's avatar Daniel Mensinger

Merge branch '5.4'

parents 6d5605cb 95bd2f2c
......@@ -391,6 +391,11 @@ make
cd /kdevelop.appdir
cp -v /appimage-exec-wrapper/exec.so exec_wrapper.so
# Disabled plugins (yet build and bundled, as more complicated to remove from build):
# * KDevWelcomePage - issues with Qt failing to load SSL during news feed fetching
# thus causing KDevelop to hang while creating network connections
# * KDevManPage - man:/ kio-slave & deps not bundled yet
cat > AppRun << EOF
#!/bin/bash
......@@ -423,7 +428,7 @@ export APPIMAGE_STARTUP_PATH=\$PATH
export APPIMAGE_STARTUP_PYTHONHOME=\$PYTHONHOME
export KDEV_CLANG_BUILTIN_DIR=\$DIR/opt/llvm/lib/clang/8.0.0/include
export KDEV_DISABLE_PLUGINS=KDevWelcomePage
export KDEV_DISABLE_PLUGINS="KDevWelcomePage;KDevManPage"
cd \$HOME
......
# Find the meson executable
#
# Defines the following variables
# Meson_EXECUTABLE - path of the meson executable
# Meson_VERSION - version of the found meson executable
#=============================================================================
# Copyright 2019 Daniel Mensinger <daniel@mensinger-ka.de>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
find_program(Meson_EXECUTABLE NAMES meson meson.py)
set(Meson_VERSION "")
if(Meson_EXECUTABLE)
execute_process(
COMMAND ${Meson_EXECUTABLE} --version
TIMEOUT 5
OUTPUT_VARIABLE Meson_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Meson REQUIRED_VARS Meson_EXECUTABLE VERSION_VAR Meson_VERSION)
mark_as_advanced(Meson_EXECUTABLE)
mark_as_advanced(Meson_VERSION)
add_definitions(-DTRANSLATION_DOMAIN=\"kdevmesonmanager\")
find_package(Meson 0.51 QUIET)
set_package_properties(Meson PROPERTIES
DESCRIPTION "The Meson build system"
URL "https://mesonbuild.com"
PURPOSE "Recommended: required by the Meson project manager plugin"
TYPE RUNTIME
)
set(mesonbuilder_SRCS
mesonbuilder.cpp
mesonconfig.cpp
......
......@@ -235,7 +235,7 @@ QString MesonIntrospectJob::import(BuildDir buildDir)
auto testsJSON = rawData[QStringLiteral("tests")];
if (testsJSON.isArray()) {
m_res_tests = std::make_shared<MesonTestSuites>(testsJSON.toArray(), m_project);
if (m_res_options) {
if (m_res_tests) {
qCDebug(KDEV_Meson) << "MINTRO: Imported " << m_res_tests->testSuites().size() << " test suites";
} else {
qCWarning(KDEV_Meson) << "MINTRO: Failed to parse tests";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment