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/21 18:30:04 UTC
[arrow-adbc] branch main updated: chore(dev/release): fix file paths used in Windows wheel build (#832)
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 11fbbc13 chore(dev/release): fix file paths used in Windows wheel build (#832)
11fbbc13 is described below
commit 11fbbc139f10403951879678583f113ac35c2814
Author: David Li <li...@gmail.com>
AuthorDate: Wed Jun 21 14:29:58 2023 -0400
chore(dev/release): fix file paths used in Windows wheel build (#832)
Fixes #831.
---
ci/scripts/python_wheel_windows_build.bat | 12 +++---------
dev/release/utils-prepare.sh | 4 ++++
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/ci/scripts/python_wheel_windows_build.bat b/ci/scripts/python_wheel_windows_build.bat
index b8c39985..32c0cf9b 100644
--- a/ci/scripts/python_wheel_windows_build.bat
+++ b/ci/scripts/python_wheel_windows_build.bat
@@ -27,20 +27,14 @@ 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)
%VCPKG_ROOT%\vcpkg install --triplet=%VCPKG_TARGET_TRIPLET% libpq sqlite3
IF %errorlevel% NEQ 0 EXIT /B %errorlevel%
-set ADBC_FLIGHTSQL_LIBRARY=%build_dir%\flightsql\adbc_driver_flightsql.dll
-
mkdir %build_dir%
-pushd %source_dir%\go\adbc\pkg
-go build -tags driverlib -o %ADBC_FLIGHTSQL_LIBRARY% -buildmode=c-shared ./flightsql
-IF %errorlevel% NEQ 0 EXIT /B %errorlevel%
-popd
-
pushd %build_dir%
cmake ^
@@ -61,10 +55,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.5.0.0
+set ADBC_FLIGHTSQL_LIBRARY=%build_dir%\bin\adbc_driver_flightsql.dll%ADBC_VERSION_DLL_SUFFIX%
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.5.0.0
+set ADBC_SNOWFLAKE_LIBRARY=%build_dir%\bin\adbc_driver_snowflake.dll%ADBC_VERSION_DLL_SUFFIX%
popd
diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index 2cf5b557..bf450865 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -44,6 +44,10 @@ 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