Commit 64e74b4c authored by Michael Pyne's avatar Michael Pyne

Simplify option parsing for running make in the cases of CMake, automake, and unsermake.

Also remove a now unnecessary line which I neglected to remove entirely when excising apidox support.

svn path=/trunk/KDE/kdesdk/scripts/kdesvn-build; revision=844539
parent 38d4e0f0
......@@ -2442,30 +2442,18 @@ sub safe_rmtree
sub safe_make (@)
{
my ($module, $trynumber, @args) = @_;
my $opts;
my $logdir = get_log_dir($module);
my $checkout_dirs = get_option($module, "checkout-only");
my @dirs = split(' ', $checkout_dirs);
my $installing = $trynumber eq 'install';
my $make = 'make';
if (module_uses_cmake($module) or get_option($module, 'use-unsermake'))
{
my $tool = module_uses_cmake($module) ? 'cmake' : 'unsermake';
my $make = 'make';
my $opts = get_option($module, 'make-options');
if (module_uses_cmake($module))
{
$opts = get_option($module, 'make-options');
}
else
{
$make = get_option($module, 'unsermake-path');
$opts = get_option($module, 'unsermake-options');
}
}
else
if (get_option($module, 'use-unsermake') and not module_uses_cmake($module))
{
$opts = get_option($module, 'make-options');
$make = get_option($module, 'unsermake-path');
$opts = get_option($module, 'unsermake-options');
}
# Convert the path to an absolute path since I've encountered a sudo that
......@@ -2542,7 +2530,6 @@ sub safe_make (@)
}
else
{
$description = "Building API Documentation";
$description = "Compiling, attempt $trynumber";
unshift @args, $make;
......
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