From 4842acc1539b1851a940533ee556090bbdaf905d Mon Sep 17 00:00:00 2001 From: Jeff Raymakers Date: Sun, 23 Jun 2024 11:42:01 -0700 Subject: [PATCH] try fix win --- generate-wrapper.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/generate-wrapper.py b/generate-wrapper.py index 2d6bb418..6c122d29 100644 --- a/generate-wrapper.py +++ b/generate-wrapper.py @@ -238,7 +238,7 @@ def get_lib_file_name(): raise Exception("Unsupported system: " + system) if __name__ == "__main__": - dir_path = os.path.dirname(os.path.realpath(__file__)) + # dir_path = os.path.dirname(os.path.realpath(__file__)) with tempfile.TemporaryDirectory() as zip_tmp: zip_path = os.path.join(zip_tmp, "libduckdb.zip") @@ -246,16 +246,27 @@ def get_lib_file_name(): release_zip_url = get_release_zip_url() print("Downloading " + release_zip_url) urllib.request.urlretrieve(release_zip_url, zip_path) + print("Downloaded " + zip_path) - print("Extracting zip") + print("Opening zip") zip = zipfile.ZipFile(zip_path) with tempfile.TemporaryDirectory() as ext_tmp: lib_file_name = get_lib_file_name() + print("Lib file name is " + lib_file_name) + + print("Extracting lib file to temp dir: " + ext_tmp) zip.extract(lib_file_name, ext_tmp) - shutil.copy(os.path.join(ext_tmp, lib_file_name), os.path.join(dir_path, "lib", "binding", "libduckdb")) + extracted_lib_file_path = os.path.join(ext_tmp, lib_file_name) + target_lib_file_path = os.path.join("lib", "binding", "libduckdb") + + print("Copying lib to " + target_lib_file_path) + shutil.copy(extracted_lib_file_path, target_lib_file_path) + + print("Extracting duckdb.h to src") zip.extract("duckdb.h", "src") + print("Extracting duckdb.h to temp dir " + ext_tmp) zip.extract("duckdb.h", ext_tmp) print("Preprocessing duckdb.h") @@ -266,7 +277,7 @@ def get_lib_file_name(): print("Generating C code and TypeScript definitions") cpp_result, types_result = create_func_defs(os.path.join(ext_tmp, "duckdb-preprocessed.h")) - out = open(os.path.join(dir_path, "src", "duckdb_node_generated.cpp"), 'wb') + out = open(os.path.join("src", "duckdb_node_generated.cpp"), 'wb') out.write('''// This file is generated by generate-wrapper.py, please do not edit #include "duckdb.h"