lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-03 06:56:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Just move functions closer to their logical place in the code

Browse Source 
Makes it easier to read the code

Change-Id: I71ed3affa3d3fe4e2b782898c78f1c1a97371d26
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Marius Storm-Olsen
2012-04-06 22:20:13 -05:00
committed by Qt by Nokia
parent 1e103533a0
commit 3dffd4e710
1 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
build
View File

@@ -54,6 +54,31 @@ use Cwd qw( getcwd );
use File::Spec qw( path catfile );
use Config;
sub parse_arguments
{
my ($self, @args) = @_;
%{$self} = (%{$self},
'verbose' => 0,
'continue' => 0,
'jobs' => -1,
'force_qmake' => 0,
'build-submodules' => [],
);
GetOptionsFromArray(\@args,
'verbose|v:1' => \$self->{'verbose'},
'continue' => \$self->{'continue'},
'jobs|j:1' => \$self->{'jobs'},
'force-qmake' => \$self->{'force_qmake'},
'help|?' => sub { pod2usage(1); },
) || pod2usage(2);
push(@{$self->{'build-submodules'}}, @args) if (@args);
return;
}
# Like `system', but possibly log the command, and die on non-zero exit code
sub exe
{
@@ -120,62 +145,6 @@ sub exeLowPriv()
}
}
sub new
{
my ($class, @arguments) = @_;
my $self = {};
bless $self, $class;
$self->parse_arguments(@arguments);
$self->detect_configuration;
my $depfile = "build.dependencies";
my $result;
our (%build_dependencies, %build_commands, %install_commands, @nondefault_modules);
# following variables may be expanded in the evaluation below
my $MAKEOPTS = $self->{'MAKEOPTS'};
my $MAKE = $self->{'MAKE'};
unless ($result = do $depfile) {
die "build couldn't parse $depfile: $@" if $@;
die "build couldn't execute $depfile: $!" unless defined $result;
}
$self->{'deps'} = \%build_dependencies;
$self->{'buildcmds'} = \%build_commands;
$self->{'instcmds'} = \%install_commands;
$self->{'nondefault'} = \@nondefault_modules;
return $self;
}
sub parse_arguments
{
my ($self, @args) = @_;
%{$self} = (%{$self},
'verbose' => 0,
'continue' => 0,
'jobs' => -1,
'force_qmake' => 0,
'build-submodules' => [],
);
GetOptionsFromArray(\@args,
'verbose|v:1' => \$self->{'verbose'},
'continue' => \$self->{'continue'},
'jobs|j:1' => \$self->{'jobs'},
'force-qmake' => \$self->{'force_qmake'},
'help|?' => sub { pod2usage(1); },
) || pod2usage(2);
push(@{$self->{'build-submodules'}}, @args) if (@args);
return;
}
sub which {
my ($self, $exe) = @_;
@@ -419,6 +388,37 @@ sub build_qt
return 0;
}
sub new
{
my ($class, @arguments) = @_;
my $self = {};
bless $self, $class;
$self->parse_arguments(@arguments);
$self->detect_configuration;
my $depfile = "build.dependencies";
my $result;
our (%build_dependencies, %build_commands, %install_commands, @nondefault_modules);
# following variables may be expanded in the evaluation below
my $MAKEOPTS = $self->{'MAKEOPTS'};
my $MAKE = $self->{'MAKE'};
unless ($result = do $depfile) {
die "build couldn't parse $depfile: $@" if $@;
die "build couldn't execute $depfile: $!" unless defined $result;
}
$self->{'deps'} = \%build_dependencies;
$self->{'buildcmds'} = \%build_commands;
$self->{'instcmds'} = \%install_commands;
$self->{'nondefault'} = \@nondefault_modules;
return $self;
}
sub run
{
my ($self) = @_;