@@ -41,6 +41,7 @@ def __init__(
4141 proxy : bool ,
4242 pools : List [str ],
4343 umf_version : Version ,
44+ umfd_lib : bool ,
4445 ):
4546 self .workspace_dir = workspace_dir
4647 self .build_dir = build_dir
@@ -50,6 +51,7 @@ def __init__(
5051 self .proxy = proxy
5152 self .pools = pools
5253 self .umf_version = umf_version
54+ self .umfd_lib = umfd_lib
5355 self .match_list = self ._create_match_list ()
5456
5557 def _create_match_list (self ) -> List [str ]:
@@ -74,10 +76,14 @@ def _create_match_list(self) -> List[str]:
7476 lib_prefix = "lib"
7577
7678 bin = []
77- if platform .system () == "Windows" and (self .shared_library or self .proxy ):
79+ if platform .system () == "Windows" and (
80+ self .shared_library or self .proxy or self .umfd_lib
81+ ):
7882 bin .append ("bin" )
7983 if self .shared_library :
8084 bin .append ("bin/umf.dll" )
85+ if self .umfd_lib :
86+ bin .append ("bin/umfd.dll" )
8187 if self .proxy :
8288 bin .append ("bin/umf_proxy.dll" )
8389
@@ -101,6 +107,8 @@ def _create_match_list(self) -> List[str]:
101107 lib .append (f"lib/{ lib_prefix } { pool } .{ lib_ext_static } " )
102108 if self .shared_library :
103109 lib .append (f"lib/{ lib_prefix } umf.{ lib_ext_shared } " )
110+ if platform .system () == "Windows" and self .umfd_lib :
111+ lib .append (f"lib/{ lib_prefix } umfd.{ lib_ext_shared } " )
104112
105113 if platform .system () == "Linux" :
106114 lib .append (
@@ -283,6 +291,11 @@ def parse_arguments(self) -> argparse.Namespace:
283291 action = "store" ,
284292 help = "Current version of the UMF, e.g. 1.0.0" ,
285293 )
294+ self .parser .add_argument (
295+ "--umfd-lib" ,
296+ action = "store_true" ,
297+ help = "Add this argument if the UMF was built with the umfd library" ,
298+ )
286299 return self .parser .parse_args ()
287300
288301 def run (self ) -> None :
@@ -306,6 +319,7 @@ def run(self) -> None:
306319 self .args .proxy ,
307320 pools ,
308321 umf_version ,
322+ self .args .umfd_lib ,
309323 )
310324
311325 print ("Installation test - BEGIN" , flush = True )
0 commit comments