@@ -53,7 +53,7 @@ def run(self):
5353
5454 for dep in dependencies :
5555 printf ("Installing dependency {}..." .format (dep ), end = " " )
56- sp .call (["pacman" , "--needed" , "--noconfirm" , "-S" , "mingw-w64-x86_64-{}" .format (dep )], stdout = sp .PIPE )
56+ sp .call (["pacman" , "--needed" , "--noconfirm" , "-S" , "mingw-w64-x86_64-{}" .format (dep )]) # , stdout=sp.PIPE)
5757 printf ("Done." )
5858 sp .call (["cmake" , "." , "-G" , "MinGW Makefiles" ])
5959 sp .call (["mingw32-make" ])
@@ -151,12 +151,16 @@ def copy_to_target(self, target: str):
151151 shutil .copyfile (p , t )
152152 else :
153153 printf ("Copying {}" .format (p ))
154- shutil .copyfile (p , os .path .join (target , os .path .basename (p )))
154+ target_file = os .path .join (target , os .path .basename (p ))
155+ try :
156+ shutil .copyfile (p , target_file )
157+ except shutil .SameFileError :
158+ continue
155159
156160 specials = {} # loaders.cache is used to specify abspaths to the loaders
157161 specials .update ({"libpixbufloader-{}.dll" .format (fmt ): "/lib/gdk-pixbuf-2.0/2.10.0/loaders/"
158162 for fmt in ["ani" , "bmp" , "gif" , "icns" , "ico" , "jpeg" , "png" , "pnm" , "qtif" , "svg" , "tga" , "tiff" , "xbm" , "xpm" ]})
159- DependencyWalker ("libtksvg.dll" , specials = specials ).copy_to_target ("tksvg" )
163+ DependencyWalker ("tksvg/ libtksvg.dll" , specials = specials ).copy_to_target ("tksvg" )
160164 kwargs = {"package_data" : {"tksvg" : ["*.dll" , "pkgIndex.tcl" , "tksvg.tcl" ] + ["{}/{}" .format (dir .strip ("/" ), base ) for base , dir in specials .items ()]}}
161165
162166else :
0 commit comments