Commit 1f4c96e2 authored by Johan Ouwerkerk's avatar Johan Ouwerkerk
Browse files

feat: support organising cloned source directories according to the 'layout'...

feat: support organising cloned source directories according to the 'layout' of repositories on invent.kde.org

Issues: #59
parent b6c37bb8
Pipeline #44407 canceled with stage
...@@ -82,6 +82,7 @@ our %defaultGlobalFlags = ( ...@@ -82,6 +82,7 @@ our %defaultGlobalFlags = (
"disable-agent-check" => 0, # If true we don't check on ssh-agent "disable-agent-check" => 0, # If true we don't check on ssh-agent
"disable-snapshots" => 1, # 2016-07-31 Temp. disabled until kde.org fixed to supply snapshots "disable-snapshots" => 1, # 2016-07-31 Temp. disabled until kde.org fixed to supply snapshots
"ignore-kde-structure" => 0, # Whether to use kde dir structure like extragear/network "ignore-kde-structure" => 0, # Whether to use kde dir structure like extragear/network
"use-invent-structure" => 0, # Whether to use kde dir structure based on repository paths on invent.kde.org
"include-dependencies" => 0, # 2019-08-31 Made negatable from cmdline (NB: false here but true in rcfile) "include-dependencies" => 0, # 2019-08-31 Made negatable from cmdline (NB: false here but true in rcfile)
"install-after-build" => 1, "install-after-build" => 1,
"install-environment-driver" => 1, # Setup ~/.config/kde-env-*.sh for login scripts "install-environment-driver" => 1, # Setup ~/.config/kde-env-*.sh for login scripts
......
...@@ -961,6 +961,15 @@ sub destDir ...@@ -961,6 +961,15 @@ sub destDir
if ($self->getOption('ignore-kde-structure')) { if ($self->getOption('ignore-kde-structure')) {
$basePath = $self->name(); $basePath = $self->name();
} else { } else {
if ($self->getOption('use-invent-structure')) {
my $repo = $self->getOption('repository');
if ($repo =~ m/kde:(.*)\.git/) {
$basePath = $1;
}
}
}
if (!$basePath) {
$basePath = shift // $self->getOption('#xml-full-path'); $basePath = shift // $self->getOption('#xml-full-path');
$basePath ||= $self->name(); # Default if not provided in repo-metadata $basePath ||= $self->name(); # Default if not provided in repo-metadata
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment