Francois Gouget : testbot/build: Rely on Wine' s makefiles and simplify Reconfig.pl.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 34dd35b033170686a264fb86567e98f934bf0854
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=34dd35b033170686a264fb86...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Mon May 28 15:10:01 2018 +0200

testbot/build: Rely on Wine's makefiles and simplify Reconfig.pl.

The 'make depend' step is not needed.
Also add a comment to explain why we rebuild from scratch.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 testbot/bin/build/Reconfig.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl
index 7b0755a..322638e 100755
--- a/testbot/bin/build/Reconfig.pl
+++ b/testbot/bin/build/Reconfig.pl
@@ -144,10 +144,11 @@ sub BuildTestLauncher()
 sub BuildNative()
 {
   mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native");
+
+  # Rebuild from scratch to make sure cruft will not accumulate
   system("( cd $DataDir/build-native && set -x && " .
          "  rm -rf * && " .
          "  time ../wine/configure --enable-win64 --without-x --without-freetype && " .
-         "  time make -j$ncpus depend && " .
          "  time make -j$ncpus __tooldeps__ " .
          ") >>$LogDir/Reconfig.log 2>&1");
 
@@ -166,10 +167,11 @@ sub BuildCross($)
 
   my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32");
   mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits");
+
+  # Rebuild from scratch to make sure cruft will not accumulate
   system("( cd $DataDir/build-mingw$Bits && set -x && " .
          "  rm -rf * && " .
          "  time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " .
-         "  time make -j$ncpus depend  && " .
          "  time make -j$ncpus programs/winetest " .
          ") >>$LogDir/Reconfig.log 2>&1");
   if ($? != 0)