Skip to content

Commit

Permalink
Re-license project to MIT and remove the commercial offering
Browse files Browse the repository at this point in the history
  • Loading branch information
Allen Winter committed Sep 9, 2022
1 parent beee6ca commit 085d1ba
Show file tree
Hide file tree
Showing 242 changed files with 1,117 additions and 4,992 deletions.
3 changes: 1 addition & 2 deletions .krazy
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
CHECKSETS qt5,c++,foss

#KDAB-specific checks
EXTRA kdabcopyright-reuse,kdabcontactus,fosslicense-reuse
EXCLUDE copyright,license
EXTRA kdabcopyright-reuse,fosslicense-reuse

#additional checks
EXTRA defines,null
Expand Down
4 changes: 4 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,7 @@ repos:
exclude: (.py.cmake|Doxyfile.cmake)
- id: cmake-format
exclude: (.py.cmake|Doxyfile.cmake)
- repo: https://github.com/fsfe/reuse-tool
rev: v1.0.0
hooks:
- id: reuse
57 changes: 46 additions & 11 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,59 @@ Upstream-Name: KDSoap
Upstream-Contact: <[email protected]>
Source: https://www.github.com/KDAB/KDSoap

Files: unittests/*/*.xsd unittests/*/*.XSD unittests/*/*.xml unittests/*/*.wsdl testtools/*.qrc examples/*/*.qrc examples/*/*.wsdl *.html *.css docs/manual/*.pdf
#misc source code
Files: unittests/*/*.xsd unittests/*/*.wsdl unittests/*/*.XSD unittests/*/*.xml testtools/*.qrc examples/*/*.qrc examples/*/*.wsdl *.html *.css docs/manual/*.pdf *.bat *.pem
Copyright: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: LGPL-2.1-only OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDAB-KDSoap OR LicenseRef-KDAB-KDSoap-US
License: MIT

#artwork
Files: images/*.png docs/api/*.png docs/*.png docs/*.odg examples/*/*.mng
Files: images/*.png docs/api/*.png docs/*.png docs/*.odg examples/*/*.mng examples/*/*.gif
Copyright: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: LGPL-2.1-only OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDAB-KDSoap OR LicenseRef-KDAB-KDSoap-US
License: MIT

#misc documentation
Files: *md *.txt *.html docs/manual/*.pdf
Copyright: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: MIT

#misc config files
Files: .pre-commit-config.yaml .codespellrc .krazy .cmake-format.py .clang-format .clang-tidy .clazy .codedocs .gitignore .gitmodules .mdlrc .mdlrc.rb .pep8 .pylintrc appveyor.yml docs/api/Doxyfile.cmake distro/*
Copyright: 2010-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: BSD-3-Clause

Files: kdwsdl2cpp/schemas/soapenc-1.1.xsd
Copyright: 2001 DevelopMentor and 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.
License: W3C

Files: kdwsdl2cpp/schemas/soapenc-1.2.xsd
Copyright: 2003 W3C(R) (MIT, ERCIM, Keio), All Rights Reserved.
License: W3C

Files: kdwsdl2cpp/schemas/schemas.qrc
Copyright: 2005 Tobias Koenig <[email protected]>
License: MIT

#3rdparty
Files: cmake/ECM/modules/*
Copyright:
Copyright: The KDE Project
License: BSD-3-Clause

Files:kdwsdl2cpp/wsdl/*
Copyright: 2005 Tobias Koenig <[email protected]>
License: LGPL-2.0-or-later
Files: unittests/groupwise_wsdl/*.xsd unittests/groupwise_wsdl/*.wsdl
Copyright: 2005-2006 Novell, Inc All Rights reserved.
License: GPL-2.0-only OR LicenseRef-Novell

Files: unittests/salesforce_wsdl/*.wsdl
Copyright: 1999-2010 salesforce.com, inc. All Rights reserved.
License: BSD-3-Clause

Files: unittests/soap_over_udp/*.wsdl unittests/soap_over_udp/docs.oasis-open.org/ws-dd/discovery/1.1/os/wsdd-discovery-1.1-schema-os.xsd unittests/soap_over_udp/www.w3.org/2006/03/addressing/ws-addr.xsd
Copyright: 2009 OASIS(r) All Rights reserved.
License: LicenseRef-OASIS

Files: unittests/webcalls_wsdl/*.wsdl
Copyright: 2003-2004 The Sporting Exchange Limited. All rights reserved.
License: LicenseRef-SportingExchange

Files:kdwsdl2cpp/src/*
Copyright: 2005-2006 Tobias Koenig <[email protected]>, 2010 David Faure <[email protected]>
License: LGPL-2.0-or-later
Files: unittests/ws_discovery_wsdl/schemas.xmlsoap.org/ws/2005/04/discovery/ws-discovery.xsd unittests/ws_discovery_wsdl/schemas.xmlsoap.org/ws/2004/08/addressing unittests/ws_discovery_wsdl/*.wsdl
Copyright: pyright © 2002-2004 BEA Systems Inc., International Business Machines Corporation, Microsoft Corporation, Inc, SAP AG, and Sun Microsystems, Inc.. All rights reserved.
License: LicenseRef-Microsoft
21 changes: 8 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
## This file is part of the KD Soap library.
##
## SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
##
## SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDAB-KDSoap OR LicenseRef-KDAB-KDSoap-US
##
## Licensees holding valid commercial KD Soap licenses may use this file in
## accordance with the KD Soap Commercial License Agreement provided with
## the Software.
##
## Contact [email protected] if any conditions of this licensing are not clear to you.
##
#
# This file is part of the KD Soap project..
#
# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#

# This is the top-level CMakeLists.txt file for the KDSoap project.
#
Expand Down Expand Up @@ -211,7 +206,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")

install(FILES README.md README-commercial.txt DESTINATION ${INSTALL_DOC_DIR})
install(FILES README.md DESTINATION ${INSTALL_DOC_DIR})
if(NOT ${PROJECT_NAME}_QT6)
install(FILES kdsoap.pri kdwsdl2cpp.pri DESTINATION ${INSTALL_DOC_DIR})
endif()
Expand Down
2 changes: 0 additions & 2 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
People who have signed the CLA:

Casper Meijn <[email protected]>
Matt Broadstone <[email protected]>
Raphaël Cotty <[email protected]>
Expand Down
9 changes: 2 additions & 7 deletions FindKDSoap.cmake
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
#
# This module finds if KDSoap is installed.
#
# KDSoap_FOUND - Set to TRUE if KDSoap was found.
# KDSoap_LIBRARIES - Path to KDSoap libraries.
# KDSoap_INCLUDE_DIR - Path to the KDSoap include directory.
# KDSoap_CODEGENERATOR - Path to the KDSoap code generator.
# This file is part of the KD Soap project..
#
# SPDX-FileCopyrightText: 2011-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: MIT
#

include(FindPackageHandleStandardArgs)
Expand Down
19 changes: 7 additions & 12 deletions KDSoapConfig-buildtree.cmake.in
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
## This file is part of the KD Soap library.
##
## SPDX-FileCopyrightText: 2013-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
##
## SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDAB-KDSoap OR LicenseRef-KDAB-KDSoap-US
##
## Licensees holding valid commercial KD Soap licenses may use this file in
## accordance with the KD Soap Commercial License Agreement provided with
## the Software.
##
## Contact [email protected] if any conditions of this licensing are not clear to you.
##
#
# This file is part of the KD Soap project..
#
# SPDX-FileCopyrightText: 2013-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#


set(KDSoap_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR@")
Expand Down
20 changes: 7 additions & 13 deletions KDSoapConfig.cmake.in
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
## This file is part of the KD Soap library.
##
## SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
##
## SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDAB-KDSoap OR LicenseRef-KDAB-KDSoap-US
##
## Licensees holding valid commercial KD Soap licenses may use this file in
## accordance with the KD Soap Commercial License Agreement provided with
## the Software.
##
## Contact [email protected] if any conditions of this licensing are not clear to you.
##

#
# This file is part of the KD Soap project..
#
# SPDX-FileCopyrightText: 2012-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#

@PACKAGE_INIT@

Expand Down
5 changes: 4 additions & 1 deletion KDSoapMacros.cmake.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# SPDX-License-Identifier: BSD-3-Clause
# This file is part of the KD Soap project..
#
# SPDX-FileCopyrightText: 2011-2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: MIT
#

macro(KDSOAP_GENERATE_WSDL _sources)
set(KDWSDL2CPP kdwsdl2cpp)
Expand Down
17 changes: 9 additions & 8 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
License
=======
The KD Soap Software is Copyright 2010-2022 Klarälvdalens Datakonsult AB (KDAB),
and is available under the terms of:
and is available under the terms of the MIT license.

* LGPL-2.1 or LGPL-3.0
(except libkdsoap-server, which has a modified AGPL3 license)
* GPL-2.0 or GPL-3.0
(except libkdsoap-server, which has a modified AGPL3 license)
* the KDAB commercial license, provided that you buy a license.
please contact [email protected] if you are interested in buying commercial licenses.
Note that this project requires the 3rd party 'libkode' submodule
that is licensed separately with LGPL-2.0-or-later; however, libkode
is used for code-generation only and the resulting code can be made
available under any license.

See the licenses in the LICENSES folder.
Various other freely distributable files are contained in the unittests
and are not used in the library code itself.

See the full license texts in the LICENSES folder.
Loading

0 comments on commit 085d1ba

Please sign in to comment.