[3fd] Update to 2.6.3, fix port (#14528)

* [3fd] Update to 2.6.3, fix port

* update baseline

* JackBoosY CRs

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>

6 files changed, 26 insertions, 187 deletions

diff --git a/ports/3fd/DataException.patch b/ports/3fd/DataException.patch
deleted file mode 100644
index 106411cc0..000000000
--- a/ports/3fd/DataException.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/3FD/broker_impl_reader.cpp b/3FD/broker_impl_reader.cpp

-index 98bd68a..d5948b5 100644

---- a/3FD/broker_impl_reader.cpp

-+++ b/3FD/broker_impl_reader.cpp

-@@ -185,7 +185,7 @@ namespace broker

- 

-         core::Logger::Write(oss.str(), core::Logger::PRIO_INFORMATION);

-     }

--    catch (Poco::Data::DataException &ex)

-+    catch (Poco::DataException &ex)

-     {

-         CALL_STACK_TRACE;

-         std::ostringstream oss;

-@@ -264,7 +264,7 @@ namespace broker

- 

-             m_messages.reserve(msgCountStepLimit);

-         }

--        catch (Poco::Data::DataException &ex)

-+        catch (Poco::DataException &ex)

-         {

-             CALL_STACK_TRACE;

-             std::ostringstream oss;

-@@ -317,7 +317,7 @@ namespace broker

-             {

-                 core::Logger::Write(ex, core::Logger::PRIO_CRITICAL);

-             }

--            catch (Poco::Data::DataException &ex)

-+            catch (Poco::DataException &ex)

-             {

-                 std::ostringstream oss;

-                 oss << "Failed to end transaction reading messages from broker queue. "

-@@ -520,7 +520,7 @@ namespace broker

-                 m_dbSession.rollback();

-                 return true;

-             }

--            catch (Poco::Data::DataException &ex)

-+            catch (Poco::DataException &ex)

-             {

-                 std::ostringstream oss;

-                 oss << "Failed to rollback transaction reading messages from broker queue. "

-@@ -563,7 +563,7 @@ namespace broker

-                 m_dbSession.commit();

-                 return true;

-             }

--            catch (Poco::Data::DataException &ex)

-+            catch (Poco::DataException &ex)

-             {

-                 std::ostringstream oss;

-                 oss << "Failed to commit transaction reading messages from broker queue. "

-diff --git a/3FD/broker_impl_writer.cpp b/3FD/broker_impl_writer.cpp

-index b237ba4..f9531c4 100644

---- a/3FD/broker_impl_writer.cpp

-+++ b/3FD/broker_impl_writer.cpp

-@@ -241,7 +241,7 @@ namespace broker

- 

-         core::Logger::Write(oss.str(), core::Logger::PRIO_INFORMATION);

-     }

--    catch (Poco::Data::DataException &ex)

-+    catch (Poco::DataException &ex)

-     {

-         CALL_STACK_TRACE;

-         std::ostringstream oss;

-@@ -348,7 +348,7 @@ namespace broker

-             {

-                 core::Logger::Write(ex, core::Logger::PRIO_CRITICAL);

-             }

--            catch (Poco::Data::DataException &ex)

-+            catch (Poco::DataException &ex)

-             {

-                 std::ostringstream oss;

-                 oss << "Failed to end transaction writing messages into broker queue. "

-@@ -405,7 +405,7 @@ namespace broker

-             {

-                 m_future->get();

-             }

--            catch (Poco::Data::DataException &ex)

-+            catch (Poco::DataException &ex)

-             {

-                 std::ostringstream oss;

-                 oss << "Failed to write messages into broker queue. "

-@@ -455,7 +455,7 @@ namespace broker

-                 m_dbSession.rollback();

-                 return true;

-             }

--            catch (Poco::Data::DataException &ex)

-+            catch (Poco::DataException &ex)

-             {

-                 std::ostringstream oss;

-                 oss << "Failed to rollback transaction writing messages into broker queue. "

-@@ -498,7 +498,7 @@ namespace broker

-                 m_dbSession.commit();

-                 return true;

-             }

--            catch (Poco::Data::DataException &ex)

-+            catch (Poco::DataException &ex)

-             {

-                 std::ostringstream oss;

-                 oss << "Failed to commit transaction writing messages into broker queue. "

-@@ -589,7 +589,7 @@ namespace broker

-         {

-             throw; // just forward exceptions from errors known to have been already handled

-         }

--        catch (Poco::Data::DataException &ex)

-+        catch (Poco::DataException &ex)

-         {

-             std::ostringstream oss;

-             oss << "Failed to write messages into broker queue. "

diff --git a/ports/3fd/RapidXML.patch b/ports/3fd/RapidXML.patch
index fdb6cd18e..6373fc287 100644
--- a/ports/3fd/RapidXML.patch
+++ b/ports/3fd/RapidXML.patch
@@ -1,13 +1,10 @@
-diff --git a/3FD/configuration.cpp b/3FD/configuration.cpp
-index b9ca804..207a397 100644
---- a/3FD/configuration.cpp
-+++ b/3FD/configuration.cpp
-@@ -2,7 +2,7 @@
- #include "configuration.h"

- #include "exceptions.h"

- #include "utils_io.h"

--#include <rapidxml.hpp>

-+#include <rapidxml/rapidxml.hpp>

- 

- #ifdef _3FD_PLATFORM_WINRT

- #    include "utils_winrt.h"

+--- a/3FD/xml.h
++++ b/3FD/xml.h
+@@ -4,6 +4,6 @@
+ #include "exceptions.h"
+ #include "utils.h"
+-#include <rapidxml.hpp>
++#include <rapidxml/rapidxml.hpp>
+ 
+ #include <array>
+ #include <algorithm>
diff --git a/ports/3fd/portfile.cmake b/ports/3fd/portfile.cmake
index 67d749b00..03cc7d362 100644
--- a/ports/3fd/portfile.cmake
+++ b/ports/3fd/portfile.cmake
@@ -1,3 +1,5 @@
+vcpkg_fail_port_install(ON_TARGET "osx" "linux")
+
 # Check architecture:
 if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     set(BUILD_ARCH "Win32")
@@ -15,36 +17,29 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
 # Get source code:
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO faburaya/3FD
-    REF v2.6.2
-    SHA512 a2444cc07d8741540c6071ac59bc8c63785db52e412a843aa18a5dfa0144b5001d428e44bcb520238e3d476440bc74526343f025005f05d534e732645f59cbe0
+    REPO faburaya/3fd
+    REF 3a0fe606268721d1560b88dcca8647c67c0b275c # v2.6.3 (Stable)
+    SHA512 70630291b4055de2044ad76ef21e99d6ab6fd3468debb2a864a461cf8513642fe87f116e9dfff96ecff96f4577108493dc25aa40eeefcd93ee75990b13bb7b20
     HEAD_REF master
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/remove-seekpos.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/DataException.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/RapidXML.patch"
+        rapidxml.patch
 )
 
-# Copy the sources to ensure a clean, out-of-source build
-file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all)
-file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all)
-file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all)
-get_filename_component(LAST_DIR_NAME "${SOURCE_PATH}" NAME)
-set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all/${LAST_DIR_NAME}")
-
 # Build:
 if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # UWP:
-    vcpkg_build_msbuild(
-        USE_VCPKG_INTEGRATION
-        PROJECT_PATH ${SOURCE_PATH}/3FD/3FD.WinRT.UWP.vcxproj
+    vcpkg_install_msbuild(
+        SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_SUBPATH "3FD/3FD.WinRT.UWP.vcxproj"
         PLATFORM ${BUILD_ARCH}
+        USE_VCPKG_INTEGRATION
     )
 elseif (NOT VCPKG_CMAKE_SYSTEM_NAME) # Win32:
-    vcpkg_build_msbuild(
-        USE_VCPKG_INTEGRATION
-        PROJECT_PATH ${SOURCE_PATH}/3FD/3FD.vcxproj
+    vcpkg_install_msbuild(
+        SOURCE_PATH "${SOURCE_PATH}"
+        PROJECT_SUBPATH "3FD/3FD.vcxproj"
         PLATFORM ${BUILD_ARCH}
         TARGET Build
+        USE_VCPKG_INTEGRATION
     )
 else()
     message(FATAL_ERROR "Unsupported system: 3FD is not currently ported to VCPKG in ${VCPKG_CMAKE_SYSTEM_NAME}!")
@@ -70,32 +65,6 @@ file(INSTALL
     DESTINATION ${CURRENT_PACKAGES_DIR}/share/3FD
 )
 
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Visual C++, UWP app:
-    file(INSTALL
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.WinRT.UWP/3FD.WinRT.UWP.lib
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.WinRT.UWP/_3FD_WinRT_UWP.pri
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/WinRT.UWP/3FD.WinRT.UWP.pdb
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-    )
-    file(INSTALL
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.WinRT.UWP/3FD.WinRT.UWP.lib
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.WinRT.UWP/_3FD_WinRT_UWP.pri
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/WinRT.UWP/3FD.WinRT.UWP.pdb
-        DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-    )
-else() # Visual C++, Win32 app:
-    file(INSTALL
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.lib
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.pdb
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-    )
-    file(INSTALL
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.lib
-        ${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.pdb
-        DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-    )
-endif()
-
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/3fd RENAME copyright)
 file(INSTALL ${SOURCE_PATH}/Acknowledgements.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/3fd)
diff --git a/ports/3fd/remove-seekpos.patch b/ports/3fd/remove-seekpos.patch
deleted file mode 100644
index 6c77cdc64..000000000
--- a/ports/3fd/remove-seekpos.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/3fd/web_wws_impl_host.cpp b/3fd/web_wws_impl_host.cpp

-index b87dc75..1cff45f 100644

---- a/3fd/web_wws_impl_host.cpp

-+++ b/3fd/web_wws_impl_host.cpp

-@@ -48,7 +48,7 @@ namespace wws

-                 throw AppException<std::runtime_error>(oss.str());

-             }

- 

--            const auto fileSizeBytes = inputStream.seekg(0, std::ios::end).tellg().seekpos(); // move cursor to the end to get the zize

-+            const auto fileSizeBytes = inputStream.seekg(0, std::ios::end).tellg(); // move cursor to the end to get the zize

- 

-             // File is not trunked:

-             if (fileSizeBytes > 0)

diff --git a/ports/3fd/vcpkg.json b/ports/3fd/vcpkg.json
index 92c53d327..9bbfbe830 100644
--- a/ports/3fd/vcpkg.json
+++ b/ports/3fd/vcpkg.json
@@ -1,8 +1,8 @@
 {
   "name": "3fd",
-  "version-string": "2.6.2",
-  "port-version": 3,
+  "version-string": "2.6.3",
   "description": "C++ Framework For Fast Development",
+  "supports": "windows & !static & !arm64",
   "dependencies": [
     {
       "name": "boost-lockfree",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index e669898f0..aa9709fc4 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -29,13 +29,6 @@
 
 # Add new items alphabetically
 
-3fd:arm64-windows=fail
-3fd:arm-uwp=fail
-3fd:x64-linux=fail
-3fd:x64-osx=fail
-3fd:x64-windows=fail
-3fd:x64-windows-static=fail
-3fd:x86-windows=fail
 activemq-cpp:x64-linux=fail
 activemq-cpp:x64-osx=fail
 alac:arm-uwp=fail