From c7c7cf636b07f8467f9028bf1e22ac9b87c1c7a7 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 12 Feb 2016 21:46:51 +0100 Subject: [PATCH] Remove LGPLv2 as a license option in configure Instead show LGPLv3 and GPLv2 as valid options for the open source edition. Change-Id: Id7a203226428031ec873cbaf106dca14a854f155 Reviewed-by: Thiago Macieira Reviewed-by: Oswald Buddenhagen --- configure | 26 +++++++++++++------------- tools/configure/configureapp.cpp | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/configure b/configure index 121031e6fa..4199557002 100755 --- a/configure +++ b/configure @@ -3087,7 +3087,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then exit 1 fi elif [ $COMMERCIAL_USER = "no" ]; then - # Open Source edition - may only be used under the terms of the LGPLv3 or LGPLv21. + # Open Source edition - may only be used under the terms of the LGPLv3 or GPLv2. Licensee="Open Source" Edition="OpenSource" EditionString="Open Source" @@ -3103,15 +3103,15 @@ if [ "$Edition" = "OpenSource" ]; then while true; do if [ "$CFG_ANDROID_STYLE_ASSETS" = "no" ] || [ "$XPLATFORM_ANDROID" = "no" ]; then echo "You are licensed to use this software under the terms of" - echo "the Lesser GNU General Public License (LGPL) versions 2.1." - echo "You are also licensed to use this software under the terms of" echo "the GNU Lesser General Public License (LGPL) versions 3." + echo "You are also licensed to use this software under the terms of" + echo "the GNU General Public License (GPL) versions 2." affix="either" - showLGPL2="yes" + showGPL2="yes" else echo "You are licensed to use this software under the terms of" echo "the GNU Lesser General Public License (LGPL) versions 3." - showLGPL2="no" + showGPL2="no" affix="the" fi @@ -3120,11 +3120,11 @@ if [ "$Edition" = "OpenSource" ]; then echo "You have already accepted the terms of the $EditionString license." acceptance=yes else - if [ -f "$relpath/LICENSE.LGPLv3" ]; then - echo "Type '3' to view the GNU Lesser General Public License version 3." + if [ -f "$relpath/LICENSE.LGPL3" ]; then + echo "Type 'L' to view the GNU Lesser General Public License version 3." fi - if [ "$showLGPL2" = "yes" ]; then - echo "Type 'L' to view the Lesser GNU General Public License version 2.1." + if [ "$showGPL2" = "yes" ]; then + echo "Type 'G' to view the GNU General Public License version 2." fi echo "Type 'yes' to accept this license offer." echo "Type 'no' to decline this license offer." @@ -3139,10 +3139,10 @@ if [ "$Edition" = "OpenSource" ]; then echo "You are not licensed to use this software." echo exit 1 - elif [ "$acceptance" = "3" ]; then - more "$relpath/LICENSE.LGPLv3" - elif [ "$acceptance" = "L" ] && [ "$showLGPL2" = "yes" ]; then - more "$relpath/LICENSE.LGPLv21" + elif [ "$acceptance" = "L" ]; then + more "$relpath/LICENSE.LGPL3" + elif [ "$acceptance" = "G" ] && [ "$showGPL2" = "yes" ]; then + more "$relpath/LICENSE.GPL2" fi done elif [ "$Edition" = "Preview" ]; then diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 871251df2e..d43f700caa 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -4539,18 +4539,18 @@ bool Configure::showLicense(QString orgLicenseFile) return true; } - bool showLgpl2 = true; + bool showGpl2 = true; QString licenseFile = orgLicenseFile; QString theLicense; if (dictionary["EDITION"] == "OpenSource") { if (platform() != WINDOWS_RT && platform() != WINDOWS_CE && (platform() != ANDROID || dictionary["ANDROID_STYLE_ASSETS"] == "no")) { - theLicense = "GNU Lesser General Public License (LGPL) version 2.1" - "\nor the GNU Lesser General Public License (LGPL) version 3"; + theLicense = "GNU Lesser General Public License (LGPL) version 3\n" + "or the GNU General Public License (GPL) version 2"; } else { theLicense = "GNU Lesser General Public License (LGPL) version 3"; - showLgpl2 = false; + showGpl2 = false; } } else { // the first line of the license file tells us which license it is @@ -4568,9 +4568,9 @@ bool Configure::showLicense(QString orgLicenseFile) << "the " << theLicense << "." << endl << endl; if (dictionary["EDITION"] == "OpenSource") { - cout << "Type '3' to view the Lesser GNU General Public License version 3 (LGPLv3)." << endl; - if (showLgpl2) - cout << "Type 'L' to view the Lesser GNU General Public License version 2.1 (LGPLv2.1)." << endl; + cout << "Type 'L' to view the GNU Lesser General Public License version 3 (LGPLv3)." << endl; + if (showGpl2) + cout << "Type 'G' to view the GNU General Public License version 2 (GPLv2)." << endl; } else { cout << "Type '?' to view the " << theLicense << "." << endl; } @@ -4587,10 +4587,10 @@ bool Configure::showLicense(QString orgLicenseFile) return false; } else { if (dictionary["EDITION"] == "OpenSource") { - if (accept == '3') - licenseFile = orgLicenseFile + "/LICENSE.LGPLv3"; + if (accept == 'L') + licenseFile = orgLicenseFile + "/LICENSE.LGPL3"; else - licenseFile = orgLicenseFile + "/LICENSE.LGPLv21"; + licenseFile = orgLicenseFile + "/LICENSE.GPL2"; } // Get console line height, to fill the screen properly int i = 0, screenHeight = 25; // default @@ -4625,7 +4625,7 @@ void Configure::readLicense() dictionary["LICENSE FILE"] = sourcePath; bool openSource = false; - bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPLv3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPLv21"); + bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL2"); if (dictionary["BUILDTYPE"] == "commercial") { openSource = false; } else if (dictionary["BUILDTYPE"] == "opensource") {