Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ocilib] Update to 4.7.0 #13158

Merged
merged 7 commits into from
Oct 30, 2020
Merged

[ocilib] Update to 4.7.0 #13158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c94c244
[ocilib] Update to 4.7.0
JonLiu1993 Aug 26, 2020
2c758e7
[ocilib] Update to 4.7.0
JonLiu1993 Aug 26, 2020
559ed45
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Sep 5, 2020
792792c
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
JonLiu1993 Oct 29, 2020
76dec77
[ocilib] Update to 4.7.1
JonLiu1993 Oct 29, 2020
60f3c36
ocilib need update to 4.7.1
JonLiu1993 Oct 29, 2020
663567a
[ocilib] Update to 4.7.1
JonLiu1993 Oct 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ports/ocilib/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Source: ocilib
Version: 4.6.4
Port-Version: 2
Version: 4.7.1
Homepage: https://vrogier.github.io/ocilib/
Description: OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.
Supports: !(arm|uwp)
13 changes: 0 additions & 13 deletions ports/ocilib/out_of_source_build_version_file_configure.patch
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions ports/ocilib/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO vrogier/ocilib
REF v4.6.4
SHA512 83f5614a23c8fb4ab02517dec95d8b490c5ef472302735d5cc4cf483cc51513cc81ae2e1b4618c7c73fb5b071efe422e463b46fa79492ccb4775b511a943295a
REF 8573bce60d4aa4ac421445149003424fc7a69e6d v4.7.1
SHA512 862c2df2f8e356bfafda32bba2c4564464104afea047b6297241a5ec2da9e1d73f3cd33f55e5bcd0018fb1b3625e756c22baf6821ab51c789359266f989137c8
HEAD_REF master
PATCHES
out_of_source_build_version_file_configure.patch
)

if(VCPKG_TARGET_IS_WINDOWS)
Expand Down Expand Up @@ -46,6 +44,10 @@ if(VCPKG_TARGET_IS_WINDOWS)

file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug)
file(COPY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
endif()
else()
vcpkg_configure_make(
COPY_SOURCE
Expand Down
1 change: 0 additions & 1 deletion scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,6 @@ nvtt:x64-uwp=fail
ocilib:arm64-windows=fail
ocilib:arm-uwp=fail
ocilib:x64-uwp=fail
ocilib:x64-windows-static=fail
octomap:arm-uwp=fail
octomap:x64-uwp=fail
ode:arm64-windows=fail
Expand Down