Skip to content

Commit 935866e

Browse files
SNOW-1865263 remove VS14 support from libsnowflakeclient (#828)
1 parent 954c938 commit 935866e

9 files changed

+24
-28
lines changed

Jenkinsfile

-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ timestamps {
1919
def jobs = [
2020
'Linux' : { build job: 'LibSfClient-Linux-Release', parameters: params },
2121
'Linux-aarch64' : { build job: 'LibSfClient-Linux-aarch64-Release', parameters: params },
22-
'Win32-VS14' : { build job: 'LibSfClient-Win32-VS14-Release', parameters: params },
2322
'Win32-VS17' : { build job: 'LibSfClient-Win32-VS17-Release', parameters: params },
24-
'Win64-VS14' : { build job: 'LibSfClient-Win64-VS14-Release', parameters: params },
2523
'Win64-VS17' : { build job: 'LibSfClient-Win64-VS17-Release', parameters: params },
2624
'Macaarch64' : { build job: 'LibSfClient-Macaarch64-Universal-Release', parameters: params }
2725
]

scripts/_init.bat

+1-6
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,8 @@ if /I "%vs_version%"=="VS15" (
8484
set cmake_generator=Visual Studio 15 2017
8585
set vsdir=vs15
8686
)
87-
if /I "%vs_version%"=="VS14" (
88-
set cmake_generator=Visual Studio 14 2015
89-
set vsdir=vs14
90-
set ARROW_FROM_SOURCE=0
91-
)
9287
if "%cmake_generator%"=="" (
93-
echo Specify the VS_VERSION to the Visual Studio Version [VS17, VS16, VS15, VS14]
88+
echo Specify the VS_VERSION to the Visual Studio Version [VS17, VS16, VS15]
9489
goto :error
9590
)
9691

scripts/_init.sh

+1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ export BUILD_WITH_PROFILE_OPTION=
143143
export BUILD_SOURCE_ONLY=
144144
export GET_VERSION=
145145
target=Release
146+
OPTIND=1
146147
while getopts ":hvpt:s" opt; do
147148
case $opt in
148149
t) target=$OPTARG ;;

scripts/build_all_debug.sh

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash -e
2+
#
3+
# Build Dependencies
4+
#
5+
6+
SFLC_DIR="$( dirname $( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) )"
7+
set -e
8+
rm -rf $SFLC_DIR/deps-build/darwin
9+
rm -rf $SFLC_DIR/deps/
10+
git checkout $SFLC_DIR/deps/
11+
12+
for x in arrow cmocka zlib openssl oob uuid curl awssdk azuresdk libsnowflakeclient ; do
13+
echo Building $x...
14+
ARROW_FROM_SOURCE=1 ARCH=arm64 $SFLC_DIR/scripts/build_$x.sh -t Debug;
15+
done

scripts/build_curl.bat

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
@echo off
66
set CURL_SRC_VERSION=8.10.1
7-
set CURL_BUILD_VERSION=4
7+
set CURL_BUILD_VERSION=5
88
set CURL_VERSION=%CURL_SRC_VERSION%.%CURL_BUILD_VERSION%
99
call %*
1010
goto :EOF
@@ -59,9 +59,6 @@ if "%vs_version%"=="VS16" (
5959
if "%vs_version%"=="VS15" (
6060
set vc_version=15
6161
)
62-
if "%vs_version%"=="VS14" (
63-
set vc_version=14
64-
)
6562

6663
call "%scriptdir%utils.bat" :setup_visual_studio %vs_version%
6764

scripts/build_curl.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ function usage() {
1313
set -o pipefail
1414

1515
CURL_SRC_VERSION=8.10.1
16-
CURL_BUILD_VERSION=4
16+
CURL_BUILD_VERSION=5
1717
CURL_VERSION=${CURL_SRC_VERSION}.${CURL_BUILD_VERSION}
1818

1919
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
20-
source $DIR/_init.sh
20+
source $DIR/_init.sh $@
2121
source $DIR/utils.sh
2222

2323
[[ -n "$GET_VERSION" ]] && echo $CURL_VERSION && exit 0

scripts/build_dependencies.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
:: Build Dependencies
33
::
44
:: Prerequisite:
5-
:: - VC 2015, 2017, 2019 or 2022
5+
:: - VC 2017, 2019 or 2022
66
:: Arguments:
77
:: - x86 / x64
88
:: - Debug / Release
9-
:: - vs14 / vs15 / vs16 / vs17
9+
:: - vs15 / vs16 / vs17
1010
:: - ON / OFF
1111
@echo off
1212

scripts/build_uuid.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ function usage() {
1414

1515
set -o pipefail
1616
UUID_SRC_VERSION=2.39.0
17-
UUID_BUILD_VERSION=5
17+
UUID_BUILD_VERSION=6
1818
UUID_VERSION=$UUID_SRC_VERSION.$UUID_BUILD_VERSION
1919

2020
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
21-
source $DIR/_init.sh
21+
source $DIR/_init.sh $@
2222
source $DIR/utils.sh
2323
[[ -n "$GET_VERSION" ]] && echo $UUID_VERSION && exit 0
2424

scripts/utils.bat

-10
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@ goto :EOF
2828
)
2929
goto :EOF
3030
)
31-
if /I "%~1"=="VS14" (
32-
if not "%VisualStudioVersion%"=="14.0" (
33-
echo === setting up the Visual Studio 14 environments
34-
call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch%
35-
:: installation of vs 14 on new jenkins nodes causes switching current directory - let's go back to workspace
36-
set curdir=%WORKSPACE%
37-
cd %curdir%
38-
)
39-
goto :EOF
40-
)
4131
if not defined VisualStudioVersion (
4232
echo === ERROR: no VisualStudioVersion is set. %~1
4333
goto :error

0 commit comments

Comments
 (0)