R/Python fixes

apache · Jul 3, 2024 · 14cfda4 · 14cfda4
1 parent e839a88
commit 14cfda4
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 15 deletions.
diff --git a/.github/workflows/native-unix.yml b/.github/workflows/native-unix.yml
@@ -22,7 +22,6 @@ on:
     branches:
       - main
     paths:
-      - "adbc.h"
       - "c/**"
       - "ci/**"
       - "docs/**"
@@ -33,7 +32,6 @@ on:
       - ".github/workflows/native-unix.yml"
   push:
     paths:
-      - "adbc.h"
       - "c/**"
       - "ci/**"
       - "docs/**"

diff --git a/.github/workflows/native-windows.yml b/.github/workflows/native-windows.yml
@@ -22,7 +22,6 @@ on:
     branches:
       - main
     paths:
-      - "adbc.h"
       - "c/**"
       - "ci/**"
       - "glib/**"
@@ -32,7 +31,6 @@ on:
       - ".github/workflows/native-windows.yml"
   push:
     paths:
-      - "adbc.h"
       - "c/**"
       - "ci/**"
       - "glib/**"

diff --git a/c/meson.build b/c/meson.build
@@ -29,8 +29,8 @@ project(
     ]
 )
 
-add_project_arguments('-Wno-int-conversion', '-Wno-unused-parameter', language: 'c')
-add_project_arguments('-Wno-unused-parameter', '-Wno-reorder', language: 'cpp')
+add_project_arguments('-Wno-int-conversion', '-Wno-unused-parameter', '-Werror=strict-aliasing', '-flto', language: 'c')
+add_project_arguments('-Wno-unused-parameter', '-Wno-reorder', '-Werror=strict-aliasing', '-flto', language: 'cpp')
 
 c_dir = include_directories('.')
 include_dir = include_directories('include')

diff --git a/ci/conda/meta.yaml b/ci/conda/meta.yaml
@@ -39,17 +39,17 @@ outputs:
       run:
     test:
       commands:
-        - test -f $PREFIX/include/adbc.h                                         # [unix]
-        - test -f $PREFIX/include/adbc_driver_manager.h                          # [unix]
+        - test -f $PREFIX/include/arrow-adbc/adbc.h                              # [unix]
+        - test -f $PREFIX/include/arrow-adbc/adbc_driver_manager.h               # [unix]
         - test -d $PREFIX/lib/cmake/AdbcDriverManager/                           # [unix]
         - test -f $PREFIX/lib/pkgconfig/adbc-driver-manager.pc                   # [unix]
         - test ! -f $PREFIX/lib/libadbc_driver_manager.a                         # [unix]
         - test -f $PREFIX/lib/libadbc_driver_manager.so                          # [linux]
         - test -f $PREFIX/lib/libadbc_driver_manager.dylib                       # [osx]
 
         - if not exist %LIBRARY_BIN%\adbc_driver_manager.dll exit 1              # [win]
-        - if not exist %LIBRARY_INC%\adbc.h exit 1                               # [win]
-        - if not exist %LIBRARY_INC%\adbc_driver_manager.h exit 1                # [win]
+        - if not exist %LIBRARY_INC%\arrow-adbc\adbc.h exit 1                    # [win]
+        - if not exist %LIBRARY_INC%\arrow-adbc\adbc_driver_manager.h exit 1     # [win]
         - if not exist %LIBRARY_LIB%\adbc_driver_manager.lib exit 1              # [win]
         - if not exist %LIBRARY_LIB%\cmake\AdbcDriverManager exit 1              # [win]
         - if not exist %LIBRARY_LIB%\pkgconfig\adbc-driver-manager.pc exit 1     # [win]

diff --git a/python/adbc_driver_manager/setup.py b/python/adbc_driver_manager/setup.py
@@ -31,7 +31,7 @@
 # Resolve C++ Sources
 
 sources = [
-    "adbc.h",
+    "c/include/adbc.h",
     "c/driver_manager/adbc_driver_manager.cc",
     "c/driver_manager/adbc_driver_manager.h",
     "c/vendor/backward/backward.hpp",

diff --git a/r/adbcdrivermanager/bootstrap.R b/r/adbcdrivermanager/bootstrap.R
@@ -20,7 +20,7 @@
 # if we aren't sitting within the repo (e.g., installing a source package from a
 # tarball).
 files_to_vendor <- c(
-  "../../adbc.h",
+  "../../c/include/adbc.h",
   "../../c/driver_manager/adbc_driver_manager.h",
   "../../c/driver_manager/adbc_driver_manager.cc",
   "../../c/driver/common/driver_base.h"

diff --git a/r/adbcflightsql/bootstrap.R b/r/adbcflightsql/bootstrap.R
@@ -32,7 +32,7 @@ files_to_vendor_dst <- file.path("src/go/adbc", files_to_vendor)
 # 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] <- "../../adbc.h"
+files_to_vendor_src[is_adbc_h] <- "../../c/include/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
@@ -18,7 +18,7 @@
 # If we are building within the repo, copy the latest adbc.h and driver source
 # into src/
 source_files <- c(
-  "adbc.h",
+  "c/include/adbc.h",
   "c/driver/common/options.h",
   "c/driver/common/utils.c",
   "c/driver/common/utils.h",

diff --git a/r/adbcsqlite/bootstrap.R b/r/adbcsqlite/bootstrap.R
@@ -18,7 +18,7 @@
 # If we are building within the repo, copy the latest adbc.h and driver source
 # into src/
 source_files <- c(
-  "adbc.h",
+  "c/include/adbc.h",
   "c/driver/sqlite/sqlite.cc",
   "c/driver/sqlite/statement_reader.c",
   "c/driver/sqlite/statement_reader.h",