moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

scan for gmake and make to prefer gmake on systems that have it

Browse Source
This commit is contained in:
Daniel Stenberg 2005-05-17 12:07:08 +00:00
parent 1f878aee69
commit c84839eb91
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tests/testcurl.pl
View File

@ -403,6 +403,27 @@ if ($configurebuild) {
logit "configure created (dummy message)"; # dummy message to feign success logit "configure created (dummy message)"; # dummy message to feign success
} }
sub findinpath {
my $c;
my $e;
my $p=$ENV{'PATH'};
my @pa = split(":", $p);
for $c (@_) {
for $e (@pa) {
if( -x "$e/$c") {
return $c;
}
}
}
}
my $make = findinpath("gmake", "make", "nmake");
if(!$make) {
mydie "Couldn't find make in the PATH";
}
logit "going with $make as make";
# change to build dir # change to build dir
chdir "$pwd/$build"; chdir "$pwd/$build";
@ -423,8 +444,8 @@ if ($configurebuild) {
elsif (($^O eq 'linux') || ($targetos =~ /netware/)) { elsif (($^O eq 'linux') || ($targetos =~ /netware/)) {
system("cp -afr ../$CURLDIR/* ."); system("cp -afr ../$CURLDIR/* .");
system("cp -af ../$CURLDIR/Makefile.dist Makefile"); system("cp -af ../$CURLDIR/Makefile.dist Makefile");
system("make -i -C lib -f Makefile.$targetos prebuild"); system("$make -i -C lib -f Makefile.$targetos prebuild");
system("make -i -C src -f Makefile.$targetos prebuild"); system("$make -i -C src -f Makefile.$targetos prebuild");
} }
} }
@ -450,12 +471,12 @@ if (grepfile("define USE_ARES", "lib/config$confsuffix.h")) {
chdir "ares"; chdir "ares";
if ($targetos && !$configurebuild) { if ($targetos && !$configurebuild) {
logit "make -f Makefile.$targetos"; logit "$make -f Makefile.$targetos";
open(F, "make -f Makefile.$targetos 2>&1 |") or die; open(F, "$make -f Makefile.$targetos 2>&1 |") or die;
} }
else { else {
logit "make"; logit "$make";
open(F, "make 2>&1 |") or die; open(F, "$make 2>&1 |") or die;
} }
while (<F>) { while (<F>) {
s/$pwd//g; s/$pwd//g;
@ -474,8 +495,8 @@ if (grepfile("define USE_ARES", "lib/config$confsuffix.h")) {
} }
if ($configurebuild) { if ($configurebuild) {
logit "make -i"; logit "$make -i";
open(F, "make -i 2>&1 |") or die; open(F, "$make -i 2>&1 |") or die;
while (<F>) { while (<F>) {
s/$pwd//g; s/$pwd//g;
print; print;
@ -483,17 +504,17 @@ if ($configurebuild) {
close(F); close(F);
} }
else { else {
logit "make -i $targetos"; logit "$make -i $targetos";
if ($^O eq 'MSWin32') { if ($^O eq 'MSWin32') {
if ($targetos =~ /vc/) { if ($targetos =~ /vc/) {
open(F, "nmake -i $targetos|") or die; open(F, "nmake -i $targetos|") or die;
} }
else { else {
open(F, "make -i $targetos |") or die; open(F, "$make -i $targetos |") or die;
} }
} }
else { else {
open(F, "make -i $targetos 2>&1 |") or die; open(F, "$make -i $targetos 2>&1 |") or die;
} }
while (<F>) { while (<F>) {
s/$pwd//g; s/$pwd//g;
@ -536,8 +557,8 @@ if ($configurebuild && !$crosscompile) {
if($runtestopts) { if($runtestopts) {
$o = "TEST_F=\"$runtestopts\" "; $o = "TEST_F=\"$runtestopts\" ";
} }
logit "make ${o}test-full"; logit "$make ${o}test-full";
open(F, "make ${o}test-full 2>&1 |") or die; open(F, "$make ${o}test-full 2>&1 |") or die;
open(LOG, ">$buildlog") or die; open(LOG, ">$buildlog") or die;
while (<F>) { while (<F>) {
s/$pwd//g; s/$pwd//g;