Skip to content

Commit 7d4b1a8

Browse files
committed
More feedback
1 parent 2d3bc48 commit 7d4b1a8

2 files changed

Lines changed: 10 additions & 11 deletions

File tree

.github/workflows/cpp_extra.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ jobs:
515515
uses: actions/upload-artifact@v7
516516
with:
517517
name: flight-sql-odbc-pkg-installer-${{ matrix.architecture }}
518-
path: build/cpp/ArrowFlightSqlOdbc-*.pkg
518+
path: build/cpp/ArrowFlightSQLODBC-*.pkg
519519
if-no-files-found: error
520520
- name: Register Flight SQL ODBC Driver
521521
run: |

cpp/src/arrow/flight/sql/odbc/CMakeLists.txt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,11 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
132132
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Apache Arrow Flight SQL ODBC Driver")
133133
set(CPACK_PACKAGE_CONTACT "dev@arrow.apache.org")
134134

135-
# GH-47877 TODO: set up `arrow_flight_sql_odbc` component for Linux Installer
136135
if(WIN32)
137136
# Install ODBC and its Arrow dependencies
138137
install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
139138
DESTINATION bin
140-
COMPONENT arrow_flight_sql_odbc)
139+
COMPONENT ArrowFlightSQLODBC)
141140
install(TARGETS arrow_shared
142141
arrow_compute_shared
143142
arrow_flight_shared
@@ -149,7 +148,7 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
149148
"ext-ms-.*"
150149
POST_EXCLUDE_REGEXES
151150
".*system32/.*\\.dll"
152-
RUNTIME DESTINATION bin COMPONENT arrow_flight_sql_odbc)
151+
RUNTIME DESTINATION bin COMPONENT ArrowFlightSQLODBC)
153152

154153
set(CPACK_WIX_EXTRA_SOURCES
155154
"${CMAKE_CURRENT_SOURCE_DIR}/install/windows/arrow-flight-sql-odbc.wxs")
@@ -161,14 +160,14 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
161160
else()
162161
if(APPLE)
163162
set(CPACK_PACKAGE_FILE_NAME
164-
"ArrowFlightSqlOdbc-${CPACK_PACKAGE_VERSION_MAJOR}.${ODBC_PACKAGE_VERSION_MINOR}.${ODBC_PACKAGE_VERSION_PATCH}"
163+
"ArrowFlightSQLODBC-${CPACK_PACKAGE_VERSION_MAJOR}.${ODBC_PACKAGE_VERSION_MINOR}.${ODBC_PACKAGE_VERSION_PATCH}"
165164
)
166165
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
167166

168167
set(CPACK_SET_DESTDIR ON)
169168
set(CPACK_INSTALL_PREFIX "/Library/ODBC")
170169
# Register ODBC after install
171-
set(CPACK_POSTFLIGHT_ARROW_FLIGHT_SQL_ODBC_SCRIPT
170+
set(CPACK_POSTFLIGHT_ARROWFLIGHTSQLODBC_SCRIPT
172171
"${CMAKE_CURRENT_SOURCE_DIR}/install/mac/postinstall")
173172
set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/install/mac/README.txt")
174173
set(CPACK_RESOURCE_FILE_WELCOME
@@ -187,12 +186,12 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
187186
# Install ODBC
188187
install(TARGETS arrow_flight_sql_odbc_shared
189188
DESTINATION "${ODBC_INSTALL_DIR}"
190-
COMPONENT arrow_flight_sql_odbc)
189+
COMPONENT ArrowFlightSQLODBC)
191190

192191
# Install temporary driver registration scripts, they will be removed after driver registration is complete
193192
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/install/unix/install_odbc.sh"
194193
DESTINATION "${ODBC_INSTALL_DIR}"
195-
COMPONENT arrow_flight_sql_odbc
194+
COMPONENT ArrowFlightSQLODBC
196195
PERMISSIONS OWNER_EXECUTE
197196
OWNER_WRITE
198197
OWNER_READ
@@ -202,7 +201,7 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
202201
WORLD_READ)
203202
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/install/unix/install_odbc_ini.sh"
204203
DESTINATION "${ODBC_INSTALL_DIR}"
205-
COMPONENT arrow_flight_sql_odbc
204+
COMPONENT ArrowFlightSQLODBC
206205
PERMISSIONS OWNER_EXECUTE
207206
OWNER_WRITE
208207
OWNER_READ
@@ -221,7 +220,7 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
221220
endif()
222221

223222
get_cmake_property(CPACK_COMPONENTS_ALL COMPONENTS)
224-
set(CPACK_COMPONENTS_ALL "arrow_flight_sql_odbc")
223+
set(CPACK_COMPONENTS_ALL "ArrowFlightSQLODBC")
225224

226225
if(WIN32)
227226
# WiX msi installer on Windows
@@ -243,7 +242,7 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
243242

244243
# Load CPack after all CPACK* variables are set
245244
include(CPack)
246-
cpack_add_component(arrow_flight_sql_odbc
245+
cpack_add_component(ArrowFlightSQLODBC
247246
DISPLAY_NAME "ODBC library"
248247
DESCRIPTION "Apache Arrow Flight SQL ODBC library bin, required to install"
249248
REQUIRED)

0 commit comments

Comments
 (0)