Fix OpenSSL libraries path in MSI packaging

nmariz · nmariz · commit bec514ebe953 · 2018-01-11T20:54:01.000Z
diff --git a/cpyint b/cpyint
@@ -1 +1 @@
-Subproject commit bb26135a768193b58a8ec8f395df1d1da52e9588
+Subproject commit 8fb170ac7091161ba8743f5f6a1ab88b6cc2979a
diff --git a/lib/cpy_distutils.py b/lib/cpy_distutils.py
@@ -317,9 +317,11 @@ def _copy_vendor_libraries(self):
         if os.name == "nt":
             openssl_libs = ["ssleay32.dll", "libeay32.dll"]
             vendor_folder = ""
+            mysql_capi = os.path.join(self.with_mysql_capi, "bin")
         elif platform.system() == "Darwin":
             openssl_libs = ["libssl.1.0.0.dylib", "libcrypto.1.0.0.dylib"]
-            vendor_folder = os.path.join("mysql-vendor")
+            vendor_folder = "mysql-vendor"
+            mysql_capi = os.path.join(self.with_mysql_capi, "lib")
         else:
             return
 
@@ -331,7 +333,7 @@ def _copy_vendor_libraries(self):
         log.info("Copying OpenSSL libraries")
         for filename in openssl_libs:
             data_files.append(os.path.join(vendor_folder, filename))
-            src = os.path.join(self.with_mysql_capi, "lib", filename)
+            src = os.path.join(mysql_capi, filename)
             dst = os.path.join(os.getcwd(), vendor_folder)
             log.info("copying {0} -> {1}".format(src, dst))
             shutil.copy(src, dst)
