From c8b6869f556530ff2f92d2df8f7bab160d1ef40d Mon Sep 17 00:00:00 2001 From: Michael Pyne Date: Mon, 3 Oct 2016 22:04:31 -0400 Subject: [PATCH] setup: Migrate Qt 4 references to Qt 5. BUG:368070 FIXED-IN:16.10 --- kdesrc-build-setup | 165 +++++++++++++-------------------------------- 1 file changed, 46 insertions(+), 119 deletions(-) diff --git a/kdesrc-build-setup b/kdesrc-build-setup index 8a83741..925de51 100755 --- a/kdesrc-build-setup +++ b/kdesrc-build-setup @@ -20,10 +20,12 @@ # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA use strict; -use 5.014; +use 5.018; use IO::Pipe; use File::Copy; use File::Temp qw/tempfile/; +use File::Basename; +use Cwd qw(abs_path); our $VERSION = 0.03; # Not user-visible yet. @@ -210,10 +212,11 @@ installed to its final location, the "install directory". This program will only configure the install location, but all directories are configurable. -The space requirements vary, but typically the build -directory will require 3-5 times as much space as the -corresponding source directory. The space required of -installed software will be less than the build directory. +The space requirements vary with the amount of software you choose +to build, and whether you keep the build directories to speed up +later builds. You will probably need at least 20 GiB in total free +space unless you take steps to customize your install to use fewer +modules. EOF } @@ -233,35 +236,34 @@ if ($proxy || getYesNoAnswer($proxyPrompt)) { my $installDir = getMenuOption('Where do you want to install the software?', [ - home => "$ENV{HOME}/kde4 (default)", + home => "$ENV{HOME}/kde-latest (default)", custom => "Custom location, chosen next screen", ]); if ($installDir eq 'custom') { - $installDir = getDirectory('/usr/local/kde4'); + $installDir = getDirectory('/usr/local/kde-latest'); } else { - $installDir = "~/kde4"; + $installDir = "~/kde-latest"; } my @chosenModules = getListOptions( "Which major module groups do you want to build?", [ - qt => 'The Qt library', - baselibs => 'KDE essential libraries/runtime (required)', - workspace => 'KDE Plasma Desktop and workspace', - base => 'Essential KDE applications', + frameworks => 'KDE Frameworks 5 - Essential libraries/runtime (required)', + workspace => 'KDE Plasma 5 Desktop and workspace', + base => 'Assorted useful KF5-based applications', pim => 'Personal Information Management software', ], { - baselibs => 1, + frameworks => 1, workspace => 1, base => 1, }, ); my $numCpus = getUserInput( - 'How many CPU cores do you wish to use for building?', '2'); + 'How many CPU cores do you wish to use for building?', '4'); my $outputFileName = "$ENV{HOME}/.kdesrc-buildrc"; my $output; # Will be output filehandle. @@ -320,23 +322,24 @@ global EOF -if (grep { /^qt$/ } @chosenModules) { - print $output <