separate py scripts for each os

alt/bindings/.gitignore

@@ -1,2 +1,3 @@
 libduckdb
-package/lib/*
+package/lib/*
+__pycache__

alt/bindings/binding.gyp

@@ -6,39 +6,27 @@
       'conditions': [
         ['OS=="linux"', {
           'variables': {
-            'script_path': '<(module_root_dir)/scripts/fetch_libduckdb.py',
-            'script_args': [
-              '<(module_root_dir)/libduckdb',
-              'https://github.com/duckdb/duckdb/releases/download/v1.0.0/libduckdb-linux-amd64.zip',
-            ],
+            'script_path': '<(module_root_dir)/scripts/fetch_libduckdb_linux.py',
           },
         }],
         ['OS=="mac"', {
           'variables': {
-            'script_path': '<(module_root_dir)/scripts/fetch_libduckdb.py',
-            'script_args': [
-              '<(module_root_dir)/libduckdb',
-              'https://github.com/duckdb/duckdb/releases/download/v1.0.0/libduckdb-osx-universal.zip',
-            ],
+            'script_path': '<(module_root_dir)/scripts/fetch_libduckdb_mac.py',
           },
         }],
         ['OS=="win"', {
           'variables': {
             'script_path': '<(module_root_dir)/scripts/fetch_libduckdb_win.py',
-            'script_args': [
-              '<(module_root_dir)/libduckdb',
-              # zip url is hard-coded into fetch_libduckdb_win.py to work around file path issues on Windows
-            ],
           },
         }],
       ],
       'actions': [
         {
           'action_name': 'run_fetch_libduckdb_script',
-          'message': 'Running fetch libduckdb script',
+          'message': 'Fetching and extracting libduckdb',
           'inputs': [],
-          'action': ['python3', '<(script_path)', '<@(script_args)'],
-          'outputs': ['<(module_root_dir)/libduckdb/libduckdb.zip'],
+          'action': ['python3', '<(script_path)'],
+          'outputs': ['<(module_root_dir)/libduckdb'],
         },
       ],
     },

alt/bindings/package.json

@@ -3,9 +3,9 @@
   "scripts": {
     "configure": "node-gyp configure",
     "build": "node-gyp build",
-    "clean": "npm run clean:downloads && npm run clean:gyp && npm run clean:package",
-    "clean:downloads": "rimraf downloads",
+    "clean": "npm run clean:gyp && npm run clean:libduckdb && npm run clean:package",
     "clean:gyp": "node-gyp clean",
+    "clean:libduckdb": "rimraf libduckdb",
     "clean:package": "rimraf package/lib"
   },
   "dependencies": {

alt/bindings/scripts/fetch_libduckdb.py

@@ -1,18 +1,16 @@
 import os
-import sys
 import urllib.request
 import zipfile
 
-output_dir = sys.argv[1]
-zip_url = sys.argv[2]
+def fetch_libduckdb(zip_url, output_dir, files):
+  if not os.path.exists(output_dir):
+    os.makedirs(output_dir)
+
+  local_zip_path = os.path.join(output_dir, "libduckdb.zip")
+  print("fetching: " + zip_url)
+  urllib.request.urlretrieve(zip_url, local_zip_path)
 
-print("output_dir: " + output_dir)
-print("zip_url: " + zip_url)
-
-local_zip_path = os.path.join(output_dir, "libduckdb.zip")
-print("fetching: " + zip_url)
-urllib.request.urlretrieve(zip_url, local_zip_path)
-
-zip = zipfile.ZipFile(local_zip_path)
-print("extracting: " + ", ".join(zip.namelist()))
-zip.extractall(output_dir)
+  zip = zipfile.ZipFile(local_zip_path)
+  for file in files:
+    print("extracting: " + file)
+    zip.extract(file, output_dir)

alt/bindings/scripts/fetch_libduckdb_linux.py

@@ -0,0 +1,10 @@
+from fetch_libduckdb import fetch_libduckdb
+
+zip_url = "https://github.com/duckdb/duckdb/releases/download/v1.0.0/libduckdb-linux-amd64.zip"
+output_dir = "libduckdb"
+files = [
+  "duckdb.h",
+  "libduckdb.so",
+]
+
+fetch_libduckdb(zip_url, output_dir, files)

alt/bindings/scripts/fetch_libduckdb_mac.py

@@ -0,0 +1,10 @@
+from fetch_libduckdb import fetch_libduckdb
+
+zip_url = "https://github.com/duckdb/duckdb/releases/download/v1.0.0/libduckdb-osx-universal.zip"
+output_dir = "libduckdb"
+files = [
+  "duckdb.h",
+  "libduckdb.dylib",
+]
+
+fetch_libduckdb(zip_url, output_dir, files)

alt/bindings/scripts/fetch_libduckdb_win.py

@@ -1,18 +1,11 @@
-import os
-import sys
-import urllib.request
-import zipfile
+from fetch_libduckdb import fetch_libduckdb
 
-output_dir = sys.argv[1]
 zip_url = "https://github.com/duckdb/duckdb/releases/download/v1.0.0/libduckdb-windows-amd64.zip"
-
-print("output_dir: " + output_dir)
-print("zip_url: " + zip_url)
-
-local_zip_path = os.path.join(output_dir, "libduckdb.zip")
-print("fetching: " + zip_url)
-urllib.request.urlretrieve(zip_url, local_zip_path)
-
-zip = zipfile.ZipFile(local_zip_path)
-print("extracting: " + ", ".join(zip.namelist()))
-zip.extractall(output_dir)
+output_dir = "libduckdb"
+files = [
+  "duckdb.h",
+  "duckdb.lib",
+  "duckdb.dll",
+]
+
+fetch_libduckdb(zip_url, output_dir, files)