mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:28:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[sqlpp11] update to 0.61 (#25458)

Browse Source 
* Update the sqlpp11 port to version 0.61 + SQLite3

* Update the sqlpp11 version to 0.61

* Update dependencies in sqlpp11 ports

* Update sqlpp11 and its connectors versions

* Update files according to the maintainer guide

* Update the sqlpp11 version

* Update SHA512

* Version instead of version-string

* Update the sqlpp11 version

* Version-string instead of version

* Version update

* Vesrion update after script

* Update according to checks

* Replace connector ports by empty one

* Update the sqlite3 connector port to dummy one

* Remove non exsistent sqlpp11 sqlite3 version

* Make the mysql connector port as obsolete

* Format vcpkg.json in sqlpp11's ports

* Update sqlpp11's ports versions

* Backward compatibility in the mysql connector

* Update version in sqlpp11's mysql connector

* Remove non exsistent sqlpp11 mysql version
This commit is contained in:
JeffyOLOLO 2022-07-06 01:35:30 +03:00 committed by GitHub
parent 497e1e56a9
commit e2fb66462a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 110 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ports/sqlpp11-connector-mysql/portfile.cmake
View File

@ -1,27 +1 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO rbock/sqlpp11-connector-mysql
REF 0.29
SHA512 0c71d2ea94933be3bbaa8d6afaac7059660bdb0af5ba905844d95facb5e73a122c3ccd723a48a7fd8db0c028309ac6dc8b91c6838dfbfe530727161d62a1481f
HEAD_REF master
)
# Use sqlpp11-connector-mysql's own build process, skipping tests
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DENABLE_TESTS:BOOL=OFF
-DDATE_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
-DSQLPP11_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
-DMYSQL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/mysql
)
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-mysql RENAME copyright)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

28
ports/sqlpp11-connector-mysql/vcpkg.json
View File

@ -1,13 +1,9 @@
{
"name": "sqlpp11-connector-mysql",
"version-string": "0.29",
"port-version": 2,
"description": "A C++ wrapper for MySQL meant to be used in combination with sqlpp11.",
"version": "0.61",
"description": "A C++ wrapper for MySQL meant to be used in combination with sqlpp11 (obsolete, use sqlpp11 with the mariadb/mysql feature instead)",
"homepage": "https://github.com/rbock/sqlpp11-connector-mysql",
"dependencies": [
"date",
"sqlpp11"
],
"license": "BSD-2-Clause",
"default-features": [
"mariadb"
],
@ -15,13 +11,27 @@
"mariadb": {
"description": "Use MariaDB connector",
"dependencies": [
"libmariadb"
{
"name": "sqlpp11",
"default-features": false,
"features": [
"mariadb"
],
"version>=": "0.61"
}
]
},
"mysql": {
"description": "Use MySQL connector",
"dependencies": [
"libmysql"
{
"name": "sqlpp11",
"default-features": false,
"features": [
"mysql"
],
"version>=": "0.61"
}
]
}
}

26
ports/sqlpp11-connector-sqlite3/portfile.cmake
View File

@ -1,25 +1 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO rbock/sqlpp11-connector-sqlite3
REF a06d6944a55349fbd0ab0337c45d80c6efa2ff81 # 0.30
SHA512 51efe8914b5ccf8092e15a9a7b29798db070ce0b47bb87b212724e209149c3a81821a3841ac317f506356430d87d3f16a066c74f60ad1ad7bf1333c9de36916b
HEAD_REF master
)
# Use sqlpp11-connector-sqlite3's own build process, skipping tests
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DENABLE_TESTS:BOOL=OFF
-DSQLPP11_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
)
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-sqlite3 RENAME copyright)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

18
ports/sqlpp11-connector-sqlite3/vcpkg.json
View File

@ -1,11 +1,17 @@
{
"name": "sqlpp11-connector-sqlite3",
"version-string": "0.30",
"port-version": 1,
"description": "A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11.",
"version": "0.61",
"description": "A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11 (obsolete, use sqlpp11 with the sqlite3 feature instead)",
"homepage": "https://github.com/rbock/sqlpp11-connector-sqlite3",
"license": "BSD-2-Clause",
"dependencies": [
"date",
"sqlite3",
"sqlpp11"
{
"name": "sqlpp11",
"default-features": false,
"features": [
"sqlite3"
],
"version>=": "0.61"
}
]
}

12
ports/sqlpp11/ddl2cpp_path.patch
View File

@ -1,9 +1,9 @@
diff --git a/cmake/Sqlpp11Config.cmake b/cmake/Sqlpp11Config.cmake
index 18ea9b1..730bce1 100644
--- a/cmake/Sqlpp11Config.cmake
+++ b/cmake/Sqlpp11Config.cmake
@@ -32,7 +32,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/Sqlpp11Targets.cmake")
diff --git a/cmake/configs/Sqlpp11Config.cmake b/cmake/configs/Sqlpp11Config.cmake
index c50a71a..96d0c5b 100644
--- a/cmake/configs/Sqlpp11Config.cmake
+++ b/cmake/configs/Sqlpp11Config.cmake
@@ -51,7 +51,7 @@ endforeach()
# Import "ddl2cpp" script
if(NOT TARGET sqlpp11::ddl2cpp)
- get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../../bin/sqlpp11-ddl2cpp" REALPATH)

20
ports/sqlpp11/fix-dependency.patch
View File

@ -1,20 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8de9fa..82dd632 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,14 +32,11 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
include(CTest)
-
-### Dependencies
-add_subdirectory(dependencies)
-
### Main targets
add_library(sqlpp11 INTERFACE)
add_library(sqlpp11::sqlpp11 ALIAS sqlpp11)
+find_package(date CONFIG REQUIRED)
target_link_libraries(sqlpp11 INTERFACE date::date)
target_include_directories(sqlpp11 INTERFACE

27
ports/sqlpp11/portfile.cmake
View File

@ -1,26 +1,35 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO rbock/sqlpp11
REF 085713d4d301aeb58e7d14f44cfac6ce35fe2e77 # 0.60
SHA512 835536482def61c9978cda58507a7f5983b99765f69e7865cf5597b06075dc3e7ad4a3be0b2de2e44e4a4c3a6998115bf567ff586fb656cf5d95a0a7465fb2fe
REF 2bc89b34ad3cc37b6bca9a44a3529ff2d8fe211f # 0.61
SHA512 6e2496959749422987aca21f333abb01648702b85e02acc711bbac398ca6a67d8be93a3d89fc1f8bad5446865725ff9bcc053e6229cb34627120b59469426266
HEAD_REF master
PATCHES
ddl2cpp_path.patch
fix-dependency.patch
)
# Use sqlpp11's own build process, skipping tests
vcpkg_configure_cmake(
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
sqlite3 BUILD_SQLITE3_CONNECTOR
mariadb BUILD_MARIADB_CONNECTOR
mysql BUILD_MYSQL_CONNECTOR
)
# Use sqlpp11's own build process
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DENABLE_TESTS:BOOL=OFF
-DBUILD_TESTING:BOOL=OFF
# Use vcpkg as source for the date library
-DUSE_SYSTEM_DATE:BOOL=ON
${FEATURE_OPTIONS}
)
vcpkg_install_cmake()
vcpkg_cmake_install()
# Move CMake config files to the right place
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Sqlpp11 TARGET_PATH share/${PORT})
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Sqlpp11)
# Delete redundant and unnecessary directories
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/cmake ${CURRENT_PACKAGES_DIR}/include/date)

36
ports/sqlpp11/vcpkg.json
View File

@ -1,10 +1,38 @@
{
"name": "sqlpp11",
"version-string": "0.60",
"port-version": 1,
"version": "0.61",
"description": "A type safe embedded domain specific language for SQL queries and results in C++.",
"homepage": "https://github.com/rbock/sqlpp11",
"license": "BSD-2-Clause",
"dependencies": [
"date"
]
"date",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"mariadb": {
"description": "Use MariaDB connector",
"dependencies": [
"libmariadb"
]
},
"mysql": {
"description": "Use MySQL connector",
"dependencies": [
"libmysql"
]
},
"sqlite3": {
"description": "Use SQLite3 connector",
"dependencies": [
"sqlite3"
]
}
}
}

12
versions/baseline.json
View File

@ -6813,16 +6813,16 @@
"port-version": 1
},
"sqlpp11": {
"baseline": "0.60",
"port-version": 1
"baseline": "0.61",
"port-version": 0
},
"sqlpp11-connector-mysql": {
"baseline": "0.29",
"port-version": 2
"baseline": "0.61",
"port-version": 0
},
"sqlpp11-connector-sqlite3": {
"baseline": "0.30",
"port-version": 1
"baseline": "0.61",
"port-version": 0
},
"squirrel": {
"baseline": "2021-09-17",

5
versions/s-/sqlpp11-connector-mysql.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2e15caf6d82c3e2b8ad27294a18ea745d7713b28",
"version": "0.61",
"port-version": 0
},
{
"git-tree": "be46edaef7e1c02783398222e4e73f288848e537",
"version-string": "0.29",

5
versions/s-/sqlpp11-connector-sqlite3.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c2465fd92079797d39eddc691a6938933e0b6624",
"version": "0.61",
"port-version": 0
},
{
"git-tree": "476b94c2a6be8d48ef3360793ed0b4569b4614d4",
"version-string": "0.30",

5
versions/s-/sqlpp11.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0013607524d7c0803705193bbf09b1254fab14ff",
"version": "0.61",
"port-version": 0
},
{
"git-tree": "572562b44cd15b26fd8cdf68dff2c53d6ec0619d",
"version-string": "0.60",