Python / R include fixes

apache · Jul 6, 2024 · 377f130 · 377f130
1 parent 7df3fb4
commit 377f130
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/go/adbc/drivermgr/wrapper.go b/go/adbc/drivermgr/wrapper.go
@@ -24,7 +24,7 @@ package drivermgr
 // #if !defined(ADBC_EXPORTING)
 // #define ADBC_EXPORTING
 // #endif
-// #include "adbc.h"
+// #include "arrow-adbc/adbc.h"
 // #include <stdlib.h>
 // #include <string.h>
 //

diff --git a/python/adbc_driver_manager/setup.py b/python/adbc_driver_manager/setup.py
@@ -30,9 +30,10 @@
 # ------------------------------------------------------------
 # Resolve C++ Sources
 
-incdir = source_root.joinpath("arrow-adbc")
+target_dir = source_root / "adbc_driver_manager"
+incdir = target_dir / "arrow-adbc"
 incdir.mkdir(parents=True, exist_ok=True)
-shutil.copy("c/include/arrow-adbc/adbc.h", incdir / "adbc.h")
+shutil.copy(repo_root / "c/include/arrow-adbc/adbc.h", incdir / "adbc.h")
 
 sources = [
     "c/driver_manager/adbc_driver_manager.cc",
@@ -43,7 +44,7 @@
 for source in sources:
     target_filename = source.split("/")[-1]
     source = repo_root.joinpath(source).resolve()
-    target = source_root.joinpath("adbc_driver_manager", target_filename).resolve()
+    target = (target_dir / target_filename).resolve()
     if source.is_file():
         # In-tree build/creating an sdist: copy from project root to local file
         # so that setuptools isn't confused

diff --git a/r/adbcdrivermanager/bootstrap.R b/r/adbcdrivermanager/bootstrap.R
@@ -19,6 +19,7 @@
 # implementation from the repo. We also run this from configure, so do nothing
 # if we aren't sitting within the repo (e.g., installing a source package from a
 # tarball).
+dir.create("src/arrow-adbc", showWarnings=FALSE)
 file.copy("../../c/include/arrow-adbc/adbc.h", "src/arrow-adbc/adbc.h")
 
 files_to_vendor <- c(

diff --git a/r/adbcflightsql/bootstrap.R b/r/adbcflightsql/bootstrap.R
@@ -31,8 +31,8 @@ files_to_vendor_dst <- file.path("src/go/adbc", files_to_vendor)
 # is not a problem for a user install, where this script
 # should not even exist, but the below helps development
 # on Windows.
-is_adbc_h <- basename(files_to_vendor_src) == "arrow/adbc.h"
-files_to_vendor_src[is_adbc_h] <- "../../c/include/arrow-adbc/adbc.h"
+dir.create("src/arrow-adbc", showWarnings=FALSE)
+file.copy("../../c/include/arrow-adbc/adbc.h", "src/arrow-adbc/adbc.h")
 
 if (all(file.exists(files_to_vendor_src))) {
   unlink("src/go/adbc", recursive = TRUE)

diff --git a/r/adbcpostgresql/bootstrap.R b/r/adbcpostgresql/bootstrap.R
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
+dir.create("src/arrow-adbc", showWarnings=FALSE)
 file.copy("c/include/arrow-adbc/adbc.h", "src/arrow-adbc/adbc.h")
 
 # If we are building within the repo, copy the latest adbc.h and driver source

diff --git a/r/adbcsnowflake/bootstrap.R b/r/adbcsnowflake/bootstrap.R
@@ -31,8 +31,8 @@ files_to_vendor_dst <- file.path("src/go/adbc", files_to_vendor)
 # is not a problem for a user install, where this script
 # should not even exist, but the below helps development
 # on Windows.
-is_adbc_h <- basename(files_to_vendor_src) == "adbc.h"
-files_to_vendor_src[is_adbc_h] <- "../../c/include/arrow-adbc/adbc.h"
+dir.create("src/arrow-adbc", showWarnings=FALSE)
+file.copy("../../c/include/arrow-adbc/adbc.h", "src/arrow-adbc/adbc.h")
 
 if (all(file.exists(files_to_vendor_src))) {
   unlink("src/go/adbc", recursive = TRUE)

diff --git a/r/adbcsqlite/bootstrap.R b/r/adbcsqlite/bootstrap.R
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
+dir.create("src/arrow-adbc", showWarnings=FALSE)
 file.copy("c/include/arrow-adbc/adbc.h", "src/arrow-adbc/adbc.h")
 
 # If we are building within the repo, copy the latest adbc.h and driver source