Alexandre Julliard : winetest: Build winetest.exe using the Mingw support in the main tree.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon May 27 21:55:37 2019 +0200

winetest: Build winetest.exe using the Mingw support in the main tree.

Instead of creating separate Mingw build trees.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 winetest/make-winetest | 50 ++++++++++++++++++--------------------------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/winetest/make-winetest b/winetest/make-winetest
index 638590b..a0637b6 100755
--- a/winetest/make-winetest
+++ b/winetest/make-winetest
@@ -50,8 +50,6 @@ servicedir="/home/winehq/opt/winetest/winehq-builds/winetest"
 toolsdir="/home/winehq/opt/tools"
 transldir="/home/winehq/opt/source/transl"
 
-mingw32=i686-w64-mingw32
-mingw64=x86_64-w64-mingw32
 logfile=LOG
 
 # if the log file exists, either a build is in progress or one has failed
@@ -76,18 +74,18 @@ umask 022
 
     # first build the native tools
 
-    test -d build-native ||
-    (mkdir build-native &&
-     cd build-native &&
-     ../wine/configure --enable-win64 --without-x --without-freetype) || exit
+    test -d build64 ||
+    (mkdir build64 &&
+     cd build64 &&
+     ../wine/configure --enable-win64 --with-mingw --without-x --without-freetype) || exit
 
-    (cd build-native && make depend && make __builddeps__) || exit
+    (cd build64 && make depend && make __builddeps__) || exit
 
     # update the translations status
 
     rm -rf $branch
     mkdir $branch $branch/res
-    php $toolsdir/transl/parse_resfiles.php -T ./build-native -w ./$branch 2>>$branch/run.log
+    php $toolsdir/transl/parse_resfiles.php -T ./build64 -w ./$branch 2>>$branch/run.log
     (cd wine && git describe HEAD) >$branch/version
     mv -f $transldir/$branch $transldir/$branch.old
     mv -f $branch $transldir/$branch
@@ -101,44 +99,32 @@ umask 022
 
     # then cross-compile the tests
 
-    test -d build-mingw32 ||
-    (mkdir build-mingw32 &&
-     cd build-mingw32 &&
-     ../wine/configure --host=$mingw32 --with-wine-tools=../build-native --without-x --without-freetype) || exit
+    (cd build64 && make programs/winetest) || exit
 
-    (cd build-mingw32 &&
+    test -d build32 ||
+    (mkdir build32 &&
+     cd build32 &&
+     ../wine/configure --with-mingw --without-x --without-freetype) || exit
+
+    (cd build32 &&
      make depend &&
      make programs/winetest &&
      upx -9 -qq programs/winetest/winetest.exe) || exit
 
     # install everything
 
-    chmod 644 build-mingw32/programs/winetest/winetest.exe
-    mv -f build-mingw32/programs/winetest/winetest.exe $destdir/winetest-$head.exe
+    chmod 644 build32/programs/winetest/winetest.exe build64/programs/winetest/winetest.exe
+    mv -f build32/programs/winetest/winetest.exe $destdir/winetest-$head.exe
+    mv -f build64/programs/winetest/winetest.exe $destdir/winetest64-$head.exe
     ln -sf winetest-$head.exe $destdir/winetest-latest.exe
+    ln -sf winetest64-$head.exe $destdir/winetest64-latest.exe
+
     rm -f $servicedir/*.cookie $servicedir/*.url
     sha1sum $destdir/winetest-latest.exe | cut -c1-40 > $servicedir/winetest-$head.cookie
     echo "$desturl/winetest-$head.exe" > $servicedir/winetest-$head.url
 
     echo "winetest-$head.exe built successfully."
 
-    # now the same thing for 64-bit
-
-    test -d build-mingw64 ||
-    (mkdir build-mingw64 &&
-     cd build-mingw64 &&
-     ../wine/configure --host=$mingw64 --with-wine-tools=../build-native --without-x --without-freetype) || exit
-
-    (cd build-mingw64 &&
-     make depend &&
-     make programs/winetest) || exit
-
-    chmod 644 build-mingw64/programs/winetest/winetest.exe
-    mv -f build-mingw64/programs/winetest/winetest.exe $destdir/winetest64-$head.exe
-    ln -sf winetest64-$head.exe $destdir/winetest64-latest.exe
-
-    echo "winetest64-$head.exe built successfully."
-
 ) >$logfile 2>&1 && rm -f $logfile
 
 # if the log file is still here, something failed