From 7747805a0512c79a4ee09bfc2fe9e085714e7d9d Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Sun, 6 Oct 2019 13:33:05 +0700
Subject: [PATCH 01/29] ace-tao 6.5.6

parent 1ebb733d78d592b597e46bc7c5a491e646023ed3
author Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th> 1570361425 +0700
committer Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th> 1570404986 +0700

Added TAO to ACE port
---
 ports/ace/CONTROL                 |  26 +-
 ports/ace/FindACE.cmake           |  66 +++++
 ports/ace/FindTAO.cmake           |  85 +++++++
 ports/ace/TAO_IDL.cmake           |  34 +++
 ports/ace/bzip2.patch             |  11 +
 ports/ace/mpc-arm.patch           |  36 +++
 ports/ace/portfile.cmake          | 409 +++++++++++++++++++++---------
 ports/ace/qtcoreapplication.patch | 187 ++++++++++++++
 ports/ace/stacktrace-arm.patch    |  27 ++
 9 files changed, 753 insertions(+), 128 deletions(-)
 create mode 100644 ports/ace/FindACE.cmake
 create mode 100644 ports/ace/FindTAO.cmake
 create mode 100644 ports/ace/TAO_IDL.cmake
 create mode 100644 ports/ace/bzip2.patch
 create mode 100644 ports/ace/mpc-arm.patch
 create mode 100644 ports/ace/qtcoreapplication.patch
 create mode 100644 ports/ace/stacktrace-arm.patch

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 64ef8442537593..07b2813dcf5def 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -1,14 +1,32 @@
 Source: ace
 Version: 6.5.6
-Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html
 Description: The ADAPTIVE Communication Environment
+Homepage: http://www.dre.vanderbilt.edu/~schmidt/TAO.html
 
 Feature: wchar
-Description: Enable extra wide char functions in ACE
+Description: Enable extra wide char functions
 
 Feature: ssl
-Description: Enable SSL/TLS features in ACE
+Description: Enable SSL/TLS features
 Build-Depends: openssl
 
 Feature: xml
-Description: Enable XML features in ACE
+Description: Enable XML features
+
+Feature: qt5
+Build-Depends: qt5-base
+Description: Enable Qt5 support
+
+Feature: tao
+Description: The ACE ORB
+
+Feature: tao-zlib
+Build-Depends: zlib, ace[tao]
+Description: Enable zlib support for TAO
+
+Feature: tao-bzip2
+Build-Depends: bzip2, ace[tao]
+Description: Enable bzip2 support for TAO
+
+
+
diff --git a/ports/ace/FindACE.cmake b/ports/ace/FindACE.cmake
new file mode 100644
index 00000000000000..8066b9da465264
--- /dev/null
+++ b/ports/ace/FindACE.cmake
@@ -0,0 +1,66 @@
+set(ACE_FOUND FALSE)
+
+find_path(ACE_INCLUDE_DIR ace/ACE.h PATHS $ENV{ACE_ROOT} $ENV{ACE_ROOT}/include /usr/include /usr/local/include NO_DEFAULT_PATH)
+find_library(ACE_LIBRARY_RELEASE NAMES ACE PATHS $ENV{ACE_ROOT}/lib /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 NO_DEFAULT_PATH)
+find_library(ACE_LIBRARY_DEBUG NAMES ACEd PATHS $ENV{ACE_ROOT}/lib /debug/lib /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 NO_DEFAULT_PATH)
+
+
+if(ACE_INCLUDE_DIR AND ACE_LIBRARY_RELEASE)
+  SET(ACE_FOUND TRUE)
+endif(ACE_INCLUDE_DIR AND ACE_LIBRARY_RELEASE)
+#now let's search for parts of ACE we need.
+
+GET_FILENAME_COMPONENT(ACE_LIBRARY_RELEASE_DIR ${ACE_LIBRARY_RELEASE} PATH)
+GET_FILENAME_COMPONENT(ACE_LIBRARY_DEBUG_DIR ${ACE_LIBRARY_DEBUG} PATH)
+
+set(ACE_LIBRARIES_RELEASE ${ACE_LIBRARY_RELEASE})
+set(ACE_LIBRARIES_DEBUG ${ACE_LIBRARY_DEBUG})
+
+if(ACE_FOUND)
+	set(ACE_FIND_LIBS "ACE" "Compression" "ETCL" "ETCL_Parser" "HTBP" "INet" "INet_SSL"
+    "Monitor_Control" "QoS" "QtReactor" "RLECompression" "RMCast" "SSL" 
+    "TMCast" "ACEXML" "ACEXML_Parser" "Kokyu")
+    	
+    message("Finding ACE libraries...")
+	
+	if(WIN32)
+		message(STATUS "ACE release found at: ${ACE_LIBRARY_RELEASE}")
+		message(STATUS "ACE debug found at: ${ACE_LIBRARY_DEBUG}")
+		set(ACE_LIBRARY optimized ${ACE_LIBRARY_RELEASE} debug ${ACE_LIBRARY_DEBUG})
+	else(WIN32)
+		message(STATUS "ACE found at: ${ACE_LIBRARY_RELEASE}")
+		set(ACE_LIBRARY ${ACE_LIBRARY_RELEASE})
+	endif(WIN32)
+	
+    foreach(LIBRARY ${ACE_FIND_LIBS})	
+		if(WIN32)
+			find_library(ACE_${LIBRARY}_LIBRARY_DEBUG NAMES "ACE_${LIBRARY}d" "ACE${LIBRARY}d" "${LIBRARY}d" PATHS ${ACE_LIBRARY_DEBUG_DIR} NO_DEFAULT_PATH)
+			if(ACE_${LIBRARY}_LIBRARY_DEBUG)
+				message(STATUS "${LIBRARY} debug found at: ${ACE_${LIBRARY}_LIBRARY_DEBUG}")
+				list(APPEND ACE_LIBRARIES_DEBUG ${ACE_${LIBRARY}_LIBRARY_DEBUG})
+			else(ACE_${LIBRARY}_LIBRARY_DEBUG)
+				set(ACE_FOUND FALSE)
+			endif(ACE_${LIBRARY}_LIBRARY_DEBUG)
+		endif(WIN32)
+
+        find_library(ACE_${LIBRARY}_LIBRARY_RELEASE NAMES "ACE_${LIBRARY}" "ACE${LIBRARY}" "${LIBRARY}" PATHS ${ACE_LIBRARY_RELEASE_DIR} NO_DEFAULT_PATH)
+        if(ACE_${LIBRARY}_LIBRARY_RELEASE)
+			if(WIN32)
+				message(STATUS "${LIBRARY} release found at: ${ACE_${LIBRARY}_LIBRARY_RELEASE}")
+			else(WIN32)
+				message(STATUS "${LIBRARY} found at: ${ACE_${LIBRARY}_LIBRARY_RELEASE}")
+			endif(WIN32)
+			list(APPEND ACE_LIBRARIES_RELEASE ${ACE_${LIBRARY}_LIBRARY_RELEASE})
+        else(ACE_${LIBRARY}_LIBRARY_RELEASE)
+			set(ACE_FOUND FALSE)
+        endif(ACE_${LIBRARY}_LIBRARY_RELEASE)
+
+		if(WIN32)
+			set(ACE_${LIBRARY}_LIBRARY optimized ${ACE_${LIBRARY}_LIBRARY_RELEASE} debug ${ACE_${LIBRARY}_LIBRARY_DEBUG})
+		else(WIN32)
+			set(ACE_${LIBRARY}_LIBRARY ${ACE_${LIBRARY}_LIBRARY_RELEASE})
+		endif(WIN32)
+    endforeach()
+endif(ACE_FOUND)
+
+
diff --git a/ports/ace/FindTAO.cmake b/ports/ace/FindTAO.cmake
new file mode 100644
index 00000000000000..dc3bc505f48eaf
--- /dev/null
+++ b/ports/ace/FindTAO.cmake
@@ -0,0 +1,85 @@
+set(TAO_FOUND FALSE)
+
+find_path(TAO_INCLUDE_DIR tao/corba.h PATHS $ENV{ACE_ROOT} $ENV{TAO_ROOT} $ENV{TAO_ROOT}/include $ENV{ACE_ROOT}/include /usr/include /usr/local/include NO_DEFAULT_PATH)
+find_library(TAO_LIBRARY_RELEASE NAMES TAO PATHS $ENV{ACE_ROOT}/lib /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 NO_DEFAULT_PATH)
+find_library(TAO_LIBRARY_DEBUG NAMES TAOd PATHS $ENV{ACE_ROOT}/lib /debug/lib /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 NO_DEFAULT_PATH)
+find_program(TAO_IDL_COMPILER "tao_idl" /usr/bin $ENV{TAO_ROOT}/bin $ENV{ACE_ROOT}/bin /usr/bin /usr/local/bin /tools/ace-tao NO_DEFAULT_PATH)
+message(STATUS "tao_idl at: ${TAO_IDL_COMPILER}")
+
+if(TAO_INCLUDE_DIR AND TAO_LIBRARY_RELEASE AND TAO_IDL_COMPILER)
+  SET(TAO_FOUND TRUE)
+endif(TAO_INCLUDE_DIR AND TAO_LIBRARY_RELEASE AND TAO_IDL_COMPILER)
+#now let's search for parts of tao we need.
+
+GET_FILENAME_COMPONENT(TAO_LIBRARY_RELEASE_DIR ${TAO_LIBRARY_RELEASE} PATH)
+GET_FILENAME_COMPONENT(TAO_LIBRARY_DEBUG_DIR ${TAO_LIBRARY_DEBUG} PATH)
+
+set(TAO_LIBRARIES_RELEASE ${TAO_LIBRARY_RELEASE})
+set(TAO_LIBRARIES_DEBUG ${TAO_LIBRARY_DEBUG})
+
+
+if(TAO_FOUND)
+	set(TAO_FIND_LIBS "AnyTypeCode" "Async_ImR_Client_IDL"
+    "Async_IORTable" "AV" "BiDirGIOP" "Bzip2Compressor" "Catior_i" "CodecFactory" "Codeset" 
+    "Compression" "CosConcurrency" "CosConcurrency_Serv" "CosConcurrency_Skel" "CosEvent"
+    "CosEvent_Serv"  "CosEvent_Skel" "CosLifeCycle" "CosLifeCycle_Skel" "CosLoadBalancing"
+    "CosNaming" "CosNaming_Serv" "CosNaming_Skel" "CosNotification" "CosNotification_MC"
+    "CosNotification_MC_Ext"
+    "CosNotification_Serv" "CosNotification_Skel" "CosNotification_Persist" "CosProperty"
+    "CosProperty_Serv" "CosProperty_Skel" "CosTime" "CosTime_Serv" "CosTrading"
+    "CosTrading_Serv" "CosTrading_Skel" "CSD_Framework" "CSD_ThreadPool" "DiffServPolicy"
+    "DsEventLogAdmin" "DsEventLogAdmin_Serv" "DsEventLogAdmin_Skel" "DsLogAdmin"
+    "DsLogAdmin_Serv" "DsLogAdmin_Skel" "DsNotifyLogAdmin" "DsNotifyLogAdmin_Serv"
+    "DsNotifyLogAdmin_Skel" "Dynamic_TP" "DynamicAny" "DynamicInterface" "EndpointPolicy"
+    "ETCL" "FT_Naming_Serv" "FT_ServerORB" "FtNaming" "FtNamingReplication" 
+    "FTORB_Utils" "FTRT_ClientORB" "FTRT_EventChannel" "FtRtEvent" "HTIOP" "IDL_BE"
+    "IDL_FE" "IFR_BE" "IFR_Client" "IFR_Client_skel" "ImR_Activator_IDL" "ImR_Client"
+    "ImR_Locator_IDL" "IORInterceptor" "IORManip" "IORTable" "Messaging" "Monitor"
+    "Notify_Service" "ObjRefTemplate" "PI" "PI_Server" "PortableGroup" "PortableServer" "QtResource"
+    "ReplicationManagerLib" "RLECompressor" "RT_Notification" "RTCORBA" "RTEvent" "RTEvent_Skel"
+    "RTKokyuEvent" "RTEventLogAdmin" "RTEventLogAdmin_Skel" "RTPortableServer" "RTSched" "RTScheduler"
+    "Security" "SmartProxies"  "Strategies" "Svc_Utils" "TC" "TC_IIOP"
+    "TypeCodeFactory" "Utils" "Valuetype" "ZIOP" "SSLIOP" 
+    "ZlibCompressor")
+    
+    message("Finding TAO libraries...")
+		
+	if(WIN32)
+		message(STATUS "TAO release found at: ${TAO_LIBRARY_RELEASE}")
+		message(STATUS "TAO debug found at: ${TAO_LIBRARY_DEBUG}")
+		set(TAO_LIBRARY optimized ${TAO_LIBRARY_RELEASE} debug ${TAO_LIBRARY_DEBUG})
+	else(WIN32)
+		message(STATUS "TAO found at: ${TAO_LIBRARY_RELEASE}")
+		set(TAO_LIBRARY ${TAO_LIBRARY_RELEASE})
+	endif(WIN32)
+    foreach(LIBRARY ${TAO_FIND_LIBS})
+	    if(WIN32)
+		    find_library(TAO_${LIBRARY}_LIBRARY_DEBUG NAMES "TAO_${LIBRARY}d" PATHS ${TAO_LIBRARY_DEBUG_DIR} NO_DEFAULT_PATH)
+		    if(TAO_${LIBRARY}_LIBRARY_DEBUG)
+			    message(STATUS "${LIBRARY} debug found at: ${TAO_${LIBRARY}_LIBRARY_DEBUG}")
+    	        list(APPEND TAO_LIBRARIES_DEBUG ${TAO_${LIBRARY}_LIBRARY_DEBUG})
+		    else(TAO_${LIBRARY}_LIBRARY_DEBUG)
+		        set(TAO_FOUND FALSE)
+		    endif(TAO_${LIBRARY}_LIBRARY_DEBUG)
+		endif(WIN32)
+        find_library(TAO_${LIBRARY}_LIBRARY_RELEASE NAMES "TAO_${LIBRARY}" ${TAO_LIBRARY} PATHS ${TAO_LIBRARY_RELEASE_DIR} NO_DEFAULT_PATH)
+        if(TAO_${LIBRARY}_LIBRARY_RELEASE)
+            if(WIN32)
+                message(STATUS "${LIBRARY} release found at: ${TAO_${LIBRARY}_LIBRARY_RELEASE}")
+            else(WIN32)
+                message(STATUS "${LIBRARY} found at: ${TAO_${LIBRARY}_LIBRARY_RELEASE}")
+            endif(WIN32)
+          list(APPEND TAO_LIBRARIES_RELEASE ${TAO_${LIBRARY}_LIBRARY_RELEASE})
+        else(TAO_${LIBRARY}_LIBRARY_RELEASE)
+          set(TAO_FOUND FALSE)
+        endif(TAO_${LIBRARY}_LIBRARY_RELEASE)
+
+        if(WIN32)
+            set(TAO_${LIBRARY}_LIBRARY optimized ${TAO_${LIBRARY}_LIBRARY_RELEASE} debug ${TAO_${LIBRARY}_LIBRARY_DEBUG})
+        else(WIN32)
+            set(TAO_${LIBRARY}_LIBRARY ${TAO_${LIBRARY}_LIBRARY_RELEASE})
+        endif(WIN32)
+    endforeach()
+endif(TAO_FOUND)
+
+
diff --git a/ports/ace/TAO_IDL.cmake b/ports/ace/TAO_IDL.cmake
new file mode 100644
index 00000000000000..b26cf98ab6618c
--- /dev/null
+++ b/ports/ace/TAO_IDL.cmake
@@ -0,0 +1,34 @@
+FIND_PROGRAM( TAO_IDL_COMMAND tao_idl )
+
+MACRO( APPEND orig_string new_string )
+  IF( NOT ${orig_string} )
+    SET( ${orig_string} ${new_string} )
+  ELSE( NOT ${orig_string} )
+    SET( ${orig_string} ${${orig_string}} ${new_string} )
+  ENDIF( NOT ${orig_string} )
+ENDMACRO( APPEND orig_string new_string )
+
+MACRO( GENERATE_TAO_IDL_RULES generated_client_sources generated_client_headers generated_client_inlines generated_server_sources generated_server_headers)
+  FOREACH( idl_source ${ARGN} )
+    STRING( REGEX REPLACE "\\.idl" C.cpp client_source_output ${idl_source} )
+    STRING( REGEX REPLACE "\\.idl" C.h   client_header_output ${idl_source} )
+    STRING( REGEX REPLACE "\\.idl" C.inl   client_inline_output ${idl_source} )
+    STRING( REGEX REPLACE "\\.idl" S.cpp server_source_output ${idl_source} )
+    STRING( REGEX REPLACE "\\.idl" S.h   server_header_output ${idl_source} )
+
+    ADD_CUSTOM_COMMAND(
+      OUTPUT ${client_source_output} ${client_header_output} ${server_source_output} ${server_header_output}
+      COMMAND ${TAO_IDL_COMMAND}
+      ARGS ${TAO_IDL_ARGS} ${CMAKE_CURRENT_SOURCE_DIR}/${idl_source}
+      DEPENDS ${idl_source}
+      COMMENT "Generating ${client_source_output}, ${client_header_output}, ${client_inline_output}, ${server_source_output}, ${server_header_output} from ${idl_source}"
+    )
+
+    list(APPEND ${generated_client_sources} ${CMAKE_CURRENT_BINARY_DIR}/${client_source_output})
+    list(APPEND ${generated_client_headers} ${CMAKE_CURRENT_BINARY_DIR}/${client_header_output})
+    list(APPEND ${generated_client_inlines} ${CMAKE_CURRENT_BINARY_DIR}/${client_inline_output})
+    list(APPEND ${generated_server_sources} ${CMAKE_CURRENT_BINARY_DIR}/${server_source_output})
+    list(APPEND ${generated_server_headers} ${CMAKE_CURRENT_BINARY_DIR}/${server_header_output})
+
+  ENDFOREACH( idl_source ${ARGN} )
+ENDMACRO( GENERATE_TAO_IDL_RULES generated_client_sources generated_client_headers generated_server_sources generated_server_headers )
diff --git a/ports/ace/bzip2.patch b/ports/ace/bzip2.patch
new file mode 100644
index 00000000000000..3e2390f3b652e8
--- /dev/null
+++ b/ports/ace/bzip2.patch
@@ -0,0 +1,11 @@
+--- a/MPC/config/bzip2.mpb	2019-10-06 11:14:51.164094600 +0700
++++ b/MPC/config/bzip2.mpb	2019-10-06 11:15:08.269289500 +0700
+@@ -5,8 +5,6 @@
+   macros   += USE_BZIP2
+ 
+   specific(prop:windows) {
+-    lit_libs += bzip2
+-  } else {
+     lit_libs += bz2
+   }
+ }
diff --git a/ports/ace/mpc-arm.patch b/ports/ace/mpc-arm.patch
new file mode 100644
index 00000000000000..7a1610761b3580
--- /dev/null
+++ b/ports/ace/mpc-arm.patch
@@ -0,0 +1,36 @@
+diff --git a/MPC/templates/vs2019platforms.mpt b/MPC/templates/vs2019platforms.mpt
+index 4f5dbfa8..1f4671b1 100644
+--- a/MPC/templates/vs2019platforms.mpt
++++ b/MPC/templates/vs2019platforms.mpt
+@@ -3,9 +3,9 @@
+ // Any of these platforms can set using value_template platforms=
+ // when generating solutions/projects.
+ //
+-//platforms = Win32 x64
++//platforms = Win32 x64 ARM ARM64
+ 
+-platforms = Win32 x64
++platforms = Win32 x64 ARM ARM64
+ default_platform = Win32
+ PlatformToolset = v142
+ WindowsTargetPlatformVersion = 10.0.17763.0
+@@ -22,3 +22,18 @@ x64 {
+   link_options     = /machine:AMD64
+ }
+ 
++ARM {
++  output_subdir    = ARM
++  cpu_defines      = _ARM_
++  platform_defines = _ARM
++  TargetMachine    = "0"             // We let VC++ figure it out for us.
++  link_options     = /machine:ARM
++}
++
++ARM64 {
++  output_subdir    = ARM64
++  cpu_defines      = _ARM64_
++  platform_defines = _ARM64
++  TargetMachine    = "0"             // We let VC++ figure it out for us.
++  link_options     = /machine:ARM64
++}
+\ No newline at end of file
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 81c9534d05645a..81dc423ab276ae 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -1,173 +1,334 @@
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "${PORT} does not currently support UWP")
+elseif (TRIPLET_SYSTEM_ARCH MATCHES "arm64")
+    message(FATAL_ERROR "${PORT} does not currently support ARM64")
+
+endif()
+
+include(vcpkg_common_functions)
+
+
+
+set(ACE_ROOT ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers)
+set(TAO_ROOT ${ACE_ROOT}/tao)
+set(ENV{ACE_ROOT} ${ACE_ROOT})
+set(ENV{TAO_ROOT} ${TAO_ROOT})
+set(ACE_SOURCE_PATH ${ACE_ROOT}/ace)
+set(TAO_SOURCE_PATH ${TAO_ROOT}/tao)
+
+set(INSTALLED_PATH ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET})
+if(${CMAKE_BUILD_TYPE} MATCHES "^Debug$")
+set(INSTALLED_PATH ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/debug)
+endif()
+
+
+###################################################
+#
+#   Download and extract
+#
+###################################################
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_6/ACE+TAO-src-6.5.6.tar.gz"
+    FILENAME ACE+TAO-src-6.5.6.tar.gz
+    SHA512 7d1e6bafee3ecb831105e4815822cf9d87b400ea26d73aea6eeaab7d7c68599da91dc62718f5840eaebd8f29c6e3a32c9d2f768a0e8686ca7265dc97a4026c52
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_apply_patches(
+    SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers
+    PATCHES
+        "${CMAKE_CURRENT_LIST_DIR}/qtcoreapplication.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/bzip2.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/mpc-arm.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/stacktrace-arm.patch"
+)
+
+
+###################################################
+#
+#   Generate features string
+#
+###################################################
+
+# see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+    file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"\n#define ACE_NO_INLINE")
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"")
+    file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU")
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    #set(ENV{DYLD_LIBRARY_PATH} ${ACE_ROOT}/ace:${ACE_ROOT}/lib)
+    #set(ENV{MACOSX_DEPLOYMENT_TARGET} 10.4)
+    file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-macosx.h\"")
+    file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU")
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(FATAL_ERROR "${PORT} does not currently support UWP.")
+endif()
+
+if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+  if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    set(DLL_DECORATOR s)
+  endif()
+  if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
+    set(SOLUTION_TYPE vs2019)
+  elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    set(SOLUTION_TYPE vs2017)
+  else()
+    set(SOLUTION_TYPE vc14)
+  endif()
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  set(SOLUTION_TYPE gnuace)
+endif()
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+  set(MPC_STATIC_FLAG -static)
 endif()
 
 if("wchar" IN_LIST FEATURES)
     list(APPEND ACE_FEATURE_LIST "uses_wchar=1")
+else()
+    list(APPEND ACE_FEATURE_LIST "uses_wchar=0")
 endif()
-if("zlib" IN_LIST FEATURES)
-    list(APPEND ACE_FEATURE_LIST "zlib=1")
+if("xml" IN_LIST FEATURES)
+    list(APPEND ACE_FEATURE_LIST "xml=1")
 else()
-    list(APPEND ACE_FEATURE_LIST "zlib=0")
+    list(APPEND ACE_FEATURE_LIST "xml=0")
 endif()
+
 if("ssl" IN_LIST FEATURES)
+    set(ENV{SSL_ROOT} ${INSTALLED_PATH})
     list(APPEND ACE_FEATURE_LIST "ssl=1")
 else()
     list(APPEND ACE_FEATURE_LIST "ssl=0")
 endif()
+if("qt5" IN_LIST FEATURES)
+    set(QT5_CORE_MPB_PATH "${ACE_ROOT}/MPC/config/qt5_core.mpb")
+    FILE(READ ${QT5_CORE_MPB_PATH} QT5_CORE_MPB_DATA)
+    STRING(REGEX REPLACE "QT5_BINDIR\\)\\/" "QTDIR)/tools/qt5/bin/" NEW_QT5_CORE_MPB_DATA ${QT5_CORE_MPB_DATA})
+    SET(QT5_CORE_MPB_DATA ${NEW_QT5_CORE_MPB_DATA})
+    STRING(REGEX REPLACE "libpaths \\+\\= \\$\\(QT5_LIBDIR\\)" "libpaths += $(QT5_LIBDIR) ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/debug/lib" NEW_QT5_CORE_MPB_DATA ${QT5_CORE_MPB_DATA})
+    FILE(WRITE ${QT5_CORE_MPB_PATH} "${NEW_QT5_CORE_MPB_DATA}")
+    set(ENV{QTDIR} ${INSTALLED_PATH})
+    list(APPEND ACE_FEATURE_LIST "qt5=1")
+else()
+    list(APPEND ACE_FEATURE_LIST "qt5=0")
+endif()
+if("tao" IN_LIST FEATURES)
+    set(BUILD_TAO 1)
+else()
+    set(BUILD_TAO 0)    
+endif()
+if("tao-bzip2" IN_LIST FEATURES)
+    set(ENV{BZIP2_ROOT} ${INSTALLED_PATH})
+    list(APPEND ACE_FEATURE_LIST "bzip2=1")
+else()
+    list(APPEND ACE_FEATURE_LIST "bzip2=0")
+endif()
+if("tao-zlib" IN_LIST FEATURES)
+    set(ENV{ZLIB_ROOT} ${INSTALLED_PATH})
+    list(APPEND ACE_FEATURE_LIST "zlib=1")
+else()
+    list(APPEND ACE_FEATURE_LIST "zlib=0")
+endif()
 list(JOIN ACE_FEATURE_LIST "," ACE_FEATURES)
+string(PREPEND ACE_FEATURES ",")
 
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-  if(NOT VCPKG_CMAKE_SYSTEM_NAME)
-    set(DLL_DECORATOR s)
-  endif()
-  set(MPC_STATIC_FLAG -static)
-endif()
-include(vcpkg_common_functions)
-set(ACE_ROOT ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers)
-set(ENV{ACE_ROOT} ${ACE_ROOT})
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_6/ACE-src-6.5.6.zip"
-    FILENAME ACE-src-6.5.6.zip
-    SHA512 4ee42aafc86af159ab20dbb14c7c2a49bed733645f5cc3afa8cef3e9688ff929002f3420eb33e859afe10a534afc276340faa21d029fa56bd07bd9aed3403ab4
-)
-vcpkg_extract_source_archive(${ARCHIVE})
+###################################################
+#
+#   Invoke mwc to generate solution / make files
+#
+###################################################
 
-vcpkg_find_acquire_program(PERL)
-get_filename_component(PERL_PATH ${PERL} DIRECTORY)
-vcpkg_add_to_path(${PERL_PATH})
 
 if (TRIPLET_SYSTEM_ARCH MATCHES "arm")
-    message(FATAL_ERROR "ARM is currently not supported.")
+    set(MSBUILD_PLATFORM "ARM")
+elseif (TRIPLET_SYSTEM_ARCH MATCHES "arm64")
+    set(MSBUILD_PLATFORM "ARM64")
 elseif (TRIPLET_SYSTEM_ARCH MATCHES "x86")
     set(MSBUILD_PLATFORM "Win32")
 else ()
     set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH})
 endif()
 
-# Add ace/config.h file
-# see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html
-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
-  set(LIB_RELEASE_SUFFIX .lib)
-  set(LIB_DEBUG_SUFFIX d.lib)
-  if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
-    set(SOLUTION_TYPE vs2019)
-  elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
-    set(SOLUTION_TYPE vs2017)
-  else()
-    set(SOLUTION_TYPE vc14)
-  endif()
-  file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
-endif()
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  set(DLL_DECORATOR)
-  set(LIB_RELEASE_SUFFIX .a)
-  set(LIB_DEBUG_SUFFIX .a)
-  set(LIB_PREFIX lib)
-  set(SOLUTION_TYPE gnuace)
-  file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"")
-  file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)include/makeinclude/platform_linux.GNU")
+# Acquire Perl and add it to PATH (for execution of MPC)
+vcpkg_find_acquire_program(PERL)
+get_filename_component(PERL_PATH ${PERL} DIRECTORY)
+vcpkg_add_to_path(${PERL_PATH})
+
+if(BUILD_TAO)
+    set(WORKSPACE "TAO_ACE")
+    set(WORKING_DIR ${TAO_ROOT})
+else()
+    set(WORKSPACE "ACE")
+    set(WORKING_DIR ${ACE_ROOT})
 endif()
 
-# Invoke mwc.pl to generate the necessary solution and project files
 vcpkg_execute_required_process(
-    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ace ${MPC_STATIC_FLAG}
-    WORKING_DIRECTORY ${ACE_ROOT}
-    LOGNAME mwc-${TARGET_TRIPLET}
+    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} ${WORKSPACE}.mwc ${MPC_STATIC_FLAG} -features stl=1,ace_for_tao=0,ace_inline=0${ACE_FEATURES} -use_env -expand_vars
+    WORKING_DIRECTORY ${WORKING_DIR}
+    LOGNAME mwc-tao-${TARGET_TRIPLET}
 )
 
-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
-  vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/ace.sln
-    PLATFORM ${MSBUILD_PLATFORM}
-    USE_VCPKG_INTEGRATION
-  )
+
+###################################################
+#
+#   Build
+#
+###################################################
+
+# Build for Windows
+if(NOT VCPKG_CMAKE_SYSTEM_NAME) 
+    vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" PLATFORM ${MSBUILD_PLATFORM} USE_VCPKG_INTEGRATION)
 endif()
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   FIND_PROGRAM(MAKE make)
   IF (NOT MAKE)
     MESSAGE(FATAL_ERROR "MAKE not found")
   ENDIF ()
-  vcpkg_execute_required_process(
-    COMMAND make
-    WORKING_DIRECTORY ${ACE_ROOT}/ace
-    LOGNAME make-${TARGET_TRIPLET}
-  )
-endif()
-
-# ACE itself does not define an install target, so it is not clear which
-# headers are public and which not. For the moment we install everything
-# that is in the source path and ends in .h, .inl
-function(install_ace_headers_subdirectory SOURCE_PATH RELATIVE_PATH)
-    file(GLOB HEADER_FILES ${SOURCE_PATH}/${RELATIVE_PATH}/*.h ${SOURCE_PATH}/${RELATIVE_PATH}/*.inl)
-    file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/${RELATIVE_PATH})
-endfunction()
+  vcpkg_execute_required_process(COMMAND make WORKING_DIRECTORY ${WORKING_DIR} LOGNAME make-${TARGET_TRIPLET})
+endif()
 
-# We manually install header found in the ace directory because in that case
-# we are supposed to install also *cpp files, see ACE_wrappers\debian\libace-dev.install file
-file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h ${SOURCE_PATH}/*.inl ${SOURCE_PATH}/*.cpp)
-file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/)
-
-# Install headers in subdirectory
-install_ace_headers_subdirectory(${SOURCE_PATH} "Compression")
-install_ace_headers_subdirectory(${SOURCE_PATH} "Compression/rle")
-install_ace_headers_subdirectory(${SOURCE_PATH} "ETCL")
-install_ace_headers_subdirectory(${SOURCE_PATH} "QoS")
-install_ace_headers_subdirectory(${SOURCE_PATH} "Monitor_Control")
-install_ace_headers_subdirectory(${SOURCE_PATH} "os_include")
-install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/arpa")
-install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/net")
-install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/netinet")
-install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/sys")
-if("ssl" IN_LIST FEATURES)
-    install_ace_headers_subdirectory(${SOURCE_PATH} "SSL")
-endif()
-
-# Install the libraries
-function(install_ace_library SOURCE_PATH ACE_LIBRARY)
-    set(LIB_PATH ${SOURCE_PATH}/lib/)
-    if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-        # Install the DLL files
-        file(INSTALL
-            ${LIB_PATH}/${ACE_LIBRARY}d.dll
-            DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-        )
-        file(INSTALL
-            ${LIB_PATH}/${ACE_LIBRARY}.dll
-            DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-        )
-    endif()
 
-    # Install the lib files
-    file(INSTALL
-        ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX}
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-    )
+###################################################
+#
+#   Installation
+#
+###################################################
+
 
-    file(INSTALL
-        ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX}
-        DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-    )
-endfunction()
 
-install_ace_library(${ACE_ROOT} "ACE")
-install_ace_library(${ACE_ROOT} "ACE_Compression")
-install_ace_library(${ACE_ROOT} "ACE_ETCL")
-install_ace_library(${ACE_ROOT} "ACE_ETCL_Parser")
-install_ace_library(${ACE_ROOT} "ACE_Monitor_Control")
 if(NOT VCPKG_CMAKE_SYSTEM_NAME)
-  install_ace_library(${ACE_ROOT} "ACE_QoS")
+  set(LIB_RELEASE_SUFFIX .lib)
+  set(LIB_DEBUG_SUFFIX d.lib)
+  set(DLL_RELEASE_SUFFIX .dll)
+  set(DLL_DEBUG_SUFFIX d.dll)
+  set(LIB_PREFIX)
+  if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    set(DLL_DECORATOR s)
+  endif()
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  set(DLL_DECORATOR)
+  set(LIB_RELEASE_SUFFIX .a)
+  set(LIB_DEBUG_SUFFIX .a)
+  set(DLL_RELEASE_SUFFIX)
+  set(DLL_DEBUG_SUFFIX)
+  set(LIB_PREFIX lib)
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  set(DLL_DECORATOR)
+  set(LIB_RELEASE_SUFFIX .a)
+  set(LIB_DEBUG_SUFFIX .a)
+  set(DLL_RELEASE_SUFFIX .dylib)
+  set(DLL_DEBUG_SUFFIX .dylib)
+  set(LIB_PREFIX lib)
 endif()
-install_ace_library(${ACE_ROOT} "ACE_RLECompression")
-if("ssl" IN_LIST FEATURES)
-    install_ace_library(${ACE_ROOT} "ACE_SSL")
+
+# Install include files
+function(install_includes SOURCE_PATH SUBDIRECTORIES INCLUDE_DIR)
+    foreach(SUB_DIR ${SUBDIRECTORIES})
+        file(GLOB INCLUDE_FILES ${SOURCE_PATH}/${SUB_DIR}/*.h ${SOURCE_PATH}/${SUB_DIR}/*.inl ${SOURCE_PATH}/${SUB_DIR}/*.cpp)
+        file(INSTALL ${INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${INCLUDE_DIR}/${SUB_DIR})
+    endforeach()
+endfunction()
+
+set(ACE_INCLUDE_FOLDERS "." "Compression" "Compression/rle" "ETCL" "QoS" "Monitor_Control" "os_include" "os_include/arpa" "os_include/net" "os_include/netinet" "os_include/sys")
+install_includes(${ACE_SOURCE_PATH} "${ACE_INCLUDE_FOLDERS}" "ace")
+
+if(BUILD_TAO)
+    set(TAO_INCLUDE_FOLDERS "." "AnyTypeCode" "BiDir_GIOP" "CodecFactory" "Codeset" "Compression" "Compression/bzip2" "Compression/lzo" "Compression/rle" "Compression/zlib"
+        "CSD_Framework" "CSD_ThreadPool" "DiffServPolicy" "Dynamic_TP" "DynamicAny" "DynamicInterface" "EndpointPolicy" "EndpointPolicy" "ETCL" "FlResource" "FoxResource"
+        "IFR_Client" "ImR_Client" "IORInterceptor" "IORManipulation" "IORTable" "Messaging" "Monitor" "ObjRefTemplate" "PI" "PI_Server" "PortableServer" "QtResource"
+        "RTCORBA" "RTPortableServer" "RTScheduling" "SmartProxies" "Strategies" "TkResource" "TransportCurrent" "TypeCodeFactory" "Utils" "Valuetype" "XtResource" "ZIOP")
+    install_includes(${TAO_SOURCE_PATH} "${TAO_INCLUDE_FOLDERS}" "tao")
+
+    set(ORBSVCS_INCLUDE_FOLDERS "." "AV" "Concurrency" "CosEvent" "ESF" "FaultTolerance" "FtRtEvent/ClientORB" "FtRtEvent/EventChannel" "FtRtEvent/Utils" "HTIOP" "IFRService"
+        "LifeCycle" "LoadBalancing" "Log" "Naming" "Naming/FaultTolerant" "Notify" "Notify/Any" "Notify/MonitorControl" "Notify/MonitorControlExt" "Notify/Sequence"
+        "Notify/Structured" "PortableGroup" "Property" "Sched" "Security" "SSLIOP" "Time" "Trader")
+    install_includes(${TAO_ROOT}/orbsvcs/orbsvcs "${ORBSVCS_INCLUDE_FOLDERS}" "orbsvcs")
+endif(BUILD_TAO)
+
+# Install libraries
+function(install_libraries SOURCE_PATH LIBRARIES)
+    foreach(LIBRARY ${LIBRARIES})
+        set(LIB_PATH ${SOURCE_PATH}/lib/)
+        if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+            # Install the DLL files
+            if(EXISTS ${LIB_PATH}/${LIBRARY}${DLL_RELEASE_SUFFIX})
+                file(INSTALL ${LIB_PATH}/${LIBRARY}${DLL_RELEASE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+            endif()
+            if(EXISTS ${LIB_PATH}/${LIBRARY}${DLL_DEBUG_SUFFIX})
+                file(INSTALL ${LIB_PATH}/${LIBRARY}${DLL_DEBUG_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)       
+            endif()
+        endif()
+        # Install the lib files
+        if(EXISTS ${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX})
+            file(INSTALL ${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+        endif()
+        if(EXISTS ${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX})
+            file(INSTALL ${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+        endif()         
+    endforeach()
+endfunction()
+
+set(ACE_TAO_LIBRARIES "ACE" "ACE_Compression" "ACE_ETCL" "ACE_ETCL_Parser" "ACE_HTBP" "ACE_INet" "ACE_INet_SSL"
+    "ACE_Monitor_Control" "ACE_QoS" "ACE_QtReactor" "ACE_RLECompression" "ACE_RMCast" "ACE_SSL" 
+    "ACE_TMCast" "ACEXML" "ACEXML_Parser" "Kokyu" "TAO" "TAO_AnyTypeCode" "TAO_Async_ImR_Client_IDL"
+    "TAO_Async_IORTable" "TAO_AV" "TAO_BiDirGIOP" "TAO_Bzip2Compressor" "TAO_Catior_i" "TAO_CodecFactory" "TAO_Codeset" 
+    "TAO_Compression" "TAO_CosConcurrency" "TAO_CosConcurrency_Serv" "TAO_CosConcurrency_Skel" "TAO_CosEvent"
+    "TAO_CosEvent_Serv"  "TAO_CosEvent_Skel" "TAO_CosLifeCycle" "TAO_CosLifeCycle_Skel" "TAO_CosLoadBalancing"
+    "TAO_CosNaming" "TAO_CosNaming_Serv" "TAO_CosNaming_Skel" "TAO_CosNotification" "TAO_CosNotification_MC"
+    "TAO_CosNotification_MC_Ext"
+    "TAO_CosNotification_Serv" "TAO_CosNotification_Skel" "TAO_CosNotification_Persist" "TAO_CosProperty"
+    "TAO_CosProperty_Serv" "TAO_CosProperty_Skel" "TAO_CosTime" "TAO_CosTime_Serv" "TAO_CosTrading"
+    "TAO_CosTrading_Serv" "TAO_CosTrading_Skel" "TAO_CSD_Framework" "TAO_CSD_ThreadPool" "TAO_DiffServPolicy"
+    "TAO_DsEventLogAdmin" "TAO_DsEventLogAdmin_Serv" "TAO_DsEventLogAdmin_Skel" "TAO_DsLogAdmin"
+    "TAO_DsLogAdmin_Serv" "TAO_DsLogAdmin_Skel" "TAO_DsNotifyLogAdmin" "TAO_DsNotifyLogAdmin_Serv"
+    "TAO_DsNotifyLogAdmin_Skel" "TAO_Dynamic_TP" "TAO_DynamicAny" "TAO_DynamicInterface" "TAO_EndpointPolicy"
+    "TAO_ETCL" "TAO_FT_Naming_Serv" "TAO_FT_ServerORB" "TAO_FtNaming" "TAO_FtNamingReplication" 
+    "TAO_FTORB_Utils" "TAO_FTRT_ClientORB" "TAO_FTRT_EventChannel" "TAO_FtRtEvent" "TAO_HTIOP" "TAO_IDL_BE"
+    "TAO_IDL_FE" "TAO_IFR_BE" "TAO_IFR_Client" "TAO_IFR_Client_skel" "TAO_ImR_Activator_IDL" "TAO_ImR_Client"
+    "TAO_ImR_Locator_IDL" "TAO_IORInterceptor" "TAO_IORManip" "TAO_IORTable" "TAO_Messaging" "TAO_Monitor"
+    "TAO_Notify_Service" "TAO_ObjRefTemplate" "TAO_PI" "TAO_PI_Server" "TAO_PortableGroup" "TAO_PortableServer" "TAO_QtResource"
+    "TAO_ReplicationManagerLib" "TAO_RLECompressor" "TAO_RT_Notification" "TAO_RTCORBA" "TAO_RTEvent" "TAO_RTEvent_Skel"
+    "TAO_RTKokyuEvent" "TAO_RTEventLogAdmin" "TAO_RTEventLogAdmin_Skel" "TAO_RTPortableServer" "TAO_RTSched" "TAO_RTScheduler"
+    "TAO_Security" "TAO_SmartProxies"  "TAO_Strategies" "TAO_Svc_Utils" "TAO_TC" "TAO_TC_IIOP"
+    "TAO_TypeCodeFactory" "TAO_Utils" "TAO_Valuetype" "TAO_ZIOP" "TAO_SSLIOP" 
+    "TAO_ZlibCompressor")
+install_libraries(${ACE_ROOT} "${ACE_TAO_LIBRARIES}")
+
+# Install executables
+function(install_tao_executables SOURCE_PATH EXE_FILE)
+    set(EXECUTABLE_SUFFIX ".exe")
+    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        set(EXECUTABLE_SUFFIX "")
+    endif()
+    if(EXISTS "${ACE_ROOT}/bin/${EXE_FILE}${EXECUTABLE_SUFFIX}")
+        file(INSTALL ${ACE_ROOT}/bin/${EXE_FILE}${EXECUTABLE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace-tao)
+    endif()
+endfunction()
+
+install_tao_executables(${ACE_ROOT}/bin "ace_gperf")
+install_tao_executables(${ACE_ROOT}/bin "tao_catior")
+install_tao_executables(${ACE_ROOT}/bin "tao_idl")
+install_tao_executables(${ACE_ROOT}/bin "tao_ifr")
+install_tao_executables(${ACE_ROOT}/bin "tao_imr")
+install_tao_executables(${ACE_ROOT}/bin "tao_nsadd")
+install_tao_executables(${ACE_ROOT}/bin "tao_nsdel")
+install_tao_executables(${ACE_ROOT}/bin "tao_nsgroup")
+install_tao_executables(${ACE_ROOT}/bin "tao_nslist")
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    file(INSTALL ${ACE_ROOT}/lib/ACEd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
+    if(BUILD_TAO)
+        file(INSTALL ${ACE_ROOT}/lib/TAO_IDL_FEd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
+        file(INSTALL ${ACE_ROOT}/lib/TAO_IDL_BEd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
+    endif()
 endif()
 
 # Handle copyright
-file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
+file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace/)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/ace/copyright)
 
 vcpkg_copy_pdbs()
diff --git a/ports/ace/qtcoreapplication.patch b/ports/ace/qtcoreapplication.patch
new file mode 100644
index 00000000000000..4292dd7094dd53
--- /dev/null
+++ b/ports/ace/qtcoreapplication.patch
@@ -0,0 +1,187 @@
+diff --git a/ace/QtReactor/QtReactor.cpp b/ace/QtReactor/QtReactor.cpp
+index ac9fab0c903..6dff0591fdd 100644
+--- a/ace/QtReactor/QtReactor.cpp
++++ b/ace/QtReactor/QtReactor.cpp
+@@ -6,7 +6,7 @@ ACE_ALLOC_HOOK_DEFINE (ACE_QtReactor)
+ 
+ // Must be called with lock held
+ 
+-ACE_QtReactor::ACE_QtReactor (QApplication *qapp ,
++ACE_QtReactor::ACE_QtReactor (QAPPLICATION_TYPE *qapp ,
+     ACE_Sig_Handler *sh,
+     ACE_Timer_Queue *tq,
+     int disable_notify_pipe,
+@@ -23,7 +23,7 @@ ACE_QtReactor::ACE_QtReactor (QApplication *qapp ,
+ 
+ // Must be called with lock held
+ ACE_QtReactor::ACE_QtReactor (size_t size,
+-    QApplication *qapp,
++    QAPPLICATION_TYPE *qapp,
+     bool restart,
+     ACE_Sig_Handler *sh,
+     ACE_Timer_Queue *tq,
+@@ -108,7 +108,7 @@ ACE_QtReactor::~ACE_QtReactor (void)
+ }
+ 
+ void
+-ACE_QtReactor::qapplication (QApplication *qapp)
++ACE_QtReactor::qapplication (QAPPLICATION_TYPE *qapp)
+ {
+   // reparent QSocketNotifiers and QTimer
+   qapp_ = qapp ;
+diff --git a/ace/QtReactor/QtReactor.h b/ace/QtReactor/QtReactor.h
+index 6bafe3c7f4c..4f128507a1a 100644
+--- a/ace/QtReactor/QtReactor.h
++++ b/ace/QtReactor/QtReactor.h
+@@ -29,10 +29,12 @@
+ 
+ // QT toolkit specific includes.
+ #ifdef ACE_HAS_QT5
+-#include /**/ <QtWidgets/QApplication>
++#include /**/ <QtCore/QCoreApplication>
++#define QAPPLICATION_TYPE QCoreApplication
+ #define ACE_QT_HANDLE_TYPE qintptr
+ #else
+ #include /**/ <QtGui/QApplication>
++#define QAPPLICATION_TYPE QApplication
+ #define ACE_QT_HANDLE_TYPE int
+ #endif
+ #include /**/ <QtCore/QObject>
+@@ -97,9 +99,9 @@ class ACE_QtReactor_Export ACE_QtReactor
+ 
+ public:
+     /** \brief Constructor follows  @ACE_Select_Reactor
+-        \param QApplication *qapp, qapplication which runs events loop
++        \param QAPPLICATION_TYPE *qapp, qapplication which runs events loop
+     */
+-    explicit ACE_QtReactor (QApplication *qapp = 0,
++    explicit ACE_QtReactor (QAPPLICATION_TYPE *qapp = 0,
+         ACE_Sig_Handler * = 0,
+         ACE_Timer_Queue * = 0,
+         int disable_notify_pipe = 0,
+@@ -111,7 +113,7 @@ public:
+         \param QApplication *qapp, qapplication which runs events loop
+     */
+     explicit ACE_QtReactor (size_t size,
+-        QApplication *qapp = 0,
++        QAPPLICATION_TYPE *qapp = 0,
+         bool restart = false,
+         ACE_Sig_Handler * = 0,
+         ACE_Timer_Queue * = 0,
+@@ -122,7 +124,7 @@ public:
+ 
+     virtual ~ACE_QtReactor (void);
+ 
+-    void qapplication (QApplication *qapp);
++    void qapplication (QAPPLICATION_TYPE *qapp);
+ 
+     // = Timer operations.
+     virtual long schedule_timer (ACE_Event_Handler *handler,
+@@ -177,7 +179,7 @@ protected:
+     // Wait for Qt events to occur
+ 
+     /// Some Qt stuff that we need to have
+-    QApplication *qapp_ ;
++    QAPPLICATION_TYPE *qapp_ ;
+ 
+     /// Typedef of a map.
+     typedef ACE_Map_Manager<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex> MAP;
+diff --git a/bin/MakeProjectCreator/config/ace_qt5.mpb b/bin/MakeProjectCreator/config/ace_qt5.mpb
+index 76d24e980d7..147062204ea 100644
+--- a/bin/MakeProjectCreator/config/ace_qt5.mpb
++++ b/bin/MakeProjectCreator/config/ace_qt5.mpb
+@@ -1,4 +1,4 @@
+ // -*- MPC -*-
+-project: qt5_gui {
++project: qt5_core {
+   macros += ACE_HAS_QT5
+ }
+diff --git a/bin/MakeProjectCreator/config/ace_qt5reactor.mpb b/bin/MakeProjectCreator/config/ace_qt5reactor.mpb
+index 4357a3779de..956ad99772d 100644
+--- a/bin/MakeProjectCreator/config/ace_qt5reactor.mpb
++++ b/bin/MakeProjectCreator/config/ace_qt5reactor.mpb
+@@ -1,5 +1,5 @@
+ // -*- MPC -*-
+-project : acelib, ace_qt5, qt5_widgets {
++project : acelib, ace_qt5 {
+   requires += ace_qt5reactor
+   after    += ACE_Qt5Reactor
+   libs     += ACE_QtReactor
+diff --git a/TAO/tao/QtResource/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp
+index b65474c89fa..9a14441d6cf 100644
+--- a/TAO/tao/QtResource/QtResource_Factory.cpp
++++ b/TAO/tao/QtResource/QtResource_Factory.cpp
+@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ 
+ namespace TAO
+ {
+-  QtResource_Factory::QtResource_Factory (QApplication *qapp)
++  QtResource_Factory::QtResource_Factory (QAPPLICATION_TYPE *qapp)
+     : reactor_impl_ (0)
+     , qapp_ (qapp)
+   {
+diff --git a/TAO/tao/QtResource/QtResource_Factory.h b/TAO/tao/QtResource/QtResource_Factory.h
+index 6540d2a70c8..66ff2ab29fa 100644
+--- a/TAO/tao/QtResource/QtResource_Factory.h
++++ b/TAO/tao/QtResource/QtResource_Factory.h
+@@ -40,7 +40,7 @@ namespace TAO
+   class TAO_QtResource_Export QtResource_Factory : public GUIResource_Factory
+   {
+   public:
+-    QtResource_Factory (QApplication *qapp_);
++    QtResource_Factory (QAPPLICATION_TYPE *qapp_);
+ 
+   protected:
+     /// Create or obtain current reactor implementation
+@@ -51,7 +51,7 @@ namespace TAO
+     ACE_QtReactor *reactor_impl_;
+ 
+     /// QApplication running reactor
+-    QApplication *qapp_;
++    QAPPLICATION_TYPE *qapp_;
+   };
+ }
+ 
+diff --git a/TAO/tao/QtResource/QtResource_Loader.cpp b/TAO/tao/QtResource/QtResource_Loader.cpp
+index 284077df372..a58be7bc0c0 100644
+--- a/TAO/tao/QtResource/QtResource_Loader.cpp
++++ b/TAO/tao/QtResource/QtResource_Loader.cpp
+@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ 
+ namespace TAO
+ {
+-  QtResource_Loader::QtResource_Loader (QApplication *qapp)
++  QtResource_Loader::QtResource_Loader (QAPPLICATION_TYPE *qapp)
+   {
+     QtResource_Factory *tmp = 0;
+ 
+diff --git a/TAO/tao/QtResource/QtResource_Loader.h b/TAO/tao/QtResource/QtResource_Loader.h
+index 807fa57f301..c701331d0f5 100644
+--- a/TAO/tao/QtResource/QtResource_Loader.h
++++ b/TAO/tao/QtResource/QtResource_Loader.h
+@@ -22,9 +22,15 @@
+ #include "tao/Versioned_Namespace.h"
+ 
+ #ifdef ACE_HAS_QT5
+-#include <QtWidgets/QApplication>
++#include <QtCore/QCoreApplication>
++#ifndef QAPPLICATION_TYPE
++#define QAPPLICATION_TYPE QCoreApplication
++#endif // !QAPPLICATION_TYPE
+ #elif defined ACE_HAS_QT4
+ #include <QtGui/qapplication.h>
++#ifndef QAPPLICATION_TYPE
++#define QAPPLICATION_TYPE QApplication
++#endif // !QAPPLICATION_TYPE
+ #else
+ #include <qapplication.h>
+ #endif
+@@ -51,7 +57,7 @@ namespace TAO
+   class TAO_QtResource_Export QtResource_Loader
+   {
+   public:
+-    QtResource_Loader (QApplication *qapp);
++    QtResource_Loader (QAPPLICATION_TYPE *qapp);
+     virtual ~QtResource_Loader (void);
+   };
+ }
diff --git a/ports/ace/stacktrace-arm.patch b/ports/ace/stacktrace-arm.patch
new file mode 100644
index 00000000000000..07d891196d79b1
--- /dev/null
+++ b/ports/ace/stacktrace-arm.patch
@@ -0,0 +1,27 @@
+diff --git a/ace/Stack_Trace.cpp b/ace/Stack_Trace.cpp
+index cd6f154adef..d4be2196252 100644
+--- a/ace/Stack_Trace.cpp
++++ b/ace/Stack_Trace.cpp
+@@ -663,6 +663,22 @@ cs_operate(int (*func)(struct frame_state const *, void *), void *usrarg,
+   fs.sf.AddrFrame.Mode = AddrModeFlat;
+   fs.sf.AddrBStore.Mode = AddrModeFlat;
+   fs.sf.AddrStack.Mode = AddrModeFlat;
++#  elif defined (_M_ARM)
++  DWORD machine = IMAGE_FILE_MACHINE_ARM;
++  fs.sf.AddrPC.Offset = c.Pc;
++  fs.sf.AddrFrame.Offset = c.R11;
++  fs.sf.AddrStack.Offset = c.Sp;
++  fs.sf.AddrPC.Mode = AddrModeFlat;
++  fs.sf.AddrFrame.Mode = AddrModeFlat;
++  fs.sf.AddrStack.Mode = AddrModeFlat;
++#  elif defined (_M_ARM64)
++  DWORD machine = IMAGE_FILE_MACHINE_ARM64;
++  fs.sf.AddrPC.Offset = c.Pc;
++  fs.sf.AddrFrame.Offset = c.Fp;
++  fs.sf.AddrStack.Offset = c.Sp;
++  fs.sf.AddrPC.Mode = AddrModeFlat;
++  fs.sf.AddrFrame.Mode = AddrModeFlat;
++  fs.sf.AddrStack.Mode = AddrModeFlat;
+ #  endif
+ 
+   fs.pSym = (PSYMBOL_INFO) GlobalAlloc (GMEM_FIXED,

From 7f80da2a12876be597303de46962af8b5c3d8df0 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Mon, 7 Oct 2019 17:38:00 +0700
Subject: [PATCH 02/29] Enabled building for ARM, ARM64, UWP, Darwin

---
 ports/ace/CONTROL                            |  1 +
 ports/ace/arm_prevent_amd64_definition.patch | 21 ++++++++
 ports/ace/portfile.cmake                     | 55 ++++++++------------
 3 files changed, 44 insertions(+), 33 deletions(-)
 create mode 100644 ports/ace/arm_prevent_amd64_definition.patch

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 07b2813dcf5def..c44a09409a726d 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -2,6 +2,7 @@ Source: ace
 Version: 6.5.6
 Description: The ADAPTIVE Communication Environment
 Homepage: http://www.dre.vanderbilt.edu/~schmidt/TAO.html
+Maintainer: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
 
 Feature: wchar
 Description: Enable extra wide char functions
diff --git a/ports/ace/arm_prevent_amd64_definition.patch b/ports/ace/arm_prevent_amd64_definition.patch
new file mode 100644
index 00000000000000..9f6e0695de5f15
--- /dev/null
+++ b/ports/ace/arm_prevent_amd64_definition.patch
@@ -0,0 +1,21 @@
+diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
+index 56567eead08..d219bd5f1ae 100644
+--- a/ace/config-win32-common.h
++++ b/ace/config-win32-common.h
+@@ -39,12 +39,14 @@
+ #if defined (_WIN64) || defined (WIN64)
+ #  define ACE_WIN64
+ 
++
+ // MPC template adds _AMD64_ but user projects not generated using MPC
+-// may want to use _AMD64_ as well. Ensure it's there in all cases.
++// may want to use _AMD64_ as well. Ensure it's there in all non ARM cases.
++#if !defined(_ARM64_) && !defined(_ARM_)
+ #  ifndef _AMD64_
+ #    define _AMD64_
+ #  endif
+-
++#endif
+ // Use 64-bit file offsets by default in the WIN64 case, similar to
+ // what 64-bit UNIX systems do.
+ //
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 81dc423ab276ae..208801caee875d 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -1,14 +1,6 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP")
-elseif (TRIPLET_SYSTEM_ARCH MATCHES "arm64")
-    message(FATAL_ERROR "${PORT} does not currently support ARM64")
-
-endif()
 
 include(vcpkg_common_functions)
 
-
-
 set(ACE_ROOT ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers)
 set(TAO_ROOT ${ACE_ROOT}/tao)
 set(ENV{ACE_ROOT} ${ACE_ROOT})
@@ -41,6 +33,7 @@ vcpkg_apply_patches(
         "${CMAKE_CURRENT_LIST_DIR}/bzip2.patch"
         "${CMAKE_CURRENT_LIST_DIR}/mpc-arm.patch"
         "${CMAKE_CURRENT_LIST_DIR}/stacktrace-arm.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/arm_prevent_amd64_definition.patch"
 )
 
 
@@ -58,15 +51,13 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
     file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"")
     file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU")
 elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    #set(ENV{DYLD_LIBRARY_PATH} ${ACE_ROOT}/ace:${ACE_ROOT}/lib)
-    #set(ENV{MACOSX_DEPLOYMENT_TARGET} 10.4)
     file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-macosx.h\"")
     file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU")
 elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-    message(FATAL_ERROR "${PORT} does not currently support UWP.")
+    file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"\n#define ACE_NO_INLINE")
 endif()
 
-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+if((NOT VCPKG_CMAKE_SYSTEM_NAME) OR ("WindowsStore" STREQUAL ${VCPKG_CMAKE_SYSTEM_NAME}))
   if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(DLL_DECORATOR s)
   endif()
@@ -77,7 +68,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   else()
     set(SOLUTION_TYPE vc14)
   endif()
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+elseif((VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
   set(SOLUTION_TYPE gnuace)
 endif()
 
@@ -141,11 +132,7 @@ string(PREPEND ACE_FEATURES ",")
 ###################################################
 
 
-if (TRIPLET_SYSTEM_ARCH MATCHES "arm")
-    set(MSBUILD_PLATFORM "ARM")
-elseif (TRIPLET_SYSTEM_ARCH MATCHES "arm64")
-    set(MSBUILD_PLATFORM "ARM64")
-elseif (TRIPLET_SYSTEM_ARCH MATCHES "x86")
+if (TRIPLET_SYSTEM_ARCH MATCHES "x86")
     set(MSBUILD_PLATFORM "Win32")
 else ()
     set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH})
@@ -166,7 +153,7 @@ else()
 endif()
 
 vcpkg_execute_required_process(
-    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} ${WORKSPACE}.mwc ${MPC_STATIC_FLAG} -features stl=1,ace_for_tao=0,ace_inline=0${ACE_FEATURES} -use_env -expand_vars
+    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} ${WORKSPACE}.mwc ${MPC_STATIC_FLAG} -features stl=1,ace_for_tao=0,ace_inline=0${ACE_FEATURES} -workers ${VCPKG_CONCURRENCY} -use_env -expand_vars
     WORKING_DIRECTORY ${WORKING_DIR}
     LOGNAME mwc-tao-${TARGET_TRIPLET}
 )
@@ -179,11 +166,9 @@ vcpkg_execute_required_process(
 ###################################################
 
 # Build for Windows
-if(NOT VCPKG_CMAKE_SYSTEM_NAME) 
+if((NOT VCPKG_CMAKE_SYSTEM_NAME) OR ("WindowsStore" STREQUAL ${VCPKG_CMAKE_SYSTEM_NAME}))
     vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" PLATFORM ${MSBUILD_PLATFORM} USE_VCPKG_INTEGRATION)
-endif()
-
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   FIND_PROGRAM(MAKE make)
   IF (NOT MAKE)
     MESSAGE(FATAL_ERROR "MAKE not found")
@@ -191,7 +176,6 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL
   vcpkg_execute_required_process(COMMAND make WORKING_DIRECTORY ${WORKING_DIR} LOGNAME make-${TARGET_TRIPLET})
 endif()
 
-
 ###################################################
 #
 #   Installation
@@ -229,7 +213,7 @@ endif()
 function(install_includes SOURCE_PATH SUBDIRECTORIES INCLUDE_DIR)
     foreach(SUB_DIR ${SUBDIRECTORIES})
         file(GLOB INCLUDE_FILES ${SOURCE_PATH}/${SUB_DIR}/*.h ${SOURCE_PATH}/${SUB_DIR}/*.inl ${SOURCE_PATH}/${SUB_DIR}/*.cpp)
-        file(INSTALL ${INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${INCLUDE_DIR}/${SUB_DIR})
+        file(COPY ${INCLUDE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${INCLUDE_DIR}/${SUB_DIR})
     endforeach()
 endfunction()
 
@@ -256,18 +240,18 @@ function(install_libraries SOURCE_PATH LIBRARIES)
         if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
             # Install the DLL files
             if(EXISTS ${LIB_PATH}/${LIBRARY}${DLL_RELEASE_SUFFIX})
-                file(INSTALL ${LIB_PATH}/${LIBRARY}${DLL_RELEASE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+                file(COPY ${LIB_PATH}/${LIBRARY}${DLL_RELEASE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
             endif()
             if(EXISTS ${LIB_PATH}/${LIBRARY}${DLL_DEBUG_SUFFIX})
-                file(INSTALL ${LIB_PATH}/${LIBRARY}${DLL_DEBUG_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)       
+                file(COPY ${LIB_PATH}/${LIBRARY}${DLL_DEBUG_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)       
             endif()
         endif()
         # Install the lib files
         if(EXISTS ${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX})
-            file(INSTALL ${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+            file(COPY ${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
         endif()
         if(EXISTS ${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX})
-            file(INSTALL ${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+            file(COPY ${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
         endif()         
     endforeach()
 endfunction()
@@ -305,7 +289,7 @@ function(install_tao_executables SOURCE_PATH EXE_FILE)
         set(EXECUTABLE_SUFFIX "")
     endif()
     if(EXISTS "${ACE_ROOT}/bin/${EXE_FILE}${EXECUTABLE_SUFFIX}")
-        file(INSTALL ${ACE_ROOT}/bin/${EXE_FILE}${EXECUTABLE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace-tao)
+        file(COPY ${ACE_ROOT}/bin/${EXE_FILE}${EXECUTABLE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace-tao)
     endif()
 endfunction()
 
@@ -320,13 +304,18 @@ install_tao_executables(${ACE_ROOT}/bin "tao_nsgroup")
 install_tao_executables(${ACE_ROOT}/bin "tao_nslist")
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(INSTALL ${ACE_ROOT}/lib/ACEd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
+    file(COPY ${ACE_ROOT}/lib/ACEd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
     if(BUILD_TAO)
-        file(INSTALL ${ACE_ROOT}/lib/TAO_IDL_FEd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
-        file(INSTALL ${ACE_ROOT}/lib/TAO_IDL_BEd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
+        file(COPY ${ACE_ROOT}/lib/TAO_IDL_FEd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
+        file(COPY ${ACE_ROOT}/lib/TAO_IDL_BEd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
     endif()
 endif()
 
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindACE.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindTAO.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/TAO_IDL.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
+
 # Handle copyright
 file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace/)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/ace/copyright)

From 0f884f0ada83d8a063fd5028e07b6e042ad94497 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Mon, 7 Oct 2019 22:36:22 +0700
Subject: [PATCH 03/29] fix CMake script

---
 ports/ace/portfile.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 208801caee875d..28923426ec1f8e 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -57,7 +57,7 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"\n#define ACE_NO_INLINE")
 endif()
 
-if((NOT VCPKG_CMAKE_SYSTEM_NAME) OR ("WindowsStore" STREQUAL ${VCPKG_CMAKE_SYSTEM_NAME}))
+if((NOT VCPKG_CMAKE_SYSTEM_NAME) OR ("WindowsStore" STREQUAL VCPKG_CMAKE_SYSTEM_NAME))
   if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(DLL_DECORATOR s)
   endif()
@@ -166,7 +166,7 @@ vcpkg_execute_required_process(
 ###################################################
 
 # Build for Windows
-if((NOT VCPKG_CMAKE_SYSTEM_NAME) OR ("WindowsStore" STREQUAL ${VCPKG_CMAKE_SYSTEM_NAME}))
+if((NOT VCPKG_CMAKE_SYSTEM_NAME) OR ("WindowsStore" STREQUAL VCPKG_CMAKE_SYSTEM_NAME))
     vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" PLATFORM ${MSBUILD_PLATFORM} USE_VCPKG_INTEGRATION)
 elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   FIND_PROGRAM(MAKE make)

From 7676509baa9368cf92740d5edac90b15a707686e Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Tue, 8 Oct 2019 07:23:03 +0700
Subject: [PATCH 04/29] Now not copying the CMake Find files anymore.

Corrected the installation location for TAO_IDL
---
 ports/ace/portfile.cmake | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 89e343a3391cd6..2ecb86abb70352 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -286,7 +286,7 @@ function(install_tao_executables SOURCE_PATH EXE_FILE)
         set(EXECUTABLE_SUFFIX "")
     endif()
     if(EXISTS "${ACE_ROOT}/bin/${EXE_FILE}${EXECUTABLE_SUFFIX}")
-        file(COPY ${ACE_ROOT}/bin/${EXE_FILE}${EXECUTABLE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace-tao)
+        file(COPY ${ACE_ROOT}/bin/${EXE_FILE}${EXECUTABLE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
     endif()
 endfunction()
 
@@ -308,11 +308,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     endif()
 endif()
 
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindACE.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindTAO.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/TAO_IDL.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace)
-
 # Handle copyright
 file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace/)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/ace/copyright)

From b55cc45e34c7bb5d8824aedbae11ad8f5cc8b07b Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 2 Apr 2020 00:47:23 +0700
Subject: [PATCH 05/29] Removed deprecated vcpkg_common_functions inclusion

Updated to TAO 6.5.8
Removed redundant patch files
---
 ports/ace/portfile.cmake | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 2ecb86abb70352..e20dea1454745b 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -1,5 +1,4 @@
 
-include(vcpkg_common_functions)
 
 set(ACE_ROOT ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers)
 set(TAO_ROOT ${ACE_ROOT}/tao)
@@ -20,19 +19,33 @@ endif()
 #
 ###################################################
 
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_6/ACE+TAO-src-6.5.6.tar.gz"
-    FILENAME ACE+TAO-src-6.5.6.tar.gz
-    SHA512 7d1e6bafee3ecb831105e4815822cf9d87b400ea26d73aea6eeaab7d7c68599da91dc62718f5840eaebd8f29c6e3a32c9d2f768a0e8686ca7265dc97a4026c52
-)
+# Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter"
+# when invoking `prj_install.pl`.
+# So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it.
+if(VCPKG_TARGET_IS_WINDOWS)
+  # Don't change to vcpkg_from_github! This points to a release and not an archive
+  vcpkg_download_distfile(ARCHIVE
+      URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-src-6.5.8.zip"
+      FILENAME ACE+TAO-src-6.5.8.zip
+      SHA512 847621bdd72b5a6909cbdef1d6e3c8792aa29f0b44e64c49c64c5d87df4fe703c6a27b15465d655e97ca8cc0df7449ac012f90f6de5d82b8e30bfbeb2e7057c2
+  )
+else(VCPKG_TARGET_IS_WINDOWS)
+  # VCPKG_TARGET_IS_LINUX
+  vcpkg_download_distfile(ARCHIVE
+      URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-src-6.5.8.tar.gz"
+      FILENAME ACE+TAO-src-6.5.8.tar.gz
+      SHA512 4440975cac5baaa1d6fce869fbac73f15cf86942df3dab0f06c2309d9e20f6a79d826690138baf2ce5b232a1255d9e09cae0e40bd0cddae3d26ca9eb937871db
+  )
+endif()
+
 vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_apply_patches(
     SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/qtcoreapplication.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/bzip2.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/mpc-arm.patch"
-        "${CMAKE_CURRENT_LIST_DIR}/stacktrace-arm.patch"
+        #"${CMAKE_CURRENT_LIST_DIR}/qtcoreapplication.patch"
+        #"${CMAKE_CURRENT_LIST_DIR}/bzip2.patch"
+        #"${CMAKE_CURRENT_LIST_DIR}/mpc-arm.patch"
+        #"${CMAKE_CURRENT_LIST_DIR}/stacktrace-arm.patch"
         "${CMAKE_CURRENT_LIST_DIR}/arm_prevent_amd64_definition.patch"
 )
 
@@ -85,10 +98,10 @@ if("xml" IN_LIST FEATURES)
 else()
     list(APPEND ACE_FEATURE_LIST "xml=0")
 endif()
-
 if("ssl" IN_LIST FEATURES)
     set(ENV{SSL_ROOT} ${INSTALLED_PATH})
     list(APPEND ACE_FEATURE_LIST "ssl=1")
+    list(APPEND ACE_FEATURE_LIST "openssl11=1")
 else()
     list(APPEND ACE_FEATURE_LIST "ssl=0")
 endif()

From 7de2270d912eabc80aac2a641764c4bb6d563222 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 2 Apr 2020 06:40:58 +0700
Subject: [PATCH 06/29] changed the feature names (removed tao-)

---
 ports/ace/CONTROL        | 19 ++++++++++---------
 ports/ace/portfile.cmake | 25 ++++++++++---------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index c44a09409a726d..b62f73bb24a8a0 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -8,26 +8,27 @@ Feature: wchar
 Description: Enable extra wide char functions
 
 Feature: ssl
-Description: Enable SSL/TLS features
 Build-Depends: openssl
+Description: Enable SSL/TLS features
 
 Feature: xml
+Build-Depends: xerces-c
 Description: Enable XML features
 
 Feature: qt5
 Build-Depends: qt5-base
 Description: Enable Qt5 support
 
-Feature: tao
-Description: The ACE ORB
+Feature: zlib
+Build-Depends: zlib
+Description: Enable zlib support
 
-Feature: tao-zlib
-Build-Depends: zlib, ace[tao]
-Description: Enable zlib support for TAO
+Feature: bzip2
+Build-Depends: bzip2
+Description: Enable bzip2 support
 
-Feature: tao-bzip2
-Build-Depends: bzip2, ace[tao]
-Description: Enable bzip2 support for TAO
+Feature: tao
+Description: The ACE ORB
 
 
 
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index e20dea1454745b..c35687c281d199 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -42,14 +42,10 @@ vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_apply_patches(
     SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers
     PATCHES
-        #"${CMAKE_CURRENT_LIST_DIR}/qtcoreapplication.patch"
-        #"${CMAKE_CURRENT_LIST_DIR}/bzip2.patch"
-        #"${CMAKE_CURRENT_LIST_DIR}/mpc-arm.patch"
-        #"${CMAKE_CURRENT_LIST_DIR}/stacktrace-arm.patch"
         "${CMAKE_CURRENT_LIST_DIR}/arm_prevent_amd64_definition.patch"
+        "${CMAKE_CURRENT_LIST_DIR}/bzip2.patch"
 )
 
-
 ###################################################
 #
 #   Generate features string
@@ -101,7 +97,7 @@ endif()
 if("ssl" IN_LIST FEATURES)
     set(ENV{SSL_ROOT} ${INSTALLED_PATH})
     list(APPEND ACE_FEATURE_LIST "ssl=1")
-    list(APPEND ACE_FEATURE_LIST "openssl11=1")
+    # list(APPEND ACE_FEATURE_LIST "openssl11=1") # use for new lib names (i.e. libcrypto)
 else()
     list(APPEND ACE_FEATURE_LIST "ssl=0")
 endif()
@@ -117,23 +113,23 @@ if("qt5" IN_LIST FEATURES)
 else()
     list(APPEND ACE_FEATURE_LIST "qt5=0")
 endif()
-if("tao" IN_LIST FEATURES)
-    set(BUILD_TAO 1)
-else()
-    set(BUILD_TAO 0)    
-endif()
-if("tao-bzip2" IN_LIST FEATURES)
+if("bzip2" IN_LIST FEATURES)
     set(ENV{BZIP2_ROOT} ${INSTALLED_PATH})
     list(APPEND ACE_FEATURE_LIST "bzip2=1")
 else()
     list(APPEND ACE_FEATURE_LIST "bzip2=0")
 endif()
-if("tao-zlib" IN_LIST FEATURES)
+if("zlib" IN_LIST FEATURES)
     set(ENV{ZLIB_ROOT} ${INSTALLED_PATH})
     list(APPEND ACE_FEATURE_LIST "zlib=1")
 else()
     list(APPEND ACE_FEATURE_LIST "zlib=0")
 endif()
+if("tao" IN_LIST FEATURES)
+    set(BUILD_TAO 1)
+else()
+    set(BUILD_TAO 0)    
+endif()
 list(JOIN ACE_FEATURE_LIST "," ACE_FEATURES)
 string(PREPEND ACE_FEATURES ",")
 
@@ -170,7 +166,6 @@ vcpkg_execute_required_process(
     LOGNAME mwc-tao-${TARGET_TRIPLET}
 )
 
-
 ###################################################
 #
 #   Build
@@ -179,7 +174,7 @@ vcpkg_execute_required_process(
 
 # Build for Windows
 if((NOT VCPKG_CMAKE_SYSTEM_NAME) OR ("WindowsStore" STREQUAL VCPKG_CMAKE_SYSTEM_NAME))
-    vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" PLATFORM ${MSBUILD_PLATFORM} USE_VCPKG_INTEGRATION)
+    vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" PLATFORM ${MSBUILD_PLATFORM} OPTIONS /m USE_VCPKG_INTEGRATION)
 elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   FIND_PROGRAM(MAKE make)
   IF (NOT MAKE)

From 7243c7018ff13fc80e0ab7ec0427dac9da402b11 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 2 Apr 2020 06:46:06 +0700
Subject: [PATCH 07/29] Updated version in CONTROL file, removed Maintainer
 string and replaced Homepage protocol to https.

---
 ports/ace/CONTROL | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index b62f73bb24a8a0..cf832160136ed9 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -1,8 +1,7 @@
 Source: ace
-Version: 6.5.6
+Version: 6.5.8
 Description: The ADAPTIVE Communication Environment
-Homepage: http://www.dre.vanderbilt.edu/~schmidt/TAO.html
-Maintainer: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
+Homepage: https://www.dre.vanderbilt.edu/~schmidt/TAO.html
 
 Feature: wchar
 Description: Enable extra wide char functions

From 15419a774abd82654005e9f26dfdfa2c29cab5f3 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 2 Apr 2020 07:08:28 +0700
Subject: [PATCH 08/29] temporarily added .gitlab-ci.yml

---
 .gitlab-ci.yml | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000000000..88b8f0dc954dd0
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,65 @@
+stages:
+  - build
+build-windows:
+  tags:
+    - msvc142
+  variables:
+    GIT_STRATEGY: fetch
+    TRIPLET: "x64-windows"
+    #PACKAGES: "boost curl[ssl,openssl,winssl,non-http,ssh,brotli] curlpp jsoncpp libgit2 libpq libpqxx soci[odbc,postgresql,sqlite3]" # libmariadb thrift grpc 7zip capnproto cppcodec platform-folders podofo qt5
+    PACKAGES: jsoncpp zlib
+  stage: build
+  before_script:
+    - 'subst Q: (Get-Location); echo ok'
+  script:
+    - Invoke-BatchFile "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Community\Common7\Tools\VsMSBuildCmd.bat"
+    - $physicalBuildPath = Get-Location
+    #- 'subst Q: $physicalBuildPath; echo ok'
+    - Set-Location Q:\
+    - .\bootstrap-vcpkg.bat -disableMetrics
+    - $Env:VCPKG_DEFAULT_TRIPLET=$TRIPLET
+    - .\vcpkg remove ace-tao
+    - .\vcpkg.exe upgrade --no-dry-run
+    - .\vcpkg.exe install openssl boost jsoncpp libgit2 libpq libpqxx soci[boost,odbc,postgresql,sqlite3] graphicsmagick libharu wt curl[ssl,brotli,http2] curlpp cpprestsdk thrift google-cloud-cpp icu json-spirit qt5 --recurse # libmariadb grpc 7zip capnproto cppcodec platform-folders podofo
+#    - .\vcpkg.exe install openssl boost jsoncpp libgit2 libpq libpqxx soci[boost,odbc,postgresql,sqlite3] graphicsmagick libharu wt curl[ssl,brotli,http2] curlpp cpprestsdk thrift google-cloud-cpp icu json-spirit qt5 --recurse
+    - Set-Location $physicalBuildPath
+    - .\vcpkg.exe export openssl boost jsoncpp libgit2 libpq libpqxx soci[boost,odbc,postgresql,sqlite3] graphicsmagick libharu wt curl[ssl,brotli,http2] curlpp cpprestsdk thrift google-cloud-cpp icu json-spirit qt5 --zip --output=vcpkg-$TRIPLET
+    - 'net use J: \\FILESRV\Shared /user:jenkins_user 3Edcft67; echo ok'
+    #- Copy-Item "vcpkg-$TRIPLET-ifw-installer.exe" -Destination "J:\vcpkg" -Force
+    - Copy-Item "vcpkg-x64-windows.zip" -Destination "J:\vcpkg" -Force
+    - 'net use /delete J:'
+  after_script:
+    - 'subst /d Q:'
+  cache:
+    key: vcpkg_msvc142_$TRIPLET
+    paths:
+    - packages
+    - downloads
+    - installed
+  except:
+    - tags
+
+
+build-linux:
+  tags:
+    - gcc
+    - linux
+  variables:
+    GIT_STRATEGY: fetch
+    TRIPLET: "x64-linux"
+  stage: build
+  script:
+  - ./bootstrap-vcpkg.sh
+  - export VCPKG_DEFAULT_TRIPLET=$TRIPLET
+  - ./vcpkg upgrade --no-dry-run
+  - ./vcpkg install boost curl[ssl,brotli] curlpp jsoncpp libgit2 libpq libpqxx soci[odbc,postgresql,sqlite3] thrift grpc wt cpprestsdk freetds[openssl] google-cloud-cpp icu json-spirit pugixml libharu qt5 ace[tao-zlib,tao-bzip2,ssl,qt5,xml] --recurse
+  - ./vcpkg export boost curl[ssl,brotli] curlpp jsoncpp libgit2 libpq libpqxx soci[odbc,postgresql,sqlite3] thrift grpc wt cpprestsdk freetds[openssl] google-cloud-cpp icu json-spirit pugixml libharu qt5 qwt x-plane ace[tao-zlib,tao-bzip2,ssl,qt5,xml] --zip --output=vcpkg-$TRIPLET
+  cache:
+    key: vcpkg_gcc_$TRIPLET
+    paths:
+    - packages
+    - downloads
+    - installed
+  after_script:
+  except:
+    - tags
\ No newline at end of file

From 21dbefe05ba3c8b7cafba78de00cd549bad36d9b Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 2 Apr 2020 07:10:11 +0700
Subject: [PATCH 09/29] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88b8f0dc954dd0..0feb75a68da48d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,10 +20,10 @@ build-windows:
     - $Env:VCPKG_DEFAULT_TRIPLET=$TRIPLET
     - .\vcpkg remove ace-tao
     - .\vcpkg.exe upgrade --no-dry-run
-    - .\vcpkg.exe install openssl boost jsoncpp libgit2 libpq libpqxx soci[boost,odbc,postgresql,sqlite3] graphicsmagick libharu wt curl[ssl,brotli,http2] curlpp cpprestsdk thrift google-cloud-cpp icu json-spirit qt5 --recurse # libmariadb grpc 7zip capnproto cppcodec platform-folders podofo
+    - .\vcpkg.exe install openssl boost jsoncpp libgit2 libpq libpqxx soci[boost,odbc,postgresql,sqlite3] graphicsmagick libharu wt curl[ssl,brotli,http2] curlpp cpprestsdk thrift google-cloud-cpp icu json-spirit qt5 ace[*] --recurse # libmariadb grpc 7zip capnproto cppcodec platform-folders podofo
 #    - .\vcpkg.exe install openssl boost jsoncpp libgit2 libpq libpqxx soci[boost,odbc,postgresql,sqlite3] graphicsmagick libharu wt curl[ssl,brotli,http2] curlpp cpprestsdk thrift google-cloud-cpp icu json-spirit qt5 --recurse
     - Set-Location $physicalBuildPath
-    - .\vcpkg.exe export openssl boost jsoncpp libgit2 libpq libpqxx soci[boost,odbc,postgresql,sqlite3] graphicsmagick libharu wt curl[ssl,brotli,http2] curlpp cpprestsdk thrift google-cloud-cpp icu json-spirit qt5 --zip --output=vcpkg-$TRIPLET
+    - .\vcpkg.exe export openssl boost jsoncpp libgit2 libpq libpqxx soci[boost,odbc,postgresql,sqlite3] graphicsmagick libharu wt curl[ssl,brotli,http2] curlpp cpprestsdk thrift google-cloud-cpp icu json-spirit qt5 ace[*] --zip --output=vcpkg-$TRIPLET
     - 'net use J: \\FILESRV\Shared /user:jenkins_user 3Edcft67; echo ok'
     #- Copy-Item "vcpkg-$TRIPLET-ifw-installer.exe" -Destination "J:\vcpkg" -Force
     - Copy-Item "vcpkg-x64-windows.zip" -Destination "J:\vcpkg" -Force

From 870dcc3a33653fbd67b20d31467a5cd5663cab3b Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 2 Apr 2020 07:45:52 +0700
Subject: [PATCH 10/29] openssl11=1

---
 ports/ace/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index c35687c281d199..f0d177f7ee4b5d 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -97,7 +97,7 @@ endif()
 if("ssl" IN_LIST FEATURES)
     set(ENV{SSL_ROOT} ${INSTALLED_PATH})
     list(APPEND ACE_FEATURE_LIST "ssl=1")
-    # list(APPEND ACE_FEATURE_LIST "openssl11=1") # use for new lib names (i.e. libcrypto)
+    list(APPEND ACE_FEATURE_LIST "openssl11=1") # use for new lib names (i.e. libcrypto)
 else()
     list(APPEND ACE_FEATURE_LIST "ssl=0")
 endif()

From 086c8206115b097b1e112354620955e2d827656c Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 2 Apr 2020 18:32:12 +0700
Subject: [PATCH 11/29] Removed entries from ci.ci.baseline.txt

---
 scripts/ci.baseline.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 3fa5958d70b1a4..401da7653bc4cd 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -45,10 +45,7 @@
 7zip:x64-osx=fail
 7zip:x64-uwp=fail
 abseil:arm-uwp=fail
-ace:arm64-windows=fail
-ace:arm-uwp=fail
 ace:x64-osx=fail
-ace:x64-uwp=fail
 activemq-cpp:x64-windows-static=fail
 akali:x64-uwp=fail
 akali:arm-uwp=fail

From 1e273f1dbe57d1cf3129afffc9e4ba3bbd853cc9 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 2 Apr 2020 18:35:03 +0700
Subject: [PATCH 12/29] removed .gitlab-ci.yml

---
 .gitlab-ci.yml | 65 --------------------------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 0feb75a68da48d..00000000000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-stages:
-  - build
-build-windows:
-  tags:
-    - msvc142
-  variables:
-    GIT_STRATEGY: fetch
-    TRIPLET: "x64-windows"
-    #PACKAGES: "boost curl[ssl,openssl,winssl,non-http,ssh,brotli] curlpp jsoncpp libgit2 libpq libpqxx soci[odbc,postgresql,sqlite3]" # libmariadb thrift grpc 7zip capnproto cppcodec platform-folders podofo qt5
-    PACKAGES: jsoncpp zlib
-  stage: build
-  before_script:
-    - 'subst Q: (Get-Location); echo ok'
-  script:
-    - Invoke-BatchFile "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Community\Common7\Tools\VsMSBuildCmd.bat"
-    - $physicalBuildPath = Get-Location
-    #- 'subst Q: $physicalBuildPath; echo ok'
-    - Set-Location Q:\
-    - .\bootstrap-vcpkg.bat -disableMetrics
-    - $Env:VCPKG_DEFAULT_TRIPLET=$TRIPLET
-    - .\vcpkg remove ace-tao
-    - .\vcpkg.exe upgrade --no-dry-run
-    - .\vcpkg.exe install openssl boost jsoncpp libgit2 libpq libpqxx soci[boost,odbc,postgresql,sqlite3] graphicsmagick libharu wt curl[ssl,brotli,http2] curlpp cpprestsdk thrift google-cloud-cpp icu json-spirit qt5 ace[*] --recurse # libmariadb grpc 7zip capnproto cppcodec platform-folders podofo
-#    - .\vcpkg.exe install openssl boost jsoncpp libgit2 libpq libpqxx soci[boost,odbc,postgresql,sqlite3] graphicsmagick libharu wt curl[ssl,brotli,http2] curlpp cpprestsdk thrift google-cloud-cpp icu json-spirit qt5 --recurse
-    - Set-Location $physicalBuildPath
-    - .\vcpkg.exe export openssl boost jsoncpp libgit2 libpq libpqxx soci[boost,odbc,postgresql,sqlite3] graphicsmagick libharu wt curl[ssl,brotli,http2] curlpp cpprestsdk thrift google-cloud-cpp icu json-spirit qt5 ace[*] --zip --output=vcpkg-$TRIPLET
-    - 'net use J: \\FILESRV\Shared /user:jenkins_user 3Edcft67; echo ok'
-    #- Copy-Item "vcpkg-$TRIPLET-ifw-installer.exe" -Destination "J:\vcpkg" -Force
-    - Copy-Item "vcpkg-x64-windows.zip" -Destination "J:\vcpkg" -Force
-    - 'net use /delete J:'
-  after_script:
-    - 'subst /d Q:'
-  cache:
-    key: vcpkg_msvc142_$TRIPLET
-    paths:
-    - packages
-    - downloads
-    - installed
-  except:
-    - tags
-
-
-build-linux:
-  tags:
-    - gcc
-    - linux
-  variables:
-    GIT_STRATEGY: fetch
-    TRIPLET: "x64-linux"
-  stage: build
-  script:
-  - ./bootstrap-vcpkg.sh
-  - export VCPKG_DEFAULT_TRIPLET=$TRIPLET
-  - ./vcpkg upgrade --no-dry-run
-  - ./vcpkg install boost curl[ssl,brotli] curlpp jsoncpp libgit2 libpq libpqxx soci[odbc,postgresql,sqlite3] thrift grpc wt cpprestsdk freetds[openssl] google-cloud-cpp icu json-spirit pugixml libharu qt5 ace[tao-zlib,tao-bzip2,ssl,qt5,xml] --recurse
-  - ./vcpkg export boost curl[ssl,brotli] curlpp jsoncpp libgit2 libpq libpqxx soci[odbc,postgresql,sqlite3] thrift grpc wt cpprestsdk freetds[openssl] google-cloud-cpp icu json-spirit pugixml libharu qt5 qwt x-plane ace[tao-zlib,tao-bzip2,ssl,qt5,xml] --zip --output=vcpkg-$TRIPLET
-  cache:
-    key: vcpkg_gcc_$TRIPLET
-    paths:
-    - packages
-    - downloads
-    - installed
-  after_script:
-  except:
-    - tags
\ No newline at end of file

From 48801fe3830cdc044f2d5627c918d31acd7de46a Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Fri, 3 Apr 2020 01:17:15 +0700
Subject: [PATCH 13/29] Removed unnecessary patch files and other files

---
 ports/ace/FindACE.cmake           |  66 -----------
 ports/ace/FindTAO.cmake           |  85 --------------
 ports/ace/TAO_IDL.cmake           |  34 ------
 ports/ace/mpc-arm.patch           |  36 ------
 ports/ace/qtcoreapplication.patch | 187 ------------------------------
 ports/ace/stacktrace-arm.patch    |  27 -----
 6 files changed, 435 deletions(-)
 delete mode 100644 ports/ace/FindACE.cmake
 delete mode 100644 ports/ace/FindTAO.cmake
 delete mode 100644 ports/ace/TAO_IDL.cmake
 delete mode 100644 ports/ace/mpc-arm.patch
 delete mode 100644 ports/ace/qtcoreapplication.patch
 delete mode 100644 ports/ace/stacktrace-arm.patch

diff --git a/ports/ace/FindACE.cmake b/ports/ace/FindACE.cmake
deleted file mode 100644
index 8066b9da465264..00000000000000
--- a/ports/ace/FindACE.cmake
+++ /dev/null
@@ -1,66 +0,0 @@
-set(ACE_FOUND FALSE)
-
-find_path(ACE_INCLUDE_DIR ace/ACE.h PATHS $ENV{ACE_ROOT} $ENV{ACE_ROOT}/include /usr/include /usr/local/include NO_DEFAULT_PATH)
-find_library(ACE_LIBRARY_RELEASE NAMES ACE PATHS $ENV{ACE_ROOT}/lib /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 NO_DEFAULT_PATH)
-find_library(ACE_LIBRARY_DEBUG NAMES ACEd PATHS $ENV{ACE_ROOT}/lib /debug/lib /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 NO_DEFAULT_PATH)
-
-
-if(ACE_INCLUDE_DIR AND ACE_LIBRARY_RELEASE)
-  SET(ACE_FOUND TRUE)
-endif(ACE_INCLUDE_DIR AND ACE_LIBRARY_RELEASE)
-#now let's search for parts of ACE we need.
-
-GET_FILENAME_COMPONENT(ACE_LIBRARY_RELEASE_DIR ${ACE_LIBRARY_RELEASE} PATH)
-GET_FILENAME_COMPONENT(ACE_LIBRARY_DEBUG_DIR ${ACE_LIBRARY_DEBUG} PATH)
-
-set(ACE_LIBRARIES_RELEASE ${ACE_LIBRARY_RELEASE})
-set(ACE_LIBRARIES_DEBUG ${ACE_LIBRARY_DEBUG})
-
-if(ACE_FOUND)
-	set(ACE_FIND_LIBS "ACE" "Compression" "ETCL" "ETCL_Parser" "HTBP" "INet" "INet_SSL"
-    "Monitor_Control" "QoS" "QtReactor" "RLECompression" "RMCast" "SSL" 
-    "TMCast" "ACEXML" "ACEXML_Parser" "Kokyu")
-    	
-    message("Finding ACE libraries...")
-	
-	if(WIN32)
-		message(STATUS "ACE release found at: ${ACE_LIBRARY_RELEASE}")
-		message(STATUS "ACE debug found at: ${ACE_LIBRARY_DEBUG}")
-		set(ACE_LIBRARY optimized ${ACE_LIBRARY_RELEASE} debug ${ACE_LIBRARY_DEBUG})
-	else(WIN32)
-		message(STATUS "ACE found at: ${ACE_LIBRARY_RELEASE}")
-		set(ACE_LIBRARY ${ACE_LIBRARY_RELEASE})
-	endif(WIN32)
-	
-    foreach(LIBRARY ${ACE_FIND_LIBS})	
-		if(WIN32)
-			find_library(ACE_${LIBRARY}_LIBRARY_DEBUG NAMES "ACE_${LIBRARY}d" "ACE${LIBRARY}d" "${LIBRARY}d" PATHS ${ACE_LIBRARY_DEBUG_DIR} NO_DEFAULT_PATH)
-			if(ACE_${LIBRARY}_LIBRARY_DEBUG)
-				message(STATUS "${LIBRARY} debug found at: ${ACE_${LIBRARY}_LIBRARY_DEBUG}")
-				list(APPEND ACE_LIBRARIES_DEBUG ${ACE_${LIBRARY}_LIBRARY_DEBUG})
-			else(ACE_${LIBRARY}_LIBRARY_DEBUG)
-				set(ACE_FOUND FALSE)
-			endif(ACE_${LIBRARY}_LIBRARY_DEBUG)
-		endif(WIN32)
-
-        find_library(ACE_${LIBRARY}_LIBRARY_RELEASE NAMES "ACE_${LIBRARY}" "ACE${LIBRARY}" "${LIBRARY}" PATHS ${ACE_LIBRARY_RELEASE_DIR} NO_DEFAULT_PATH)
-        if(ACE_${LIBRARY}_LIBRARY_RELEASE)
-			if(WIN32)
-				message(STATUS "${LIBRARY} release found at: ${ACE_${LIBRARY}_LIBRARY_RELEASE}")
-			else(WIN32)
-				message(STATUS "${LIBRARY} found at: ${ACE_${LIBRARY}_LIBRARY_RELEASE}")
-			endif(WIN32)
-			list(APPEND ACE_LIBRARIES_RELEASE ${ACE_${LIBRARY}_LIBRARY_RELEASE})
-        else(ACE_${LIBRARY}_LIBRARY_RELEASE)
-			set(ACE_FOUND FALSE)
-        endif(ACE_${LIBRARY}_LIBRARY_RELEASE)
-
-		if(WIN32)
-			set(ACE_${LIBRARY}_LIBRARY optimized ${ACE_${LIBRARY}_LIBRARY_RELEASE} debug ${ACE_${LIBRARY}_LIBRARY_DEBUG})
-		else(WIN32)
-			set(ACE_${LIBRARY}_LIBRARY ${ACE_${LIBRARY}_LIBRARY_RELEASE})
-		endif(WIN32)
-    endforeach()
-endif(ACE_FOUND)
-
-
diff --git a/ports/ace/FindTAO.cmake b/ports/ace/FindTAO.cmake
deleted file mode 100644
index dc3bc505f48eaf..00000000000000
--- a/ports/ace/FindTAO.cmake
+++ /dev/null
@@ -1,85 +0,0 @@
-set(TAO_FOUND FALSE)
-
-find_path(TAO_INCLUDE_DIR tao/corba.h PATHS $ENV{ACE_ROOT} $ENV{TAO_ROOT} $ENV{TAO_ROOT}/include $ENV{ACE_ROOT}/include /usr/include /usr/local/include NO_DEFAULT_PATH)
-find_library(TAO_LIBRARY_RELEASE NAMES TAO PATHS $ENV{ACE_ROOT}/lib /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 NO_DEFAULT_PATH)
-find_library(TAO_LIBRARY_DEBUG NAMES TAOd PATHS $ENV{ACE_ROOT}/lib /debug/lib /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 NO_DEFAULT_PATH)
-find_program(TAO_IDL_COMPILER "tao_idl" /usr/bin $ENV{TAO_ROOT}/bin $ENV{ACE_ROOT}/bin /usr/bin /usr/local/bin /tools/ace-tao NO_DEFAULT_PATH)
-message(STATUS "tao_idl at: ${TAO_IDL_COMPILER}")
-
-if(TAO_INCLUDE_DIR AND TAO_LIBRARY_RELEASE AND TAO_IDL_COMPILER)
-  SET(TAO_FOUND TRUE)
-endif(TAO_INCLUDE_DIR AND TAO_LIBRARY_RELEASE AND TAO_IDL_COMPILER)
-#now let's search for parts of tao we need.
-
-GET_FILENAME_COMPONENT(TAO_LIBRARY_RELEASE_DIR ${TAO_LIBRARY_RELEASE} PATH)
-GET_FILENAME_COMPONENT(TAO_LIBRARY_DEBUG_DIR ${TAO_LIBRARY_DEBUG} PATH)
-
-set(TAO_LIBRARIES_RELEASE ${TAO_LIBRARY_RELEASE})
-set(TAO_LIBRARIES_DEBUG ${TAO_LIBRARY_DEBUG})
-
-
-if(TAO_FOUND)
-	set(TAO_FIND_LIBS "AnyTypeCode" "Async_ImR_Client_IDL"
-    "Async_IORTable" "AV" "BiDirGIOP" "Bzip2Compressor" "Catior_i" "CodecFactory" "Codeset" 
-    "Compression" "CosConcurrency" "CosConcurrency_Serv" "CosConcurrency_Skel" "CosEvent"
-    "CosEvent_Serv"  "CosEvent_Skel" "CosLifeCycle" "CosLifeCycle_Skel" "CosLoadBalancing"
-    "CosNaming" "CosNaming_Serv" "CosNaming_Skel" "CosNotification" "CosNotification_MC"
-    "CosNotification_MC_Ext"
-    "CosNotification_Serv" "CosNotification_Skel" "CosNotification_Persist" "CosProperty"
-    "CosProperty_Serv" "CosProperty_Skel" "CosTime" "CosTime_Serv" "CosTrading"
-    "CosTrading_Serv" "CosTrading_Skel" "CSD_Framework" "CSD_ThreadPool" "DiffServPolicy"
-    "DsEventLogAdmin" "DsEventLogAdmin_Serv" "DsEventLogAdmin_Skel" "DsLogAdmin"
-    "DsLogAdmin_Serv" "DsLogAdmin_Skel" "DsNotifyLogAdmin" "DsNotifyLogAdmin_Serv"
-    "DsNotifyLogAdmin_Skel" "Dynamic_TP" "DynamicAny" "DynamicInterface" "EndpointPolicy"
-    "ETCL" "FT_Naming_Serv" "FT_ServerORB" "FtNaming" "FtNamingReplication" 
-    "FTORB_Utils" "FTRT_ClientORB" "FTRT_EventChannel" "FtRtEvent" "HTIOP" "IDL_BE"
-    "IDL_FE" "IFR_BE" "IFR_Client" "IFR_Client_skel" "ImR_Activator_IDL" "ImR_Client"
-    "ImR_Locator_IDL" "IORInterceptor" "IORManip" "IORTable" "Messaging" "Monitor"
-    "Notify_Service" "ObjRefTemplate" "PI" "PI_Server" "PortableGroup" "PortableServer" "QtResource"
-    "ReplicationManagerLib" "RLECompressor" "RT_Notification" "RTCORBA" "RTEvent" "RTEvent_Skel"
-    "RTKokyuEvent" "RTEventLogAdmin" "RTEventLogAdmin_Skel" "RTPortableServer" "RTSched" "RTScheduler"
-    "Security" "SmartProxies"  "Strategies" "Svc_Utils" "TC" "TC_IIOP"
-    "TypeCodeFactory" "Utils" "Valuetype" "ZIOP" "SSLIOP" 
-    "ZlibCompressor")
-    
-    message("Finding TAO libraries...")
-		
-	if(WIN32)
-		message(STATUS "TAO release found at: ${TAO_LIBRARY_RELEASE}")
-		message(STATUS "TAO debug found at: ${TAO_LIBRARY_DEBUG}")
-		set(TAO_LIBRARY optimized ${TAO_LIBRARY_RELEASE} debug ${TAO_LIBRARY_DEBUG})
-	else(WIN32)
-		message(STATUS "TAO found at: ${TAO_LIBRARY_RELEASE}")
-		set(TAO_LIBRARY ${TAO_LIBRARY_RELEASE})
-	endif(WIN32)
-    foreach(LIBRARY ${TAO_FIND_LIBS})
-	    if(WIN32)
-		    find_library(TAO_${LIBRARY}_LIBRARY_DEBUG NAMES "TAO_${LIBRARY}d" PATHS ${TAO_LIBRARY_DEBUG_DIR} NO_DEFAULT_PATH)
-		    if(TAO_${LIBRARY}_LIBRARY_DEBUG)
-			    message(STATUS "${LIBRARY} debug found at: ${TAO_${LIBRARY}_LIBRARY_DEBUG}")
-    	        list(APPEND TAO_LIBRARIES_DEBUG ${TAO_${LIBRARY}_LIBRARY_DEBUG})
-		    else(TAO_${LIBRARY}_LIBRARY_DEBUG)
-		        set(TAO_FOUND FALSE)
-		    endif(TAO_${LIBRARY}_LIBRARY_DEBUG)
-		endif(WIN32)
-        find_library(TAO_${LIBRARY}_LIBRARY_RELEASE NAMES "TAO_${LIBRARY}" ${TAO_LIBRARY} PATHS ${TAO_LIBRARY_RELEASE_DIR} NO_DEFAULT_PATH)
-        if(TAO_${LIBRARY}_LIBRARY_RELEASE)
-            if(WIN32)
-                message(STATUS "${LIBRARY} release found at: ${TAO_${LIBRARY}_LIBRARY_RELEASE}")
-            else(WIN32)
-                message(STATUS "${LIBRARY} found at: ${TAO_${LIBRARY}_LIBRARY_RELEASE}")
-            endif(WIN32)
-          list(APPEND TAO_LIBRARIES_RELEASE ${TAO_${LIBRARY}_LIBRARY_RELEASE})
-        else(TAO_${LIBRARY}_LIBRARY_RELEASE)
-          set(TAO_FOUND FALSE)
-        endif(TAO_${LIBRARY}_LIBRARY_RELEASE)
-
-        if(WIN32)
-            set(TAO_${LIBRARY}_LIBRARY optimized ${TAO_${LIBRARY}_LIBRARY_RELEASE} debug ${TAO_${LIBRARY}_LIBRARY_DEBUG})
-        else(WIN32)
-            set(TAO_${LIBRARY}_LIBRARY ${TAO_${LIBRARY}_LIBRARY_RELEASE})
-        endif(WIN32)
-    endforeach()
-endif(TAO_FOUND)
-
-
diff --git a/ports/ace/TAO_IDL.cmake b/ports/ace/TAO_IDL.cmake
deleted file mode 100644
index b26cf98ab6618c..00000000000000
--- a/ports/ace/TAO_IDL.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-FIND_PROGRAM( TAO_IDL_COMMAND tao_idl )
-
-MACRO( APPEND orig_string new_string )
-  IF( NOT ${orig_string} )
-    SET( ${orig_string} ${new_string} )
-  ELSE( NOT ${orig_string} )
-    SET( ${orig_string} ${${orig_string}} ${new_string} )
-  ENDIF( NOT ${orig_string} )
-ENDMACRO( APPEND orig_string new_string )
-
-MACRO( GENERATE_TAO_IDL_RULES generated_client_sources generated_client_headers generated_client_inlines generated_server_sources generated_server_headers)
-  FOREACH( idl_source ${ARGN} )
-    STRING( REGEX REPLACE "\\.idl" C.cpp client_source_output ${idl_source} )
-    STRING( REGEX REPLACE "\\.idl" C.h   client_header_output ${idl_source} )
-    STRING( REGEX REPLACE "\\.idl" C.inl   client_inline_output ${idl_source} )
-    STRING( REGEX REPLACE "\\.idl" S.cpp server_source_output ${idl_source} )
-    STRING( REGEX REPLACE "\\.idl" S.h   server_header_output ${idl_source} )
-
-    ADD_CUSTOM_COMMAND(
-      OUTPUT ${client_source_output} ${client_header_output} ${server_source_output} ${server_header_output}
-      COMMAND ${TAO_IDL_COMMAND}
-      ARGS ${TAO_IDL_ARGS} ${CMAKE_CURRENT_SOURCE_DIR}/${idl_source}
-      DEPENDS ${idl_source}
-      COMMENT "Generating ${client_source_output}, ${client_header_output}, ${client_inline_output}, ${server_source_output}, ${server_header_output} from ${idl_source}"
-    )
-
-    list(APPEND ${generated_client_sources} ${CMAKE_CURRENT_BINARY_DIR}/${client_source_output})
-    list(APPEND ${generated_client_headers} ${CMAKE_CURRENT_BINARY_DIR}/${client_header_output})
-    list(APPEND ${generated_client_inlines} ${CMAKE_CURRENT_BINARY_DIR}/${client_inline_output})
-    list(APPEND ${generated_server_sources} ${CMAKE_CURRENT_BINARY_DIR}/${server_source_output})
-    list(APPEND ${generated_server_headers} ${CMAKE_CURRENT_BINARY_DIR}/${server_header_output})
-
-  ENDFOREACH( idl_source ${ARGN} )
-ENDMACRO( GENERATE_TAO_IDL_RULES generated_client_sources generated_client_headers generated_server_sources generated_server_headers )
diff --git a/ports/ace/mpc-arm.patch b/ports/ace/mpc-arm.patch
deleted file mode 100644
index 7a1610761b3580..00000000000000
--- a/ports/ace/mpc-arm.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/MPC/templates/vs2019platforms.mpt b/MPC/templates/vs2019platforms.mpt
-index 4f5dbfa8..1f4671b1 100644
---- a/MPC/templates/vs2019platforms.mpt
-+++ b/MPC/templates/vs2019platforms.mpt
-@@ -3,9 +3,9 @@
- // Any of these platforms can set using value_template platforms=
- // when generating solutions/projects.
- //
--//platforms = Win32 x64
-+//platforms = Win32 x64 ARM ARM64
- 
--platforms = Win32 x64
-+platforms = Win32 x64 ARM ARM64
- default_platform = Win32
- PlatformToolset = v142
- WindowsTargetPlatformVersion = 10.0.17763.0
-@@ -22,3 +22,18 @@ x64 {
-   link_options     = /machine:AMD64
- }
- 
-+ARM {
-+  output_subdir    = ARM
-+  cpu_defines      = _ARM_
-+  platform_defines = _ARM
-+  TargetMachine    = "0"             // We let VC++ figure it out for us.
-+  link_options     = /machine:ARM
-+}
-+
-+ARM64 {
-+  output_subdir    = ARM64
-+  cpu_defines      = _ARM64_
-+  platform_defines = _ARM64
-+  TargetMachine    = "0"             // We let VC++ figure it out for us.
-+  link_options     = /machine:ARM64
-+}
-\ No newline at end of file
diff --git a/ports/ace/qtcoreapplication.patch b/ports/ace/qtcoreapplication.patch
deleted file mode 100644
index 4292dd7094dd53..00000000000000
--- a/ports/ace/qtcoreapplication.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff --git a/ace/QtReactor/QtReactor.cpp b/ace/QtReactor/QtReactor.cpp
-index ac9fab0c903..6dff0591fdd 100644
---- a/ace/QtReactor/QtReactor.cpp
-+++ b/ace/QtReactor/QtReactor.cpp
-@@ -6,7 +6,7 @@ ACE_ALLOC_HOOK_DEFINE (ACE_QtReactor)
- 
- // Must be called with lock held
- 
--ACE_QtReactor::ACE_QtReactor (QApplication *qapp ,
-+ACE_QtReactor::ACE_QtReactor (QAPPLICATION_TYPE *qapp ,
-     ACE_Sig_Handler *sh,
-     ACE_Timer_Queue *tq,
-     int disable_notify_pipe,
-@@ -23,7 +23,7 @@ ACE_QtReactor::ACE_QtReactor (QApplication *qapp ,
- 
- // Must be called with lock held
- ACE_QtReactor::ACE_QtReactor (size_t size,
--    QApplication *qapp,
-+    QAPPLICATION_TYPE *qapp,
-     bool restart,
-     ACE_Sig_Handler *sh,
-     ACE_Timer_Queue *tq,
-@@ -108,7 +108,7 @@ ACE_QtReactor::~ACE_QtReactor (void)
- }
- 
- void
--ACE_QtReactor::qapplication (QApplication *qapp)
-+ACE_QtReactor::qapplication (QAPPLICATION_TYPE *qapp)
- {
-   // reparent QSocketNotifiers and QTimer
-   qapp_ = qapp ;
-diff --git a/ace/QtReactor/QtReactor.h b/ace/QtReactor/QtReactor.h
-index 6bafe3c7f4c..4f128507a1a 100644
---- a/ace/QtReactor/QtReactor.h
-+++ b/ace/QtReactor/QtReactor.h
-@@ -29,10 +29,12 @@
- 
- // QT toolkit specific includes.
- #ifdef ACE_HAS_QT5
--#include /**/ <QtWidgets/QApplication>
-+#include /**/ <QtCore/QCoreApplication>
-+#define QAPPLICATION_TYPE QCoreApplication
- #define ACE_QT_HANDLE_TYPE qintptr
- #else
- #include /**/ <QtGui/QApplication>
-+#define QAPPLICATION_TYPE QApplication
- #define ACE_QT_HANDLE_TYPE int
- #endif
- #include /**/ <QtCore/QObject>
-@@ -97,9 +99,9 @@ class ACE_QtReactor_Export ACE_QtReactor
- 
- public:
-     /** \brief Constructor follows  @ACE_Select_Reactor
--        \param QApplication *qapp, qapplication which runs events loop
-+        \param QAPPLICATION_TYPE *qapp, qapplication which runs events loop
-     */
--    explicit ACE_QtReactor (QApplication *qapp = 0,
-+    explicit ACE_QtReactor (QAPPLICATION_TYPE *qapp = 0,
-         ACE_Sig_Handler * = 0,
-         ACE_Timer_Queue * = 0,
-         int disable_notify_pipe = 0,
-@@ -111,7 +113,7 @@ public:
-         \param QApplication *qapp, qapplication which runs events loop
-     */
-     explicit ACE_QtReactor (size_t size,
--        QApplication *qapp = 0,
-+        QAPPLICATION_TYPE *qapp = 0,
-         bool restart = false,
-         ACE_Sig_Handler * = 0,
-         ACE_Timer_Queue * = 0,
-@@ -122,7 +124,7 @@ public:
- 
-     virtual ~ACE_QtReactor (void);
- 
--    void qapplication (QApplication *qapp);
-+    void qapplication (QAPPLICATION_TYPE *qapp);
- 
-     // = Timer operations.
-     virtual long schedule_timer (ACE_Event_Handler *handler,
-@@ -177,7 +179,7 @@ protected:
-     // Wait for Qt events to occur
- 
-     /// Some Qt stuff that we need to have
--    QApplication *qapp_ ;
-+    QAPPLICATION_TYPE *qapp_ ;
- 
-     /// Typedef of a map.
-     typedef ACE_Map_Manager<ACE_HANDLE, QSocketNotifier *, ACE_Null_Mutex> MAP;
-diff --git a/bin/MakeProjectCreator/config/ace_qt5.mpb b/bin/MakeProjectCreator/config/ace_qt5.mpb
-index 76d24e980d7..147062204ea 100644
---- a/bin/MakeProjectCreator/config/ace_qt5.mpb
-+++ b/bin/MakeProjectCreator/config/ace_qt5.mpb
-@@ -1,4 +1,4 @@
- // -*- MPC -*-
--project: qt5_gui {
-+project: qt5_core {
-   macros += ACE_HAS_QT5
- }
-diff --git a/bin/MakeProjectCreator/config/ace_qt5reactor.mpb b/bin/MakeProjectCreator/config/ace_qt5reactor.mpb
-index 4357a3779de..956ad99772d 100644
---- a/bin/MakeProjectCreator/config/ace_qt5reactor.mpb
-+++ b/bin/MakeProjectCreator/config/ace_qt5reactor.mpb
-@@ -1,5 +1,5 @@
- // -*- MPC -*-
--project : acelib, ace_qt5, qt5_widgets {
-+project : acelib, ace_qt5 {
-   requires += ace_qt5reactor
-   after    += ACE_Qt5Reactor
-   libs     += ACE_QtReactor
-diff --git a/TAO/tao/QtResource/QtResource_Factory.cpp b/TAO/tao/QtResource/QtResource_Factory.cpp
-index b65474c89fa..9a14441d6cf 100644
---- a/TAO/tao/QtResource/QtResource_Factory.cpp
-+++ b/TAO/tao/QtResource/QtResource_Factory.cpp
-@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- 
- namespace TAO
- {
--  QtResource_Factory::QtResource_Factory (QApplication *qapp)
-+  QtResource_Factory::QtResource_Factory (QAPPLICATION_TYPE *qapp)
-     : reactor_impl_ (0)
-     , qapp_ (qapp)
-   {
-diff --git a/TAO/tao/QtResource/QtResource_Factory.h b/TAO/tao/QtResource/QtResource_Factory.h
-index 6540d2a70c8..66ff2ab29fa 100644
---- a/TAO/tao/QtResource/QtResource_Factory.h
-+++ b/TAO/tao/QtResource/QtResource_Factory.h
-@@ -40,7 +40,7 @@ namespace TAO
-   class TAO_QtResource_Export QtResource_Factory : public GUIResource_Factory
-   {
-   public:
--    QtResource_Factory (QApplication *qapp_);
-+    QtResource_Factory (QAPPLICATION_TYPE *qapp_);
- 
-   protected:
-     /// Create or obtain current reactor implementation
-@@ -51,7 +51,7 @@ namespace TAO
-     ACE_QtReactor *reactor_impl_;
- 
-     /// QApplication running reactor
--    QApplication *qapp_;
-+    QAPPLICATION_TYPE *qapp_;
-   };
- }
- 
-diff --git a/TAO/tao/QtResource/QtResource_Loader.cpp b/TAO/tao/QtResource/QtResource_Loader.cpp
-index 284077df372..a58be7bc0c0 100644
---- a/TAO/tao/QtResource/QtResource_Loader.cpp
-+++ b/TAO/tao/QtResource/QtResource_Loader.cpp
-@@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
- 
- namespace TAO
- {
--  QtResource_Loader::QtResource_Loader (QApplication *qapp)
-+  QtResource_Loader::QtResource_Loader (QAPPLICATION_TYPE *qapp)
-   {
-     QtResource_Factory *tmp = 0;
- 
-diff --git a/TAO/tao/QtResource/QtResource_Loader.h b/TAO/tao/QtResource/QtResource_Loader.h
-index 807fa57f301..c701331d0f5 100644
---- a/TAO/tao/QtResource/QtResource_Loader.h
-+++ b/TAO/tao/QtResource/QtResource_Loader.h
-@@ -22,9 +22,15 @@
- #include "tao/Versioned_Namespace.h"
- 
- #ifdef ACE_HAS_QT5
--#include <QtWidgets/QApplication>
-+#include <QtCore/QCoreApplication>
-+#ifndef QAPPLICATION_TYPE
-+#define QAPPLICATION_TYPE QCoreApplication
-+#endif // !QAPPLICATION_TYPE
- #elif defined ACE_HAS_QT4
- #include <QtGui/qapplication.h>
-+#ifndef QAPPLICATION_TYPE
-+#define QAPPLICATION_TYPE QApplication
-+#endif // !QAPPLICATION_TYPE
- #else
- #include <qapplication.h>
- #endif
-@@ -51,7 +57,7 @@ namespace TAO
-   class TAO_QtResource_Export QtResource_Loader
-   {
-   public:
--    QtResource_Loader (QApplication *qapp);
-+    QtResource_Loader (QAPPLICATION_TYPE *qapp);
-     virtual ~QtResource_Loader (void);
-   };
- }
diff --git a/ports/ace/stacktrace-arm.patch b/ports/ace/stacktrace-arm.patch
deleted file mode 100644
index 07d891196d79b1..00000000000000
--- a/ports/ace/stacktrace-arm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/ace/Stack_Trace.cpp b/ace/Stack_Trace.cpp
-index cd6f154adef..d4be2196252 100644
---- a/ace/Stack_Trace.cpp
-+++ b/ace/Stack_Trace.cpp
-@@ -663,6 +663,22 @@ cs_operate(int (*func)(struct frame_state const *, void *), void *usrarg,
-   fs.sf.AddrFrame.Mode = AddrModeFlat;
-   fs.sf.AddrBStore.Mode = AddrModeFlat;
-   fs.sf.AddrStack.Mode = AddrModeFlat;
-+#  elif defined (_M_ARM)
-+  DWORD machine = IMAGE_FILE_MACHINE_ARM;
-+  fs.sf.AddrPC.Offset = c.Pc;
-+  fs.sf.AddrFrame.Offset = c.R11;
-+  fs.sf.AddrStack.Offset = c.Sp;
-+  fs.sf.AddrPC.Mode = AddrModeFlat;
-+  fs.sf.AddrFrame.Mode = AddrModeFlat;
-+  fs.sf.AddrStack.Mode = AddrModeFlat;
-+#  elif defined (_M_ARM64)
-+  DWORD machine = IMAGE_FILE_MACHINE_ARM64;
-+  fs.sf.AddrPC.Offset = c.Pc;
-+  fs.sf.AddrFrame.Offset = c.Fp;
-+  fs.sf.AddrStack.Offset = c.Sp;
-+  fs.sf.AddrPC.Mode = AddrModeFlat;
-+  fs.sf.AddrFrame.Mode = AddrModeFlat;
-+  fs.sf.AddrStack.Mode = AddrModeFlat;
- #  endif
- 
-   fs.pSym = (PSYMBOL_INFO) GlobalAlloc (GMEM_FIXED,

From 3f8db114a861e1b9c794b9ba4732369d16e464ec Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Fri, 3 Apr 2020 02:05:45 +0700
Subject: [PATCH 14/29] renamed feature xml to xerces-c

---
 ports/ace/CONTROL        | 2 +-
 ports/ace/portfile.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index cf832160136ed9..e60b33f0e082f6 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -10,7 +10,7 @@ Feature: ssl
 Build-Depends: openssl
 Description: Enable SSL/TLS features
 
-Feature: xml
+Feature: xerces-c
 Build-Depends: xerces-c
 Description: Enable XML features
 
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index f0d177f7ee4b5d..4a851185ed2af0 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -89,7 +89,7 @@ if("wchar" IN_LIST FEATURES)
 else()
     list(APPEND ACE_FEATURE_LIST "uses_wchar=0")
 endif()
-if("xml" IN_LIST FEATURES)
+if("xerces-c" IN_LIST FEATURES)
     list(APPEND ACE_FEATURE_LIST "xml=1")
 else()
     list(APPEND ACE_FEATURE_LIST "xml=0")

From 65546009efd68f528dbc78183c6f8e3ff27e70a7 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Fri, 3 Apr 2020 02:23:57 +0700
Subject: [PATCH 15/29] reverted last change and replaced MPC feature xml with
 xerces3

---
 ports/ace/CONTROL        | 4 ++--
 ports/ace/portfile.cmake | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index e60b33f0e082f6..7d4dae8ec2e6ff 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -10,8 +10,8 @@ Feature: ssl
 Build-Depends: openssl
 Description: Enable SSL/TLS features
 
-Feature: xerces-c
-Build-Depends: xerces-c
+Feature: xml
+Build-Depends: xml
 Description: Enable XML features
 
 Feature: qt5
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 4a851185ed2af0..cc935d66971ef9 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -89,10 +89,10 @@ if("wchar" IN_LIST FEATURES)
 else()
     list(APPEND ACE_FEATURE_LIST "uses_wchar=0")
 endif()
-if("xerces-c" IN_LIST FEATURES)
-    list(APPEND ACE_FEATURE_LIST "xml=1")
+if("xml" IN_LIST FEATURES)
+    list(APPEND ACE_FEATURE_LIST "xerces3=1")
 else()
-    list(APPEND ACE_FEATURE_LIST "xml=0")
+    list(APPEND ACE_FEATURE_LIST "xerces3=0")
 endif()
 if("ssl" IN_LIST FEATURES)
     set(ENV{SSL_ROOT} ${INSTALLED_PATH})

From 65e1bbe3946e94206f46df9f89aa654ef06c0dc0 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Fri, 3 Apr 2020 15:01:05 +0700
Subject: [PATCH 16/29] Added VCPKG_TARGET_IS_*

---
 ports/ace/portfile.cmake | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index cc935d66971ef9..36cd6d88d79f01 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -28,14 +28,14 @@ if(VCPKG_TARGET_IS_WINDOWS)
       URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-src-6.5.8.zip"
       FILENAME ACE+TAO-src-6.5.8.zip
       SHA512 847621bdd72b5a6909cbdef1d6e3c8792aa29f0b44e64c49c64c5d87df4fe703c6a27b15465d655e97ca8cc0df7449ac012f90f6de5d82b8e30bfbeb2e7057c2
-  )
+)
 else(VCPKG_TARGET_IS_WINDOWS)
   # VCPKG_TARGET_IS_LINUX
   vcpkg_download_distfile(ARCHIVE
       URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_8/ACE+TAO-src-6.5.8.tar.gz"
       FILENAME ACE+TAO-src-6.5.8.tar.gz
       SHA512 4440975cac5baaa1d6fce869fbac73f15cf86942df3dab0f06c2309d9e20f6a79d826690138baf2ce5b232a1255d9e09cae0e40bd0cddae3d26ca9eb937871db
-  )
+)
 endif()
 
 vcpkg_extract_source_archive(${ARCHIVE})
@@ -53,19 +53,19 @@ vcpkg_apply_patches(
 ###################################################
 
 # see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html
-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+if(VCPKG_TARGET_IS_WINDOWS)
     file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"\n#define ACE_NO_INLINE")
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+elseif(VCPKG_TARGET_IS_LINUX)
     file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"")
     file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU")
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+elseif(VCPKG_TARGET_IS_OSX)
     file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-macosx.h\"")
     file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU")
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+elseif(VCPKG_TARGET_IS_UWP)
     file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"\n#define ACE_NO_INLINE")
 endif()
 
-if((NOT VCPKG_CMAKE_SYSTEM_NAME) OR ("WindowsStore" STREQUAL VCPKG_CMAKE_SYSTEM_NAME))
+if((VCPKG_TARGET_IS_WINDOWS) OR (VCPKG_TARGET_IS_UWP))
   if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(DLL_DECORATOR s)
   endif()
@@ -76,7 +76,7 @@ if((NOT VCPKG_CMAKE_SYSTEM_NAME) OR ("WindowsStore" STREQUAL VCPKG_CMAKE_SYSTEM_
   else()
     set(SOLUTION_TYPE vc14)
   endif()
-elseif((VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
+elseif((VCPKG_TARGET_IS_LINUX) OR (VCPKG_TARGET_IS_OSX))
   set(SOLUTION_TYPE gnuace)
 endif()
 
@@ -173,9 +173,9 @@ vcpkg_execute_required_process(
 ###################################################
 
 # Build for Windows
-if((NOT VCPKG_CMAKE_SYSTEM_NAME) OR ("WindowsStore" STREQUAL VCPKG_CMAKE_SYSTEM_NAME))
+if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
     vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" PLATFORM ${MSBUILD_PLATFORM} OPTIONS /m USE_VCPKG_INTEGRATION)
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
   FIND_PROGRAM(MAKE make)
   IF (NOT MAKE)
     MESSAGE(FATAL_ERROR "MAKE not found")
@@ -189,7 +189,7 @@ endif()
 #
 ###################################################
 
-if(NOT VCPKG_CMAKE_SYSTEM_NAME)
+if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
   set(LIB_RELEASE_SUFFIX .lib)
   set(LIB_DEBUG_SUFFIX d.lib)
   set(DLL_RELEASE_SUFFIX .dll)
@@ -198,14 +198,14 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(DLL_DECORATOR s)
   endif()
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+elseif(VCPKG_TARGET_IS_LINUX)
   set(DLL_DECORATOR)
   set(LIB_RELEASE_SUFFIX .a)
   set(LIB_DEBUG_SUFFIX .a)
   set(DLL_RELEASE_SUFFIX)
   set(DLL_DEBUG_SUFFIX)
   set(LIB_PREFIX lib)
-elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+elseif(VCPKG_TARGET_IS_OSX)
   set(DLL_DECORATOR)
   set(LIB_RELEASE_SUFFIX .a)
   set(LIB_DEBUG_SUFFIX .a)
@@ -290,7 +290,7 @@ install_libraries(${ACE_ROOT} "${ACE_TAO_LIBRARIES}")
 # Install executables
 function(install_tao_executables SOURCE_PATH EXE_FILE)
     set(EXECUTABLE_SUFFIX ".exe")
-    if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    if(VCPKG_TARGET_IS_LINUX)
         set(EXECUTABLE_SUFFIX "")
     endif()
     if(EXISTS "${ACE_ROOT}/bin/${EXE_FILE}${EXECUTABLE_SUFFIX}")

From 8259e3c2a24789079783977133390c9ad6d06769 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Fri, 3 Apr 2020 15:13:57 +0700
Subject: [PATCH 17/29] replaced vcpkg_execute_required_process with
 vcpkg_build_make

---
 ports/ace/portfile.cmake | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 36cd6d88d79f01..6f4bcd53c0331c 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -176,11 +176,7 @@ vcpkg_execute_required_process(
 if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
     vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" PLATFORM ${MSBUILD_PLATFORM} OPTIONS /m USE_VCPKG_INTEGRATION)
 elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
-  FIND_PROGRAM(MAKE make)
-  IF (NOT MAKE)
-    MESSAGE(FATAL_ERROR "MAKE not found")
-  ENDIF ()
-  vcpkg_execute_required_process(COMMAND make WORKING_DIRECTORY ${WORKING_DIR} LOGNAME make-${TARGET_TRIPLET})
+  vcpkg_build_make(SOURCE_PATH ${SOURCE_PATH})
 endif()
 
 ###################################################

From 95815d8baf8e01dbec16dc6342360f9baa774922 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Wed, 8 Apr 2020 19:54:03 +0700
Subject: [PATCH 18/29] replaced xml with xerces-c

---
 ports/ace/CONTROL        | 4 ++--
 ports/ace/portfile.cmake | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 7d4dae8ec2e6ff..e60b33f0e082f6 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -10,8 +10,8 @@ Feature: ssl
 Build-Depends: openssl
 Description: Enable SSL/TLS features
 
-Feature: xml
-Build-Depends: xml
+Feature: xerces-c
+Build-Depends: xerces-c
 Description: Enable XML features
 
 Feature: qt5
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 6f4bcd53c0331c..292b69c86c1b30 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -89,7 +89,7 @@ if("wchar" IN_LIST FEATURES)
 else()
     list(APPEND ACE_FEATURE_LIST "uses_wchar=0")
 endif()
-if("xml" IN_LIST FEATURES)
+if("xerces-c" IN_LIST FEATURES)
     list(APPEND ACE_FEATURE_LIST "xerces3=1")
 else()
     list(APPEND ACE_FEATURE_LIST "xerces3=0")

From bb17c5d06d63f18e22b1f7b8b7fec916a1b800f4 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Wed, 8 Apr 2020 22:52:55 +0700
Subject: [PATCH 19/29] disabled UWP builds

---
 ports/ace/portfile.cmake | 12 +-----------
 scripts/ci.baseline.txt  |  2 ++
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 292b69c86c1b30..d9a50c1da8e03e 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -66,9 +66,6 @@ elseif(VCPKG_TARGET_IS_UWP)
 endif()
 
 if((VCPKG_TARGET_IS_WINDOWS) OR (VCPKG_TARGET_IS_UWP))
-  if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    set(DLL_DECORATOR s)
-  endif()
   if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
     set(SOLUTION_TYPE vs2019)
   elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
@@ -140,13 +137,6 @@ string(PREPEND ACE_FEATURES ",")
 ###################################################
 
 
-if (TRIPLET_SYSTEM_ARCH MATCHES "x86")
-    set(MSBUILD_PLATFORM "Win32")
-else ()
-    set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH})
-endif()
-
-
 # Acquire Perl and add it to PATH (for execution of MPC)
 vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_PATH ${PERL} DIRECTORY)
@@ -174,7 +164,7 @@ vcpkg_execute_required_process(
 
 # Build for Windows
 if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
-    vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" PLATFORM ${MSBUILD_PLATFORM} OPTIONS /m USE_VCPKG_INTEGRATION)
+    vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" USE_VCPKG_INTEGRATION)
 elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
   vcpkg_build_make(SOURCE_PATH ${SOURCE_PATH})
 endif()
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 401da7653bc4cd..911b310cc0d389 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -46,6 +46,8 @@
 7zip:x64-uwp=fail
 abseil:arm-uwp=fail
 ace:x64-osx=fail
+ace:x64-uwp=fail
+ace:arm-uwp=fail
 activemq-cpp:x64-windows-static=fail
 akali:x64-uwp=fail
 akali:arm-uwp=fail

From 4337dec25f591cec7ed921f42cfaa93c55548dd3 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Wed, 8 Apr 2020 23:01:53 +0700
Subject: [PATCH 20/29] Removed Qt5 support

---
 ports/ace/CONTROL | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index e60b33f0e082f6..59962ed1aa1301 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -14,10 +14,6 @@ Feature: xerces-c
 Build-Depends: xerces-c
 Description: Enable XML features
 
-Feature: qt5
-Build-Depends: qt5-base
-Description: Enable Qt5 support
-
 Feature: zlib
 Build-Depends: zlib
 Description: Enable zlib support

From 6a999666cc2f111c105d30720a342632dc998d0b Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Wed, 8 Apr 2020 23:12:06 +0700
Subject: [PATCH 21/29] Don't support UWP

---
 ports/ace/CONTROL        |  1 +
 ports/ace/portfile.cmake | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 59962ed1aa1301..9af25d1246fc4c 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -2,6 +2,7 @@ Source: ace
 Version: 6.5.8
 Description: The ADAPTIVE Communication Environment
 Homepage: https://www.dre.vanderbilt.edu/~schmidt/TAO.html
+Supports: !uwp
 
 Feature: wchar
 Description: Enable extra wide char functions
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index d9a50c1da8e03e..028ac02e727bd6 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -98,18 +98,18 @@ if("ssl" IN_LIST FEATURES)
 else()
     list(APPEND ACE_FEATURE_LIST "ssl=0")
 endif()
-if("qt5" IN_LIST FEATURES)
-    set(QT5_CORE_MPB_PATH "${ACE_ROOT}/MPC/config/qt5_core.mpb")
-    FILE(READ ${QT5_CORE_MPB_PATH} QT5_CORE_MPB_DATA)
-    STRING(REGEX REPLACE "QT5_BINDIR\\)\\/" "QTDIR)/tools/qt5/bin/" NEW_QT5_CORE_MPB_DATA ${QT5_CORE_MPB_DATA})
-    SET(QT5_CORE_MPB_DATA ${NEW_QT5_CORE_MPB_DATA})
-    STRING(REGEX REPLACE "libpaths \\+\\= \\$\\(QT5_LIBDIR\\)" "libpaths += $(QT5_LIBDIR) ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/debug/lib" NEW_QT5_CORE_MPB_DATA ${QT5_CORE_MPB_DATA})
-    FILE(WRITE ${QT5_CORE_MPB_PATH} "${NEW_QT5_CORE_MPB_DATA}")
-    set(ENV{QTDIR} ${INSTALLED_PATH})
-    list(APPEND ACE_FEATURE_LIST "qt5=1")
-else()
-    list(APPEND ACE_FEATURE_LIST "qt5=0")
-endif()
+# if("qt5" IN_LIST FEATURES)
+    # set(QT5_CORE_MPB_PATH "${ACE_ROOT}/MPC/config/qt5_core.mpb")
+    # FILE(READ ${QT5_CORE_MPB_PATH} QT5_CORE_MPB_DATA)
+    # STRING(REGEX REPLACE "QT5_BINDIR\\)\\/" "QTDIR)/tools/qt5/bin/" NEW_QT5_CORE_MPB_DATA ${QT5_CORE_MPB_DATA})
+    # SET(QT5_CORE_MPB_DATA ${NEW_QT5_CORE_MPB_DATA})
+    # STRING(REGEX REPLACE "libpaths \\+\\= \\$\\(QT5_LIBDIR\\)" "libpaths += $(QT5_LIBDIR) ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/debug/lib" NEW_QT5_CORE_MPB_DATA ${QT5_CORE_MPB_DATA})
+    # FILE(WRITE ${QT5_CORE_MPB_PATH} "${NEW_QT5_CORE_MPB_DATA}")
+    # set(ENV{QTDIR} ${INSTALLED_PATH})
+    # list(APPEND ACE_FEATURE_LIST "qt5=1")
+# else()
+    # list(APPEND ACE_FEATURE_LIST "qt5=0")
+# endif()
 if("bzip2" IN_LIST FEATURES)
     set(ENV{BZIP2_ROOT} ${INSTALLED_PATH})
     list(APPEND ACE_FEATURE_LIST "bzip2=1")

From e74ce5a0c51ee2a0e85eefb48f530871d7800d44 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Wed, 8 Apr 2020 23:20:35 +0700
Subject: [PATCH 22/29] Don't support linux and expect such build to fail

---
 ports/ace/CONTROL       | 2 +-
 scripts/ci.baseline.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 9af25d1246fc4c..1028d8b50a0c82 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -2,7 +2,7 @@ Source: ace
 Version: 6.5.8
 Description: The ADAPTIVE Communication Environment
 Homepage: https://www.dre.vanderbilt.edu/~schmidt/TAO.html
-Supports: !uwp
+Supports: !(uwp|linux)
 
 Feature: wchar
 Description: Enable extra wide char functions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 911b310cc0d389..522e29847308b5 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -48,6 +48,7 @@ abseil:arm-uwp=fail
 ace:x64-osx=fail
 ace:x64-uwp=fail
 ace:arm-uwp=fail
+ace:x64-linux=fail
 activemq-cpp:x64-windows-static=fail
 akali:x64-uwp=fail
 akali:arm-uwp=fail

From 5bbcdbe75f44627530d191308575a24930e144f0 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 9 Apr 2020 10:46:13 +0700
Subject: [PATCH 23/29] x86 -> Win32

---
 ports/ace/portfile.cmake | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 028ac02e727bd6..c76e6aef98592f 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -162,9 +162,15 @@ vcpkg_execute_required_process(
 #
 ###################################################
 
+if (TRIPLET_SYSTEM_ARCH MATCHES "x86")
+    set(MSBUILD_PLATFORM "Win32")
+else ()
+    set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH})
+endif()
+
 # Build for Windows
 if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
-    vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" USE_VCPKG_INTEGRATION)
+    vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" PLATFORM ${MSBUILD_PLATFORM} USE_VCPKG_INTEGRATION)
 elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
   vcpkg_build_make(SOURCE_PATH ${SOURCE_PATH})
 endif()

From ada4b760056cf3f63507ef897fceef77166f1678 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 9 Apr 2020 10:52:03 +0700
Subject: [PATCH 24/29] "re-enable" linux build

---
 ports/ace/CONTROL       | 2 +-
 scripts/ci.baseline.txt | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 1028d8b50a0c82..9af25d1246fc4c 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -2,7 +2,7 @@ Source: ace
 Version: 6.5.8
 Description: The ADAPTIVE Communication Environment
 Homepage: https://www.dre.vanderbilt.edu/~schmidt/TAO.html
-Supports: !(uwp|linux)
+Supports: !uwp
 
 Feature: wchar
 Description: Enable extra wide char functions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 522e29847308b5..911b310cc0d389 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -48,7 +48,6 @@ abseil:arm-uwp=fail
 ace:x64-osx=fail
 ace:x64-uwp=fail
 ace:arm-uwp=fail
-ace:x64-linux=fail
 activemq-cpp:x64-windows-static=fail
 akali:x64-uwp=fail
 akali:arm-uwp=fail

From 78e8c7bc4e8bfefdb53169ecf13cad23ff7290e7 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 9 Apr 2020 11:15:41 +0700
Subject: [PATCH 25/29] working dir for linux build

---
 ports/ace/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index c76e6aef98592f..6e27641d737182 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -172,7 +172,7 @@ endif()
 if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
     vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" PLATFORM ${MSBUILD_PLATFORM} USE_VCPKG_INTEGRATION)
 elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
-  vcpkg_build_make(SOURCE_PATH ${SOURCE_PATH})
+  vcpkg_build_make(SOURCE_PATH ${WORKING_DIR})
 endif()
 
 ###################################################

From 29d0cbb29d1a78ed996882293102c2c2d003990d Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 9 Apr 2020 11:23:30 +0700
Subject: [PATCH 26/29] removed nonsense argument.

---
 ports/ace/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 6e27641d737182..350d79c639c249 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -172,7 +172,7 @@ endif()
 if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
     vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" PLATFORM ${MSBUILD_PLATFORM} USE_VCPKG_INTEGRATION)
 elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
-  vcpkg_build_make(SOURCE_PATH ${WORKING_DIR})
+  vcpkg_build_make()
 endif()
 
 ###################################################

From 67212c2f3d8b3f040201404c169bc2adaff24273 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 9 Apr 2020 11:36:16 +0700
Subject: [PATCH 27/29] added vcpkg_configure_make

---
 ports/ace/portfile.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 350d79c639c249..d9b9c023ac408f 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -172,6 +172,7 @@ endif()
 if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
     vcpkg_build_msbuild(PROJECT_PATH "${WORKING_DIR}/${WORKSPACE}.sln" PLATFORM ${MSBUILD_PLATFORM} USE_VCPKG_INTEGRATION)
 elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
+  vcpkg_configure_make(SOURCE_PATH ${WORKING_DIR} SKIP_CONFIGURE)
   vcpkg_build_make()
 endif()
 

From 7d38421c1199f5657cb2a9aeff82d5f32d2dd3ff Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Thu, 9 Apr 2020 11:49:15 +0700
Subject: [PATCH 28/29] handle executable file extensions correctly

corrected platform specific library suffixes for libraries needed during runtime of tao_idl
temporarily disable Linux builds again :-P
---
 ports/ace/CONTROL        |  2 +-
 ports/ace/portfile.cmake | 22 +++++++++++-----------
 scripts/ci.baseline.txt  |  1 +
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL
index 9af25d1246fc4c..1028d8b50a0c82 100644
--- a/ports/ace/CONTROL
+++ b/ports/ace/CONTROL
@@ -2,7 +2,7 @@ Source: ace
 Version: 6.5.8
 Description: The ADAPTIVE Communication Environment
 Homepage: https://www.dre.vanderbilt.edu/~schmidt/TAO.html
-Supports: !uwp
+Supports: !(uwp|linux)
 
 Feature: wchar
 Description: Enable extra wide char functions
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index d9b9c023ac408f..693856ffe83f3d 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -195,8 +195,8 @@ elseif(VCPKG_TARGET_IS_LINUX)
   set(DLL_DECORATOR)
   set(LIB_RELEASE_SUFFIX .a)
   set(LIB_DEBUG_SUFFIX .a)
-  set(DLL_RELEASE_SUFFIX)
-  set(DLL_DEBUG_SUFFIX)
+  set(DLL_RELEASE_SUFFIX .so)
+  set(DLL_DEBUG_SUFFIX .so)
   set(LIB_PREFIX lib)
 elseif(VCPKG_TARGET_IS_OSX)
   set(DLL_DECORATOR)
@@ -282,12 +282,12 @@ install_libraries(${ACE_ROOT} "${ACE_TAO_LIBRARIES}")
 
 # Install executables
 function(install_tao_executables SOURCE_PATH EXE_FILE)
-    set(EXECUTABLE_SUFFIX ".exe")
-    if(VCPKG_TARGET_IS_LINUX)
-        set(EXECUTABLE_SUFFIX "")
+    set(EXECUTABLE_SUFFIX "")
+    if(VCPKG_TARGET_IS_WINDOWS)
+      set(EXECUTABLE_SUFFIX ".exe")
     endif()
     if(EXISTS "${ACE_ROOT}/bin/${EXE_FILE}${EXECUTABLE_SUFFIX}")
-        file(COPY ${ACE_ROOT}/bin/${EXE_FILE}${EXECUTABLE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
+        file(COPY ${ACE_ROOT}/bin/${EXE_FILE}${EXECUTABLE_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
     endif()
 endfunction()
 
@@ -302,15 +302,15 @@ install_tao_executables(${ACE_ROOT}/bin "tao_nsgroup")
 install_tao_executables(${ACE_ROOT}/bin "tao_nslist")
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(COPY ${ACE_ROOT}/lib/ACEd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
+    file(COPY ${ACE_ROOT}/lib/ACE${DLL_DEBUG_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
     if(BUILD_TAO)
-        file(COPY ${ACE_ROOT}/lib/TAO_IDL_FEd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
-        file(COPY ${ACE_ROOT}/lib/TAO_IDL_BEd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/tools/ace)
+        file(COPY ${ACE_ROOT}/lib/TAO_IDL_FE${DLL_DEBUG_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+        file(COPY ${ACE_ROOT}/lib/TAO_IDL_BE${DLL_DEBUG_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
     endif()
 endif()
 
 # Handle copyright
-file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/ace/)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/ace/copyright)
+file(COPY ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
 
 vcpkg_copy_pdbs()
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 911b310cc0d389..522e29847308b5 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -48,6 +48,7 @@ abseil:arm-uwp=fail
 ace:x64-osx=fail
 ace:x64-uwp=fail
 ace:arm-uwp=fail
+ace:x64-linux=fail
 activemq-cpp:x64-windows-static=fail
 akali:x64-uwp=fail
 akali:arm-uwp=fail

From e3a74b9f73b379d1099564d6f2f68eff11a230f9 Mon Sep 17 00:00:00 2001
From: Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th>
Date: Fri, 10 Apr 2020 10:33:48 +0700
Subject: [PATCH 29/29] Removed arm_prevent_amd64_definition.patch

---
 ports/ace/arm_prevent_amd64_definition.patch | 21 --------------------
 ports/ace/portfile.cmake                     |  1 -
 2 files changed, 22 deletions(-)
 delete mode 100644 ports/ace/arm_prevent_amd64_definition.patch

diff --git a/ports/ace/arm_prevent_amd64_definition.patch b/ports/ace/arm_prevent_amd64_definition.patch
deleted file mode 100644
index 9f6e0695de5f15..00000000000000
--- a/ports/ace/arm_prevent_amd64_definition.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
-index 56567eead08..d219bd5f1ae 100644
---- a/ace/config-win32-common.h
-+++ b/ace/config-win32-common.h
-@@ -39,12 +39,14 @@
- #if defined (_WIN64) || defined (WIN64)
- #  define ACE_WIN64
- 
-+
- // MPC template adds _AMD64_ but user projects not generated using MPC
--// may want to use _AMD64_ as well. Ensure it's there in all cases.
-+// may want to use _AMD64_ as well. Ensure it's there in all non ARM cases.
-+#if !defined(_ARM64_) && !defined(_ARM_)
- #  ifndef _AMD64_
- #    define _AMD64_
- #  endif
--
-+#endif
- // Use 64-bit file offsets by default in the WIN64 case, similar to
- // what 64-bit UNIX systems do.
- //
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
index 693856ffe83f3d..f29f73c6877933 100644
--- a/ports/ace/portfile.cmake
+++ b/ports/ace/portfile.cmake
@@ -42,7 +42,6 @@ vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_apply_patches(
     SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers
     PATCHES
-        "${CMAKE_CURRENT_LIST_DIR}/arm_prevent_amd64_definition.patch"
         "${CMAKE_CURRENT_LIST_DIR}/bzip2.patch"
 )