Loading tests/testcurl.pl +16 −11 Original line number Diff line number Diff line Loading @@ -61,6 +61,7 @@ use strict; use Cwd; use Cwd 'abs_path'; # Turn on warnings (equivalent to -w, which can't be used with /usr/bin/env) #BEGIN { $^W = 1; } Loading Loading @@ -387,6 +388,10 @@ if (-d $CURLDIR) { mydie "$CURLDIR is not a daily source dir or checked out from git!" } } # make the path absolute so we can use it everywhere $CURLDIR = abs_path("$CURLDIR"); $build="build-$$"; $buildlogname="buildlog-$$"; $buildlog="$pwd/$buildlogname"; Loading Loading @@ -459,7 +464,7 @@ if ($git) { logit " $_"; } chdir "$pwd/$CURLDIR"; chdir "$CURLDIR"; } if($nobuildconf) { Loading Loading @@ -558,7 +563,7 @@ chdir "$pwd/$build"; if ($configurebuild) { # run configure script print `../$CURLDIR/configure $confopts 2>&1`; print `$CURLDIR/configure $confopts 2>&1`; if (-f "lib/Makefile") { logit "configure seems to have finished fine"; Loading @@ -568,26 +573,26 @@ if ($configurebuild) { } else { logit "copying files to build dir ..."; if (($^O eq 'MSWin32') && ($targetos !~ /netware/)) { system("xcopy /s /q ..\\$CURLDIR ."); system("xcopy /s /q $CURLDIR ."); system("buildconf.bat"); } elsif ($targetos =~ /netware/) { system("cp -afr ../$CURLDIR/* ."); system("cp -af ../$CURLDIR/Makefile.dist Makefile"); system("cp -afr $CURLDIR/* ."); system("cp -af $CURLDIR/Makefile.dist Makefile"); system("$make -i -C lib -f Makefile.netware prebuild"); system("$make -i -C src -f Makefile.netware prebuild"); if (-d "../$CURLDIR/ares") { if (-d "$CURLDIR/ares") { system("$make -i -C ares -f Makefile.netware prebuild"); } } elsif ($^O eq 'linux') { system("cp -afr ../$CURLDIR/* ."); system("cp -af ../$CURLDIR/Makefile.dist Makefile"); system("cp -af ../$CURLDIR/include/curl/curlbuild.h.dist ./include/curl/curlbuild.h"); system("cp -afr $CURLDIR/* ."); system("cp -af $CURLDIR/Makefile.dist Makefile"); system("cp -af $CURLDIR/include/curl/curlbuild.h.dist ./include/curl/curlbuild.h"); system("$make -i -C lib -f Makefile.$targetos prebuild"); system("$make -i -C src -f Makefile.$targetos prebuild"); if (-d "../$CURLDIR/ares") { system("cp -af ../$CURLDIR/ares/ares_build.h.dist ./ares/ares_build.h"); if (-d "$CURLDIR/ares") { system("cp -af $CURLDIR/ares/ares_build.h.dist ./ares/ares_build.h"); system("$make -i -C ares -f Makefile.$targetos prebuild"); } } Loading Loading
tests/testcurl.pl +16 −11 Original line number Diff line number Diff line Loading @@ -61,6 +61,7 @@ use strict; use Cwd; use Cwd 'abs_path'; # Turn on warnings (equivalent to -w, which can't be used with /usr/bin/env) #BEGIN { $^W = 1; } Loading Loading @@ -387,6 +388,10 @@ if (-d $CURLDIR) { mydie "$CURLDIR is not a daily source dir or checked out from git!" } } # make the path absolute so we can use it everywhere $CURLDIR = abs_path("$CURLDIR"); $build="build-$$"; $buildlogname="buildlog-$$"; $buildlog="$pwd/$buildlogname"; Loading Loading @@ -459,7 +464,7 @@ if ($git) { logit " $_"; } chdir "$pwd/$CURLDIR"; chdir "$CURLDIR"; } if($nobuildconf) { Loading Loading @@ -558,7 +563,7 @@ chdir "$pwd/$build"; if ($configurebuild) { # run configure script print `../$CURLDIR/configure $confopts 2>&1`; print `$CURLDIR/configure $confopts 2>&1`; if (-f "lib/Makefile") { logit "configure seems to have finished fine"; Loading @@ -568,26 +573,26 @@ if ($configurebuild) { } else { logit "copying files to build dir ..."; if (($^O eq 'MSWin32') && ($targetos !~ /netware/)) { system("xcopy /s /q ..\\$CURLDIR ."); system("xcopy /s /q $CURLDIR ."); system("buildconf.bat"); } elsif ($targetos =~ /netware/) { system("cp -afr ../$CURLDIR/* ."); system("cp -af ../$CURLDIR/Makefile.dist Makefile"); system("cp -afr $CURLDIR/* ."); system("cp -af $CURLDIR/Makefile.dist Makefile"); system("$make -i -C lib -f Makefile.netware prebuild"); system("$make -i -C src -f Makefile.netware prebuild"); if (-d "../$CURLDIR/ares") { if (-d "$CURLDIR/ares") { system("$make -i -C ares -f Makefile.netware prebuild"); } } elsif ($^O eq 'linux') { system("cp -afr ../$CURLDIR/* ."); system("cp -af ../$CURLDIR/Makefile.dist Makefile"); system("cp -af ../$CURLDIR/include/curl/curlbuild.h.dist ./include/curl/curlbuild.h"); system("cp -afr $CURLDIR/* ."); system("cp -af $CURLDIR/Makefile.dist Makefile"); system("cp -af $CURLDIR/include/curl/curlbuild.h.dist ./include/curl/curlbuild.h"); system("$make -i -C lib -f Makefile.$targetos prebuild"); system("$make -i -C src -f Makefile.$targetos prebuild"); if (-d "../$CURLDIR/ares") { system("cp -af ../$CURLDIR/ares/ares_build.h.dist ./ares/ares_build.h"); if (-d "$CURLDIR/ares") { system("cp -af $CURLDIR/ares/ares_build.h.dist ./ares/ares_build.h"); system("$make -i -C ares -f Makefile.$targetos prebuild"); } } Loading