From aa73107ee4a4ed75be0655ffa9ed3a800a589ae5 Mon Sep 17 00:00:00 2001
From: Matt Chambers <matt.chambers42@gmail.com>
Date: Tue, 22 Nov 2022 14:15:39 -0500
Subject: [PATCH] * disabled Reader_Waters_Test for 32-bit build

---
 pwiz/data/vendor_readers/Waters/Jamfile.jam        | 14 ++++++++++++--
 .../msrc/utility/vendor_api/Waters/Jamfile.jam     |  3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pwiz/data/vendor_readers/Waters/Jamfile.jam b/pwiz/data/vendor_readers/Waters/Jamfile.jam
index a4064735a15..bd13a71d9f9 100644
--- a/pwiz/data/vendor_readers/Waters/Jamfile.jam
+++ b/pwiz/data/vendor_readers/Waters/Jamfile.jam
@@ -51,7 +51,8 @@ rule vendor-api-requirements ( properties * )
        [ project-exists $(API_PATH) ] &&
        [ masslynxraw-dll-location $(API_PATH) : $(properties) ] &&
 	   ! [ without-binary-msdata $(properties) ] &&
-       ! <vendor-api-support>off in $(properties)
+       ! <vendor-api-support>off in $(properties) && 
+       ! <address-model>32 in $(properties)
     {
         result += <source>Reader_Waters_Detail.cpp ;
     }
@@ -65,7 +66,8 @@ rule vendor-api-usage-requirements ( properties * )
        [ project-exists $(API_PATH) ] &&
        [ masslynxraw-dll-location $(API_PATH) : $(properties) ]  &&
 	   ! [ without-binary-msdata $(properties) ] &&
-       ! <vendor-api-support>off in $(properties)
+       ! <vendor-api-support>off in $(properties) && 
+       ! <address-model>32 in $(properties)
     {
         result += <library>$(API_PATH)//pwiz_vendor_api_waters ;
         result += <define>PWIZ_READER_WATERS ;
@@ -89,6 +91,10 @@ rule vendor-api-usage-requirements ( properties * )
         {
             echo "[$(READER_PATH)] Missing DLL: $(READER_NAME) can only identify files, not read them." ;
         }
+        else if <address-model>32 in $(properties)
+        {
+            echo "[$(READER_PATH)] 32-bit build: $(READER_NAME) can only identify files, not read them." ;
+        }
     }
     return $(result) ;
 }
@@ -145,6 +151,10 @@ rule test-requirements ( properties * )
     {
         warn-once "[$(READER_PATH)] Missing DLL: $(READER_NAME)_Test is only testing that it can identify files, not read them." ;
     }
+    else if <address-model>32 in $(properties)
+    {
+        warn-once "[$(READER_PATH)] 32-bit build: $(READER_NAME)_Test is only testing that it can identify files, not read them." ;
+    }
 
     return $(result) ;
 }
diff --git a/pwiz_aux/msrc/utility/vendor_api/Waters/Jamfile.jam b/pwiz_aux/msrc/utility/vendor_api/Waters/Jamfile.jam
index a5403bab730..104503f3a32 100644
--- a/pwiz_aux/msrc/utility/vendor_api/Waters/Jamfile.jam
+++ b/pwiz_aux/msrc/utility/vendor_api/Waters/Jamfile.jam
@@ -35,7 +35,8 @@ import path ;
 rule vendor-api-requirements ( properties * )
 {
     local result = [ masslynxraw-dll-location $(API_PATH) : $(properties) ] ;
-    if $(result)
+    if $(result) && 
+       ! <address-model>32 in $(properties)
     {
         result = <search>$(result) ;
     }