зеркало из https://github.com/microsoft/vcpkg.git
[freetds, unixodbc] Update (#24279)
* [freetds] Update to 1.3.10 * version * Add dependence on mysql * version * mysql patch * version * Add warning for required system libs * version * Remove mysql dependence * version * Fix supports * version * Add mysql dependence * version * Add feature tools * version * Add dependency on unixodbc * format * version * remove mysql * version * Update unixodbc * version * remove man * version * fix cmake * version * test * fix path * version * disable wide characters on UNIX * add to ci baseline * version * don't check for UWP * version * remove unixodbc from ci baseline * Fix deprecated license * version * Unsupported on unix * version
This commit is contained in:
Thomas1664
GitHub
Родитель
32d25e6b85
Коммит
b25a13c578
|
|
@ -0,0 +1,94 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7ac6cc58..1a6a4f0e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -64,9 +64,9 @@ math(EXPR BUILD_NUMBER "${BUILD_NUMBER}")
|
||||
|
||||
set(FREETDS_TOPDIR ${CMAKE_CURRENT_LIST_DIR})
|
||||
|
||||
-enable_testing()
|
||||
-set(CMAKE_CTEST_COMMAND ctest)
|
||||
-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
|
||||
+#enable_testing()
|
||||
+#set(CMAKE_CTEST_COMMAND ctest)
|
||||
+#add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
|
||||
|
||||
# TODO depends on configure
|
||||
add_definitions(-D_REENTRANT -D_THREAD_SAFE)
|
||||
@@ -459,9 +459,11 @@ add_subdirectory(src/tds)
|
||||
add_subdirectory(src/ctlib)
|
||||
add_subdirectory(src/dblib)
|
||||
add_subdirectory(src/odbc)
|
||||
-add_subdirectory(src/apps)
|
||||
+if(WITH_TOOLS)
|
||||
+ add_subdirectory(src/apps)
|
||||
+ add_subdirectory(src/pool)
|
||||
+endif()
|
||||
add_subdirectory(src/server)
|
||||
-add_subdirectory(src/pool)
|
||||
|
||||
configure_file(${CMAKE_BINARY_DIR}/include/config.h.in ${CMAKE_BINARY_DIR}/include/config.h)
|
||||
configure_file(${CMAKE_SOURCE_DIR}/include/tds_sysdep_public.h.in ${CMAKE_BINARY_DIR}/include/tds_sysdep_public.h)
|
||||
diff --git a/src/ctlib/CMakeLists.txt b/src/ctlib/CMakeLists.txt
|
||||
index e83b0b1a..017d571a 100644
|
||||
--- a/src/ctlib/CMakeLists.txt
|
||||
+++ b/src/ctlib/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-add_subdirectory(unittests)
|
||||
+#add_subdirectory(unittests)
|
||||
|
||||
set(static_lib_name ct)
|
||||
if(WIN32)
|
||||
diff --git a/src/dblib/CMakeLists.txt b/src/dblib/CMakeLists.txt
|
||||
index 5f1766f4..c70e87a3 100644
|
||||
--- a/src/dblib/CMakeLists.txt
|
||||
+++ b/src/dblib/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-add_subdirectory(unittests)
|
||||
+#add_subdirectory(unittests)
|
||||
|
||||
if(WIN32)
|
||||
set(win_SRCS winmain.c dblib.def dbopen.c)
|
||||
diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt
|
||||
index ec8eaadd..6f9f32c9 100644
|
||||
--- a/src/odbc/CMakeLists.txt
|
||||
+++ b/src/odbc/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-add_subdirectory(unittests)
|
||||
+#add_subdirectory(unittests)
|
||||
|
||||
# TODO checks
|
||||
add_definitions(-DUNIXODBC -DHAVE_SQLGETPRIVATEPROFILESTRING)
|
||||
diff --git a/src/replacements/CMakeLists.txt b/src/replacements/CMakeLists.txt
|
||||
index 48d7e536..f7b490f8 100644
|
||||
--- a/src/replacements/CMakeLists.txt
|
||||
+++ b/src/replacements/CMakeLists.txt
|
||||
@@ -41,7 +41,7 @@ if (NOT WIN32)
|
||||
set_target_properties(replacements PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
||||
endif()
|
||||
|
||||
-add_subdirectory(unittests)
|
||||
+#add_subdirectory(unittests)
|
||||
|
||||
|
||||
INSTALL(TARGETS replacements
|
||||
diff --git a/src/tds/CMakeLists.txt b/src/tds/CMakeLists.txt
|
||||
index 134a30cb..5426571b 100644
|
||||
--- a/src/tds/CMakeLists.txt
|
||||
+++ b/src/tds/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-add_subdirectory(unittests)
|
||||
+#add_subdirectory(unittests)
|
||||
|
||||
if(PERL_FOUND AND NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tds_willconvert.h")
|
||||
if (NOT GPERF)
|
||||
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
|
||||
index 2a1935c9..a46483e0 100644
|
||||
--- a/src/utils/CMakeLists.txt
|
||||
+++ b/src/utils/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-add_subdirectory(unittests)
|
||||
+#add_subdirectory(unittests)
|
||||
|
||||
if(WIN32)
|
||||
set(add_SRCS md5.c)
|
||||
|
|
@ -1,19 +1,22 @@
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO freetds/freetds
|
||||
REF 16f7a6280c7a19bfe5c60e5d61cc08e3f2dff991 # See https://github.com/microsoft/vcpkg/pull/14120#issuecomment-715896755
|
||||
REF v1.3.10
|
||||
HEAD_REF master
|
||||
SHA512 34ff10764156bac24444a74b636fafa56adc0097a62a3f3249d4bc09a0cdcaa88aa0c4f26761260c56dd47edf738ff68f647e045f32cac28e0be7f6760f7f90b
|
||||
SHA512 78b494c04e3436bfdc4997e6f0196baef27246bb7ad825c487a16f247d13c99324a39d52bfe8f5306164ae3f5c7eb43ca83944b24a3ce6b4bcd733849b4064ad
|
||||
PATCHES
|
||||
disable-tests.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
openssl WITH_OPENSSL
|
||||
tools WITH_TOOLS
|
||||
)
|
||||
|
||||
vcpkg_find_acquire_program(PERL)
|
||||
get_filename_component(PERL_PATH ${PERL} DIRECTORY)
|
||||
vcpkg_add_to_path(${PERL_PATH})
|
||||
vcpkg_add_to_path("${PERL_PATH}")
|
||||
|
||||
if (VCPKG_TARGET_IS_WINDOWS)
|
||||
vcpkg_find_acquire_program(GPERF)
|
||||
|
|
@ -25,48 +28,34 @@ else()
|
|||
endif()
|
||||
endif()
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS ${FEATURE_OPTIONS}
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqldb.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqlodbc.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/datacopy.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/defncopy.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/freebcp.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tdspool.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tsql.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqldb)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/bsqlodbc)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/datacopy)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/defncopy)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/freebcp)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tdspool)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/tsql)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqldb.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqlodbc.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/datacopy.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/defncopy.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/freebcp.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tdspool.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tsql.exe)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqldb)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/bsqlodbc)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/datacopy)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/defncopy)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/freebcp)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tdspool)
|
||||
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tsql)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
|
||||
set(_WCHAR_SUPPORT ON)
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
set(_WCHAR_SUPPORT OFF)
|
||||
endif()
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS
|
||||
${FEATURE_OPTIONS}
|
||||
-DENABLE_ODBC_WIDE=${_WCHAR_SUPPORT}
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
if("tools" IN_LIST FEATURES)
|
||||
vcpkg_copy_tools(TOOL_NAMES bsqldb bsqlodbc datacopy defncopy freebcp tdspool tsql AUTO_CLEAN)
|
||||
if(EXISTS "${CURRENT_PACKAGES_DIR}/etc")
|
||||
file(INSTALL "${CURRENT_PACKAGES_DIR}/etc" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/etc")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/debug/etc")
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
||||
endif()
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,24 @@
|
|||
{
|
||||
"name": "freetds",
|
||||
"version": "1.2.11",
|
||||
"port-version": 2,
|
||||
"version": "1.3.10",
|
||||
"description": "Implementation of the Tabular Data Stream protocol",
|
||||
"homepage": "https://www.freetds.org",
|
||||
"license": "GPL-2.0-only",
|
||||
"supports": "windows & !uwp",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "libmysql",
|
||||
"platform": "windows"
|
||||
},
|
||||
{
|
||||
"name": "unixodbc",
|
||||
"platform": "!windows"
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
}
|
||||
],
|
||||
"default-features": [
|
||||
"openssl"
|
||||
],
|
||||
|
|
@ -14,6 +28,9 @@
|
|||
"dependencies": [
|
||||
"openssl"
|
||||
]
|
||||
},
|
||||
"tools": {
|
||||
"description": "Build tools"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO lurcher/unixODBC
|
||||
REF v2.3.9
|
||||
SHA512 473f8d39f5976b4c34394d880d6e511b73e33a1fbd6b828a0929787983cd9b5fe7e16776ed51776ce44b54aa61c62be689c0731489b3989acb99c135fb492ec5
|
||||
REF 6c8071b1bef4e4991e7b3023a1c1c712168a818e # v2.3.11
|
||||
SHA512 5c5b189e3b62935fdee5e25f5cf9b41fb2bc68fc9bd1652cab1b109032ab586978ba14d19e83328838b55e773f099046344bb4c84ec99edac309650ed863543e
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
|
@ -35,16 +34,19 @@ file(REMOVE_RECURSE
|
|||
"${CURRENT_PACKAGES_DIR}/debug/etc"
|
||||
"${CURRENT_PACKAGES_DIR}/etc"
|
||||
"${CURRENT_PACKAGES_DIR}/share/man"
|
||||
"${CURRENT_PACKAGES_DIR}/share/${PORT}/man1"
|
||||
"${CURRENT_PACKAGES_DIR}/share/${PORT}/man5"
|
||||
"${CURRENT_PACKAGES_DIR}/share/${PORT}/man7"
|
||||
)
|
||||
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define BIN_PREFIX \"${CURRENT_INSTALLED_DIR}/tools/unixodbc/bin\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define DEFLIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define EXEC_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define INCLUDE_PREFIX \"${CURRENT_INSTALLED_DIR}/include\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define LIB_PREFIX \"${CURRENT_INSTALLED_DIR}/lib\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define PREFIX \"${CURRENT_INSTALLED_DIR}\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define SYSTEM_FILE_PATH \"${CURRENT_INSTALLED_DIR}/etc\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixodbc_conf.h" "#define SYSTEM_LIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define BIN_PREFIX \"${CURRENT_INSTALLED_DIR}/tools/unixodbc/bin\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define DEFLIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define EXEC_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define INCLUDE_PREFIX \"${CURRENT_INSTALLED_DIR}/include\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define LIB_PREFIX \"${CURRENT_INSTALLED_DIR}/lib\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define PREFIX \"${CURRENT_INSTALLED_DIR}\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define SYSTEM_FILE_PATH \"${CURRENT_INSTALLED_DIR}/etc\"" "")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unixODBC/unixodbc_conf.h" "#define SYSTEM_LIB_PATH \"${CURRENT_INSTALLED_DIR}/lib\"" "")
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unixodbcConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
The package unixodbc is compatible with built-in CMake targets:
|
||||
|
||||
FIND_PACKAGE(unixodbc REQUIRED)
|
||||
TARGET_LINK_LIBRARIES(main PRIVATE UNIX::odbc) for linkage
|
||||
find_package(unixodbc REQUIRED)
|
||||
target_link_libraries(main PRIVATE UNIX::odbc)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"name": "unixodbc",
|
||||
"version": "2.3.9",
|
||||
"port-version": 1,
|
||||
"version": "2.3.11",
|
||||
"description": "unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX",
|
||||
"homepage": "https://github.com/lurcher/unixODBC",
|
||||
"license": "LGPL-2.1-only",
|
||||
"supports": "osx | linux"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1183,13 +1183,6 @@ unicorn-lib:x64-uwp=fail
|
|||
unittest-cpp:arm64-windows=fail
|
||||
unittest-cpp:arm-uwp=fail
|
||||
unittest-cpp:x64-uwp=fail
|
||||
unixodbc:arm64-windows=fail
|
||||
unixodbc:arm-uwp=fail
|
||||
unixodbc:x64-uwp=fail
|
||||
unixodbc:x64-windows=fail
|
||||
unixodbc:x64-windows-static=fail
|
||||
unixodbc:x64-windows-static-md=fail
|
||||
unixodbc:x86-windows=fail
|
||||
urdfdom:x64-windows-static=fail
|
||||
usd:x86-windows=fail
|
||||
uthenticode:arm-uwp=fail
|
||||
|
|
|
|||
|
|
@ -2337,8 +2337,8 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"freetds": {
|
||||
"baseline": "1.2.11",
|
||||
"port-version": 2
|
||||
"baseline": "1.3.10",
|
||||
"port-version": 0
|
||||
},
|
||||
"freetype": {
|
||||
"baseline": "2.11.1",
|
||||
|
|
@ -7213,8 +7213,8 @@
|
|||
"port-version": 3
|
||||
},
|
||||
"unixodbc": {
|
||||
"baseline": "2.3.9",
|
||||
"port-version": 1
|
||||
"baseline": "2.3.11",
|
||||
"port-version": 0
|
||||
},
|
||||
"unqlite": {
|
||||
"baseline": "1.1.9",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "c388be84a1c4bb7156aaf173f1ee348d500db8ad",
|
||||
"version": "1.3.10",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "d3cbd323de7835a0dc5239e8b51b20f783121bdb",
|
||||
"version": "1.2.11",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3042b55f1c0ecd0d27336b24754a6f5f3a746c03",
|
||||
"version": "2.3.11",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "68ea55f1c4679d7585ab6482d1641bfb6b106b23",
|
||||
"version": "2.3.9",
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче