[neon/neon/debug-installer/Neon/release] /: explicitly license build code as BSD3clause
Harald Sitter
null at kde.org
Fri Nov 20 10:47:56 GMT 2020
Git commit d5ae64c680f1744e35482424fe9561362c5279ed by Harald Sitter.
Committed on 20/11/2020 at 10:45.
Pushed by sitter into branch 'Neon/release'.
explicitly license build code as BSD3clause
M +13 -1 CMakeLists.txt
A +26 -0 LICENSES/BSD-3-Clause.txt
M +3 -0 Messages.sh
M +3 -0 Vagrantfile
M +3 -0 integrationtests/CMakeLists.txt
M +24 -8 src/CMakeLists.txt
https://invent.kde.org/neon/neon/debug-installer/commit/d5ae64c680f1744e35482424fe9561362c5279ed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 331e8f5..5388e85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-FileCopyrightText: 2017 Harald Sitter <sitter at kde.org>
+
project(pk-drkonqi-debug-installer)
cmake_minimum_required(VERSION 2.8.12)
@@ -5,17 +8,26 @@ cmake_minimum_required(VERSION 2.8.12)
find_package(ECM 0.0.14 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDECompilerSettings)
set(REQUIRED_QT_VERSION 5.7)
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Test)
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus Test Quick)
find_package(KF5CoreAddons 5.0.0 REQUIRED)
find_package(KF5I18n 5.0.0 REQUIRED)
find_package(PackageKitQt5 REQUIRED)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00)
+
# Either use integration or autotesting. Do not use both as
# that screws up results and prolongs build time in vagrant.
if ($ENV{INTEGRATION_TESTING})
diff --git a/LICENSES/BSD-3-Clause.txt b/LICENSES/BSD-3-Clause.txt
new file mode 100644
index 0000000..0741db7
--- /dev/null
+++ b/LICENSES/BSD-3-Clause.txt
@@ -0,0 +1,26 @@
+Copyright (c) <year> <owner>. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+may be used to endorse or promote products derived from this software without
+specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Messages.sh b/Messages.sh
index 349be64..314c1ba 100644
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,4 +1,7 @@
#!/usr/bin/env bash
+# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-FileCopyrightText: 2017 Harald Sitter <sitter at kde.org>
+
$EXTRACTRC `find . -name \*.rc` >> rc.cpp
$XGETTEXT `find . -name '*.cpp'` -o $podir/pk-drkonqi-debug-installer.pot
rm -f *.cpp
diff --git a/Vagrantfile b/Vagrantfile
index 19003d4..d703747 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-FileCopyrightText: 2017 Harald Sitter <sitter at kde.org>
+
Vagrant.configure(2) do |config|
config.vm.box = "ubuntu/xenial64"
diff --git a/integrationtests/CMakeLists.txt b/integrationtests/CMakeLists.txt
index cbd0f94..5369849 100644
--- a/integrationtests/CMakeLists.txt
+++ b/integrationtests/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-FileCopyrightText: 2017 Harald Sitter <sitter at kde.org>
+
if(POLICY CMP0028)
cmake_policy(SET CMP0028 OLD)
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5a3f483..9ab6d3e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-FileCopyrightText: 2017 Harald Sitter <sitter at kde.org>
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/Version.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
@@ -7,15 +10,25 @@ set(installdbgsymbols_SRCS
Installer.cpp
)
-add_executable(drkonqi-pk-debug-installer ${installdbgsymbols_SRCS} main.cpp)
+add_executable(qmlinstaller ${installdbgsymbols_SRCS} main.new.cpp qml.qrc)
+
+# add_executable(drkonqi-pk-debug-installer ${installdbgsymbols_SRCS} main.cpp)
add_library(testlib STATIC ${installdbgsymbols_SRCS})
-target_link_libraries(drkonqi-pk-debug-installer
- Qt5::DBus
- Qt5::Widgets
- KF5::CoreAddons
- KF5::I18n
- PK::packagekitqt5)
+# target_link_libraries(drkonqi-pk-debug-installer
+# Qt5::DBus
+# Qt5::Widgets
+# KF5::CoreAddons
+# KF5::I18n
+# PK::packagekitqt5)
+target_link_libraries(qmlinstaller
+ PRIVATE
+ Qt5::DBus
+ Qt5::Widgets
+ Qt5::Quick
+ KF5::CoreAddons
+ KF5::I18n
+ PK::packagekitqt5)
target_link_libraries(testlib
Qt5::DBus
Qt5::Widgets
@@ -23,4 +36,7 @@ target_link_libraries(testlib
KF5::I18n
PK::packagekitqt5)
-install(TARGETS drkonqi-pk-debug-installer ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ target_compile_definitions(qmlinstaller
+ PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
+
+# install(TARGETS drkonqi-pk-debug-installer ${INSTALL_TARGETS_DEFAULT_ARGS} )
More information about the Neon-commits
mailing list