Francois Gouget : testbot/build: Add support for Wine Mono 5.0.0.

Alexandre Julliard julliard at winehq.org
Tue Apr 21 15:14:38 CDT 2020


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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Tue Apr 21 19:09:43 2020 +0200

testbot/build: Add support for Wine Mono 5.0.0.

The MSI filename now contains an architecture suffix and the checksum is
per-architecture (so support for other architectures like arm64 can be
added one day).

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

---

 testbot/lib/Build/Utils.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index df236fa..8c26327 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -425,6 +425,10 @@ sub UpdateAddOns()
       {
         $Arch = $1;
       }
+      elsif ($Line =~ /^\s*#\s*define\s+(?:GECKO|MONO)_ARCH\s+"([^"]+)"/)
+      {
+        $Arch = $1;
+      }
       elsif ($Line =~ /^\s*#\s*define\s*(GECKO|MONO)_VERSION\s*"([^"]+)"/)
       {
         my ($AddOn, $Version) = ($1, $2);
@@ -450,7 +454,7 @@ sub UpdateAddOns()
 
   return _UpdateAddOn($AddOns{gecko}, "gecko", "x86") &&
          _UpdateAddOn($AddOns{gecko}, "gecko", "x86_64") &&
-         _UpdateAddOn($AddOns{mono},  "mono",  "");
+         _UpdateAddOn($AddOns{mono},  "mono",  "x86");
 }
 
 




More information about the wine-cvs mailing list