[oatpp] Add new port and vcpkg.json (#14341)

24 files changed, 223 insertions, 47 deletions

diff --git a/ports/oatpp-consul/CONTROL b/ports/oatpp-consul/CONTROL
deleted file mode 100644
index 573634766..000000000
--- a/ports/oatpp-consul/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: oatpp-consul
-Version: 1.2.0
-Port-Version: 1
-Description: OAT++ Modern web framework consul module
-Build-Depends: oatpp
-Homepage: https://github.com/oatpp/oatpp-consul
diff --git a/ports/oatpp-consul/vcpkg.json b/ports/oatpp-consul/vcpkg.json
new file mode 100644
index 000000000..663067153
--- /dev/null
+++ b/ports/oatpp-consul/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "oatpp-consul",
+  "version-string": "1.2.0",
+  "port-version": 1,
+  "description": "OAT++ Modern web framework consul module.",
+  "homepage": "https://github.com/oatpp/oatpp-consul",
+  "dependencies": [
+    "oatpp"
+  ]
+}
diff --git a/ports/oatpp-curl/CONTROL b/ports/oatpp-curl/CONTROL
deleted file mode 100644
index 5fbb30fc7..000000000
--- a/ports/oatpp-curl/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: oatpp-curl
-Version: 1.2.0
-Port-Version: 2
-Description: Oat++ Modern web framework curl module to use libcurl as a RequestExecutor on the oatpp's ApiClient
-Build-Depends: curl,oatpp
-Homepage: https://github.com/oatpp/oatpp-curl
diff --git a/ports/oatpp-curl/vcpkg.json b/ports/oatpp-curl/vcpkg.json
new file mode 100644
index 000000000..c7dc30359
--- /dev/null
+++ b/ports/oatpp-curl/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "oatpp-curl",
+  "version-string": "1.2.0",
+  "port-version": 2,
+  "description": "Oat++ Modern web framework curl module to use libcurl as a RequestExecutor on the oatpp's ApiClient.",
+  "homepage": "https://github.com/oatpp/oatpp-curl",
+  "dependencies": [
+    "curl",
+    "oatpp"
+  ]
+}
diff --git a/ports/oatpp-libressl/CONTROL b/ports/oatpp-libressl/CONTROL
deleted file mode 100644
index 9fdfada64..000000000
--- a/ports/oatpp-libressl/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: oatpp-libressl
-Version: 1.2.0
-Port-Version: 1
-Build-Depends: libressl, oatpp
-Description: Oat++ libressl module providing secure server and client connection providers
-Homepage: https://github.com/oatpp/oatpp-libressl
diff --git a/ports/oatpp-libressl/portfile.cmake b/ports/oatpp-libressl/portfile.cmake
index 23f70de88..b44def0f4 100644
--- a/ports/oatpp-libressl/portfile.cmake
+++ b/ports/oatpp-libressl/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO oatpp/oatpp-libressl
     REF cd2e9a515131e5e7dc043c591e952e12cd63db2c # 1.2.0
-    SHA512 f6400e3d3976de1ab0d220f4c7bd84cbeafa6263671511a7ac113f855ad6a63470cab0571320d37ccd55a768ef9f3ca61adfa9066aadfd61bd00f5020c90777c
+    SHA512 e6d208edddff5373c07887b76fc808733bd363c340e740047ae90317874b73a5ef71e5cbbb0f9b1b48632c7a78709858a5ff0de81bc39207961e3642c0104010
     HEAD_REF master
     PATCHES "libress-submodule-downgrade-required-libressl-version.patch"
 )
diff --git a/ports/oatpp-libressl/vcpkg.json b/ports/oatpp-libressl/vcpkg.json
new file mode 100644
index 000000000..132a18006
--- /dev/null
+++ b/ports/oatpp-libressl/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "oatpp-libressl",
+  "version-string": "1.2.0",
+  "port-version": 1,
+  "description": "Oat++ libressl module providing secure server and client connection providers.",
+  "homepage": "https://github.com/oatpp/oatpp-libressl",
+  "dependencies": [
+    "libressl",
+    "oatpp"
+  ]
+}
diff --git a/ports/oatpp-mbedtls/CONTROL b/ports/oatpp-mbedtls/CONTROL
deleted file mode 100644
index 235cbbe5b..000000000
--- a/ports/oatpp-mbedtls/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: oatpp-mbedtls
-Version: 1.2.0
-Port-Version: 1
-Build-Depends: mbedtls, oatpp
-Description: Oat++ Mbed TLS submodule providing secure server and client connection providers
-Homepage: https://github.com/oatpp/oatpp-mbedtls
diff --git a/ports/oatpp-mbedtls/vcpkg.json b/ports/oatpp-mbedtls/vcpkg.json
new file mode 100644
index 000000000..9381a26e3
--- /dev/null
+++ b/ports/oatpp-mbedtls/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "oatpp-mbedtls",
+  "version-string": "1.2.0",
+  "port-version": 1,
+  "description": "Oat++ Mbed TLS submodule providing secure server and client connection providers.",
+  "homepage": "https://github.com/oatpp/oatpp-mbedtls",
+  "dependencies": [
+    "mbedtls",
+    "oatpp"
+  ]
+}
diff --git a/ports/oatpp-mongo/no-designatore-expression.patch b/ports/oatpp-mongo/no-designatore-expression.patch
new file mode 100644
index 000000000..f82620487
--- /dev/null
+++ b/ports/oatpp-mongo/no-designatore-expression.patch
@@ -0,0 +1,24 @@
+diff --git a/src/oatpp-mongo/bson/Utils.cpp b/src/oatpp-mongo/bson/Utils.cpp
+index c848c59..32a9e4c 100644
+--- a/src/oatpp-mongo/bson/Utils.cpp
++++ b/src/oatpp-mongo/bson/Utils.cpp
+@@ -34,7 +34,8 @@ Utils::BO_TYPE Utils::FLOAT_BO = detectFloatBO();
+ 
+ Utils::BO_TYPE Utils::detectIntBO() {
+   BO_TYPE result = BO_TYPE::UNKNOWN;
+-  BO_CHECK check {.i64 = 255};
++  BO_CHECK check;
++  check.i64 = 255;
+   if(check.bytes[0] == 255) {
+     result = BO_TYPE::LITTLE;
+   } else if(check.bytes[7] == 255) {
+@@ -45,7 +46,8 @@ Utils::BO_TYPE Utils::detectIntBO() {
+ 
+ Utils::BO_TYPE Utils::detectFloatBO() {
+   BO_TYPE result = BO_TYPE::UNKNOWN;
+-  BO_CHECK check {.f64 = 2.0};
++  BO_CHECK check;
++  check.f64 = 2.0;
+   if(check.bytes[0] > 0) {
+     result = BO_TYPE::NETWORK;
+   } else if(check.bytes[7] > 0) {
diff --git a/ports/oatpp-mongo/portfile.cmake b/ports/oatpp-mongo/portfile.cmake
new file mode 100644
index 000000000..a04bd44e0
--- /dev/null
+++ b/ports/oatpp-mongo/portfile.cmake
@@ -0,0 +1,30 @@
+set(OATPP_VERSION "1.2.0")
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO oatpp/oatpp-mongo
+    REF ebfad69af3db61c3f989ec2ec30ebd582e3a4073 # 1.2.0
+    SHA512 6cba529b258b26e8456e10089a127e9ef2b4e683f9d4e37551ed71887978ba22ba796d4af6db6558e20812428dff8ba95d1de540de0675a6563ac6b941c91921
+    HEAD_REF master
+    PATCHES
+        no-designatore-expression.patch # https://github.com/oatpp/oatpp-mongo/pull/5
+)
+
+set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
+set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PREFER_NINJA
+    OPTIONS
+        "-DOATPP_BUILD_TESTS:BOOL=OFF"
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-mongo-${OATPP_VERSION})
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/oatpp-mongo/vcpkg.json b/ports/oatpp-mongo/vcpkg.json
new file mode 100644
index 000000000..9e3e610ae
--- /dev/null
+++ b/ports/oatpp-mongo/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "oatpp-mongo",
+  "version-string": "1.2.0",
+  "port-version": 1,
+  "description": "Oat++ MongoDB adapter for Oat++ ORM (native client). It contains DTO to BSON mapper plus database driver.",
+  "homepage": "https://github.com/oatpp/oatpp-mongo",
+  "dependencies": [
+    "oatpp"
+  ]
+}
diff --git a/ports/oatpp-postgresql/portfile.cmake b/ports/oatpp-postgresql/portfile.cmake
new file mode 100644
index 000000000..410f1971c
--- /dev/null
+++ b/ports/oatpp-postgresql/portfile.cmake
@@ -0,0 +1,28 @@
+set(OATPP_VERSION "1.2.0")
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO oatpp/oatpp-postgresql
+    REF 349d610084375c46be95d50ce10b787ae6c2baf4 # 1.2.0
+    SHA512 2faa688077020bbe64807be85d8d61e5aa84163a044d42df0a3b1701cf82048ff0322acb72d4e757a38403e14cba6a7a766daa965862e04756e483d9b750a365
+    HEAD_REF master
+)
+
+set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
+set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PREFER_NINJA
+    OPTIONS
+        "-DOATPP_BUILD_TESTS:BOOL=OFF"
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-postgresql-${OATPP_VERSION})
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/oatpp-postgresql/vcpkg.json b/ports/oatpp-postgresql/vcpkg.json
new file mode 100644
index 000000000..4872bbb3d
--- /dev/null
+++ b/ports/oatpp-postgresql/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "oatpp-postgresql",
+  "version-string": "1.2.0",
+  "port-version": 1,
+  "description": "Oat++ PostgreSQL adapter for Oat++ ORM (alpha - not all datatypes are supported).",
+  "homepage": "https://github.com/oatpp/oatpp-postgresql",
+  "dependencies": [
+    "libpq",
+    "oatpp"
+  ]
+}
diff --git a/ports/oatpp-sqlite/CONTROL b/ports/oatpp-sqlite/CONTROL
deleted file mode 100644
index d0ec33e77..000000000
--- a/ports/oatpp-sqlite/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: oatpp-sqlite
-Version: 1.2.0
-Description: OAT++ Modern web framework sqlite module
-Build-Depends: oatpp,sqlite3
-Homepage: https://github.com/oatpp/oatpp-sqlite
diff --git a/ports/oatpp-sqlite/vcpkg.json b/ports/oatpp-sqlite/vcpkg.json
new file mode 100644
index 000000000..6a81099eb
--- /dev/null
+++ b/ports/oatpp-sqlite/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "oatpp-sqlite",
+  "version-string": "1.2.0",
+  "port-version": 1,
+  "description": "Oat++ SQLite adapter for Oat++ ORM.",
+  "homepage": "https://github.com/oatpp/oatpp-sqlite",
+  "dependencies": [
+    "oatpp",
+    "sqlite3"
+  ]
+}
diff --git a/ports/oatpp-swagger/CONTROL b/ports/oatpp-swagger/CONTROL
deleted file mode 100644
index 19858661e..000000000
--- a/ports/oatpp-swagger/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: oatpp-swagger
-Version: 1.2.0
-Port-Version: 1
-Description: Oat++ OpenApi (Swagger) UI submodule
-Build-Depends: oatpp
-Homepage: https://github.com/oatpp/oatpp-swagger
diff --git a/ports/oatpp-swagger/vcpkg.json b/ports/oatpp-swagger/vcpkg.json
new file mode 100644
index 000000000..d1764af44
--- /dev/null
+++ b/ports/oatpp-swagger/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "oatpp-swagger",
+  "version-string": "1.2.0",
+  "port-version": 1,
+  "description": "Oat++ OpenApi (Swagger) UI submodule.",
+  "homepage": "https://github.com/oatpp/oatpp-swagger",
+  "dependencies": [
+    "oatpp"
+  ]
+}
diff --git a/ports/oatpp-websocket/CONTROL b/ports/oatpp-websocket/CONTROL
deleted file mode 100644
index ca110b0ec..000000000
--- a/ports/oatpp-websocket/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: oatpp-websocket
-Version: 1.2.0
-Port-Version: 1
-Description: Oat++ websocket module
-Build-Depends: oatpp
-Homepage: https://github.com/oatpp/oatpp-websocket
diff --git a/ports/oatpp-websocket/vcpkg.json b/ports/oatpp-websocket/vcpkg.json
new file mode 100644
index 000000000..629a468bd
--- /dev/null
+++ b/ports/oatpp-websocket/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "oatpp-websocket",
+  "version-string": "1.2.0",
+  "port-version": 1,
+  "description": "Oat++ websocket module.",
+  "homepage": "https://github.com/oatpp/oatpp-websocket",
+  "dependencies": [
+    "oatpp"
+  ]
+}
diff --git a/ports/oatpp-zlib/portfile.cmake b/ports/oatpp-zlib/portfile.cmake
new file mode 100644
index 000000000..d441a8522
--- /dev/null
+++ b/ports/oatpp-zlib/portfile.cmake
@@ -0,0 +1,28 @@
+set(OATPP_VERSION "1.2.0")
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO oatpp/oatpp-zlib
+    REF b3a0c1d140175d8ec43ebbe1da9ac46e2baa142c # 1.2.0
+    SHA512 a6a012ad5294f994a5a65a57ccfd8b9af77515d0c203d04193a2202996b3a831f314c0847a3f5ebc1867835fbd0c438284142c070998ed26881fdc1110a3c5ad
+    HEAD_REF master
+)
+
+set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
+set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
+
+vcpkg_configure_cmake(
+    SOURCE_PATH "${SOURCE_PATH}"
+    PREFER_NINJA
+    OPTIONS
+        "-DOATPP_BUILD_TESTS:BOOL=OFF"
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-zlib-${OATPP_VERSION})
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/oatpp-zlib/vcpkg.json b/ports/oatpp-zlib/vcpkg.json
new file mode 100644
index 000000000..394d90a74
--- /dev/null
+++ b/ports/oatpp-zlib/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "oatpp-zlib",
+  "version-string": "1.2.0",
+  "port-version": 1,
+  "description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.",
+  "homepage": "https://github.com/oatpp/oatpp-zlib",
+  "dependencies": [
+    "oatpp"
+  ]
+}
diff --git a/ports/oatpp/CONTROL b/ports/oatpp/CONTROL
deleted file mode 100644
index c0c7cf31e..000000000
--- a/ports/oatpp/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: oatpp
-Version: 1.2.0
-Port-Version: 1
-Description: Modern web framework
-Homepage: https://github.com/oatpp/oatpp
diff --git a/ports/oatpp/vcpkg.json b/ports/oatpp/vcpkg.json
new file mode 100644
index 000000000..bd5ab4dde
--- /dev/null
+++ b/ports/oatpp/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "oatpp",
+  "version-string": "1.2.0",
+  "port-version": 1,
+  "description": "Modern web framework.",
+  "homepage": "https://github.com/oatpp/oatpp"
+}