You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by li...@apache.org on 2023/06/24 17:23:57 UTC
[arrow-adbc] branch main updated: build(c): properly install missing symlink on Windows (#846)
This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new f96a6153 build(c): properly install missing symlink on Windows (#846)
f96a6153 is described below
commit f96a615397f0ec8de3099b2908149109189ea5ab
Author: David Li <li...@gmail.com>
AuthorDate: Sat Jun 24 13:23:52 2023 -0400
build(c): properly install missing symlink on Windows (#846)
Also see #634.
Fixes #840.
---------
Co-authored-by: Sutou Kouhei <ko...@cozmixng.org>
---
c/cmake_modules/GoUtils.cmake | 5 ++++-
ci/scripts/python_wheel_windows_build.bat | 5 ++---
dev/release/utils-prepare.sh | 4 ----
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/c/cmake_modules/GoUtils.cmake b/c/cmake_modules/GoUtils.cmake
index d4852144..aac6f5ac 100644
--- a/c/cmake_modules/GoUtils.cmake
+++ b/c/cmake_modules/GoUtils.cmake
@@ -202,7 +202,10 @@ function(add_go_lib GO_MOD_DIR GO_LIBNAME)
DESTINATION
${CMAKE_INSTALL_LIBDIR})
endif()
- if(NOT WIN32)
+ if(WIN32)
+ # This symlink doesn't get installed
+ install(FILES "${LIBOUT_SHARED}.${ADBC_SO_VERSION}" TYPE BIN)
+ else()
install(FILES "${LIBOUT_SHARED}" "${LIBOUT_SHARED}.${ADBC_SO_VERSION}" TYPE LIB)
endif()
endif()
diff --git a/ci/scripts/python_wheel_windows_build.bat b/ci/scripts/python_wheel_windows_build.bat
index 32c0cf9b..0c7a0aa5 100644
--- a/ci/scripts/python_wheel_windows_build.bat
+++ b/ci/scripts/python_wheel_windows_build.bat
@@ -27,7 +27,6 @@ set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
set CMAKE_UNITY_BUILD=ON
set VCPKG_FEATURE_FLAGS=-manifests
set VCPKG_TARGET_TRIPLET=x64-windows-static
-set ADBC_VERSION_DLL_SUFFIX=.6.0.0
IF NOT DEFINED VCPKG_ROOT (echo "Must set VCPKG_ROOT" && exit /B 1)
@@ -55,10 +54,10 @@ cmake ^
cmake --build . --config %CMAKE_BUILD_TYPE% --target install --verbose -j || exit /B 1
-set ADBC_FLIGHTSQL_LIBRARY=%build_dir%\bin\adbc_driver_flightsql.dll%ADBC_VERSION_DLL_SUFFIX%
+set ADBC_FLIGHTSQL_LIBRARY=%build_dir%\bin\adbc_driver_flightsql.dll
set ADBC_POSTGRESQL_LIBRARY=%build_dir%\bin\adbc_driver_postgresql.dll
set ADBC_SQLITE_LIBRARY=%build_dir%\bin\adbc_driver_sqlite.dll
-set ADBC_SNOWFLAKE_LIBRARY=%build_dir%\bin\adbc_driver_snowflake.dll%ADBC_VERSION_DLL_SUFFIX%
+set ADBC_SNOWFLAKE_LIBRARY=%build_dir%\bin\adbc_driver_snowflake.dll
popd
diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index c56f9575..2cf5b557 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -44,10 +44,6 @@ update_versions() {
git add cmake_modules/AdbcVersion.cmake
popd
- sed -i.bak -E "s/set ADBC_VERSION_DLL_SUFFIX=.+/set ADBC_VERSION_DLL_SUFFIX=.${version}/" "${ADBC_DIR}/ci/scripts/python_wheel_windows_build.bat"
- rm "${ADBC_DIR}/ci/scripts/python_wheel_windows_build.bat.bak"
- git add "${ADBC_DIR}/ci/scripts/python_wheel_windows_build.bat"
-
pushd "${ADBC_DIR}/ci/conda/"
sed -i.bak -E "s/version: .+/version: ${conda_version}/g" meta.yaml
rm meta.yaml.bak