Francois Gouget : testbot/build: Let make rebuild the makefiles instead of calling config.status from Build .pl.

Alexandre Julliard julliard at winehq.org
Wed Mar 27 13:09:01 CDT 2013


Module: tools
Branch: master
Commit: e3a4ae40910388d8f68afa5abf3e47e515055d31
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=e3a4ae40910388d8f68afa5abf3e47e515055d31

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Mar 27 16:31:32 2013 +0100

testbot/build: Let make rebuild the makefiles instead of calling config.status from Build.pl.

---

 testbot/bin/build/Build.pl |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl
index 2964049..76e73f4 100755
--- a/testbot/bin/build/Build.pl
+++ b/testbot/bin/build/Build.pl
@@ -192,7 +192,7 @@ sub BuildTestExecutable
   {
     InfoMsg "Recreating include/Makefile\n";
     system("( cd $DataDir/build-mingw$Bits && set -x && " .
-           "  ./config.status --file include/Makefile:Make.vars.in:include/Makefile.in " .
+           "  make -j$ncpus include/Makefile " .
            ") >>$LogDir/Build.log 2>&1");
     if ($? != 0)
     {
@@ -214,7 +214,7 @@ sub BuildTestExecutable
   {
     InfoMsg "Rebuilding $BaseName import lib\n";
     system("( cd $DataDir/build-mingw$Bits && set -x && " .
-           "  ./config.status --file $PatchType/$BaseName/Makefile:Make.vars.in:$PatchType/$BaseName/Makefile.in " .
+           "  make -j$ncpus $PatchType/$BaseName/Makefile " .
            ") >>$LogDir/Build.log 2>&1");
     if ($? != 0)
     {
@@ -236,7 +236,7 @@ sub BuildTestExecutable
   {
     InfoMsg "Recreating tests/Makefile\n";
     system("( cd $DataDir/build-mingw$Bits && set -x && " .
-           "  ./config.status --file $PatchType/$BaseName/tests/Makefile:Make.vars.in:$PatchType/$BaseName/tests/Makefile.in " .
+           "  make -j$ncpus $PatchType/$BaseName/tests/Makefile " .
            ") >>$LogDir/Build.log 2>&1");
     if ($? != 0)
     {




More information about the wine-cvs mailing list