lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +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
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marius Storm-Olsen
2012-03-28 16:28:25 -05:00
committed by Qt by Nokia
parent 72f4597c9d
commit e4ed3288e9
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 $depfile = "build.dependencies";
my $result; 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 # following variables may be expanded in the evaluation below
my $MAKEOPTS = $self->{'MAKEOPTS'}; my $MAKEOPTS = $self->{'MAKEOPTS'};
@@ -146,6 +146,7 @@ sub new
$self->{'deps'} = \%build_dependencies; $self->{'deps'} = \%build_dependencies;
$self->{'buildcmds'} = \%build_commands; $self->{'buildcmds'} = \%build_commands;
$self->{'instcmds'} = \%install_commands; $self->{'instcmds'} = \%install_commands;
$self->{'nondefault'} = \@nondefault_modules;
return $self; return $self;
} }
@@ -423,7 +424,12 @@ sub run
if (scalar @{$self->{'build-submodules'}} > 0) { if (scalar @{$self->{'build-submodules'}} > 0) {
$self->check_build_modules(1); $self->check_build_modules(1);
} else { } 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); $self->check_build_modules(0);
} }

6
build.dependencies
View File

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