diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-24 10:03:18 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-29 18:36:39 +0200 |
| commit | 44c0d64b3be108ad41e2e1fa980d871de1f8b4c8 (patch) | |
| tree | 831933da613f9d0b977e218d2f4e2b08b83a50e4 /scripts/qt | |
| parent | 74bb5d89ac19915d2e4887fa3b617a13f2e50e05 (diff) | |
introduce qt.deps_branch property
this allows setting a different default branch for the tested repo's
dependencies. this is useful for feature branches which typically exist
only in one repo.
Change-Id: Id63570900cd141e4f24aa2f23a1f4c0f5dc13a8a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index a48e2008..bd2a85e4 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -92,6 +92,8 @@ my @PROPERTIES = ( q{qt.branch} => q{git branch of Qt superproject (e.g. `stable'); only used } . q{if qt.gitmodule != "qt5"}, + q{qt.deps_branch} => q{default git branch for the tested repo's dependencies}, + q{qt.configure.args} => q{space-separated arguments passed to Qt's configure}, q{qt.configure.extra_args} => q{more space-separated arguments passed to Qt's configure; } @@ -479,6 +481,7 @@ sub read_and_store_configuration 'qt.dir' => \&default_qt_dir , 'qt.repository' => \&default_qt_repository , 'qt.branch' => q{stable} , + 'qt.deps_branch' => q{} , 'qt.init-repository.args' => q{} , 'qt.configure.args' => \&default_qt_configure_args , 'qt.configure.extra_args' => q{} , @@ -731,7 +734,9 @@ sub set_module_refs my ($self, %module_to_ref) = @_; my $qt_dir = $self->{ 'qt.dir' }; - my $qt_ref = "refs/heads/".$self->{ 'qt.branch' }; + my $qt_ref = $self->{ 'qt.deps_branch' }; + $qt_ref = $self->{ 'qt.branch' } if ($qt_ref eq ''); + $qt_ref = "refs/heads/".$qt_ref; # Checkout dependencies as specified in the sync.profile, which specifies the sha1s/refs within them # Also, this code assumes that init-repository always uses `origin' as the remote. |