lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add build dependency for qtwayland + make qtwayland non default module

Browse Source 
Running
    ./build qtwayland
will build qtwayland and its dependencies.

Change-Id: I78f0b0cec6bc21a14f0d8d89e42080589d9b28b6
This commit is contained in:
Marius Storm-Olsen
2012-03-28 16:28:25 -05:00
committed by Simo Fält
parent 7a6ba9275c
commit 24517c7391
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build
View File

@@ -132,7 +132,7 @@ sub new
my $depfile = "build.dependencies";
my $result;
our (%build_dependencies, %build_commands, %install_commands);
our (%build_dependencies, %build_commands, %install_commands, @nondefault_modules);
# following variables may be expanded in the evaluation below
my $MAKEOPTS = $self->{'MAKEOPTS'};
@@ -146,6 +146,7 @@ sub new
$self->{'deps'} = \%build_dependencies;
$self->{'buildcmds'} = \%build_commands;
$self->{'instcmds'} = \%install_commands;
$self->{'nondefault'} = \@nondefault_modules;
return $self;
}
@@ -415,7 +416,12 @@ sub run
if (scalar @{$self->{'build-submodules'}} > 0) {
$self->check_build_modules(1);
} else {
push(@{$self->{'build-submodules'}}, keys(%{$self->{'deps'}}));
my @default = keys(%{$self->{'deps'}});
my @nondefault = @{$self->{'nondefault'}};
foreach my $item (@nondefault) {
@default = grep { $_ ne $item } @default;
}
push(@{$self->{'build-submodules'}}, @default);
$self->check_build_modules(0);
}

6
build.dependencies
View File

@@ -36,6 +36,10 @@ use Config;
"qtxmlpatterns" => "qtbase",
);
@nondefault_modules = (
"qtwayland",
);
if ("$Config{osname}" =~ /mswin/i) {
%build_commands = (
"qtwebkit" => "perl Tools/Scripts/build-webkit --qt --no-netscape-plugin --no-webkit2",
@@ -53,7 +57,7 @@ if ("$Config{osname}" =~ /mswin/i) {
# Platform specific modules
if ("$Config{osname}" =~ /linux/i) {
$build_dependencies{"qtwayland"} = "qtbase";
$build_dependencies{"qtwayland"} = "qtbase,qtdeclarative";
}
if ("$Config{osname}" =~ /(ms|cyg)win/i) {