[ace] Simplified port file

ports/ace/CONTROL

@@ -1,8 +1,7 @@
 Source: ace
-Version: 6.5.9
+Version: 6.5.9-3
 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html
 Description: The ADAPTIVE Communication Environment
-Supports: !uwp
 
 Feature: wchar
 Description: Enable extra wide char functions in ACE

ports/ace/portfile.cmake

@@ -1,5 +1,3 @@
-vcpkg_fail_port_install(ON_TARGET "uwp")
-
 # 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.
@@ -22,6 +20,7 @@ endif()
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
+    PATCHES process_manager.patch
 )
 
 set(ACE_ROOT ${SOURCE_PATH})
@@ -98,9 +97,13 @@ elseif(VCPKG_TARGET_IS_OSX)
   file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU")
 endif()
 
+if(VCPKG_TARGET_IS_UWP)
+  set(MPC_VALUE_TEMPLATE -value_template link_options+=/APPCONTAINER)
+endif()
+
 # Invoke mwc.pl to generate the necessary solution and project files
 vcpkg_execute_build_process(
-    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ace ${MPC_STATIC_FLAG}
+    COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ace ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE}
     WORKING_DIRECTORY ${ACE_ROOT}
     LOGNAME mwc-${TARGET_TRIPLET}
 )
@@ -115,76 +118,62 @@ if(VCPKG_TARGET_IS_WINDOWS)
   # 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 ORIGINAL_PATH RELATIVE_PATH)
-  file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl)
-  file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/${RELATIVE_PATH})
+  function(install_includes SOURCE_PATH SUBDIRECTORIES INCLUDE_DIR)
+    foreach(SUB_DIR ${SUBDIRECTORIES})
+      file(GLOB HEADER_FILES ${SOURCE_PATH}/${SUB_DIR}/*.h ${SOURCE_PATH}/${SUB_DIR}/*.inl ${SOURCE_PATH}/${SUB_DIR}/*_T.cpp)
+      file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${INCLUDE_DIR}/${SUB_DIR})
+    endforeach()
   endfunction()
 
-  # 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 ${ACE_SOURCE_PATH}/*.h ${ACE_SOURCE_PATH}/*.inl ${ACE_SOURCE_PATH}/*.cpp)
-  file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/)
-
-  # Install headers in subdirectory
-  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Compression")
-  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Compression/rle")
-  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "ETCL")
-  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "QoS")
-  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Monitor_Control")
-  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include")
-  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/arpa")
-  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/net")
-  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/netinet")
-  install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/sys")
+  # Install headers
+  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("ssl" IN_LIST FEATURES)
-      install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "SSL")
+      set(ACE_INCLUDE_FOLDERS "SSL")
+      install_includes(${ACE_SOURCE_PATH} "${ACE_INCLUDE_FOLDERS}" "ace")
   endif()
 
   # Install the libraries
-  function(install_ace_library ORIGINAL_PATH ACE_LIBRARY)
-  set(LIB_PATH ${ORIGINAL_PATH}/lib/)
-  if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-      # Install the DLL files
-      file(INSTALL
-          ${LIB_PATH}/${ACE_LIBRARY}${DLL_DEBUG_SUFFIX}
+  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
+        file(INSTALL
+          ${LIB_PATH}/${LIBRARY}${DLL_DEBUG_SUFFIX}
           DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-      )
-      file(INSTALL
-          ${LIB_PATH}/${ACE_LIBRARY}${DLL_RELEASE_SUFFIX}
+        )
+        file(INSTALL
+          ${LIB_PATH}/${LIBRARY}${DLL_RELEASE_SUFFIX}
           DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-      )
-  endif()
+        )
+      endif()
 
-  # Install the lib files
-  file(INSTALL
-      ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX}
-      DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-  )
+      # Install the lib files
+      file(INSTALL
+          ${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_DEBUG_SUFFIX}
+          DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+      )
 
-  file(INSTALL
-      ${LIB_PATH}/${LIB_PREFIX}${ACE_LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX}
-      DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-  )
+      file(INSTALL
+          ${LIB_PATH}/${LIB_PREFIX}${LIBRARY}${DLL_DECORATOR}${LIB_RELEASE_SUFFIX}
+          DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+      )
+    endforeach()
   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")
-  endif()
-  install_ace_library(${ACE_ROOT} "ACE_RLECompression")
+  set(ACE_LIBRARIES "ACE" "ACE_Compression" "ACE_ETCL" "ACE_ETCL_Parser" "ACE_Monitor_Control" "ACE_QoS" "ACE_RLECompression")
+  install_libraries(${ACE_ROOT} "${ACE_LIBRARIES}")
+
   if("ssl" IN_LIST FEATURES)
-      install_ace_library(${ACE_ROOT} "ACE_SSL")
+    set(ACE_LIBRARIES "ACE_SSL")
+    install_libraries(${ACE_ROOT} "${ACE_LIBRARIES}")
   endif()
 
   vcpkg_copy_pdbs()
 
   # 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/${PORT}/copyright)
+  file(INSTALL ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
   FIND_PROGRAM(MAKE make)
   IF (NOT MAKE)
@@ -250,5 +239,5 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
   set($ENV{PWD} _prev_env)
 
   # Handle copyright
-  file(RENAME ${CURRENT_PACKAGES_DIR}/share/ace/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+  file(INSTALL ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 endif()

ports/ace/process_manager.patch

@@ -0,0 +1,57 @@
+diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
+index ee0418b8fca..da9d9741e28 100644
+--- a/ace/Process_Manager.cpp
++++ b/ace/Process_Manager.cpp
+@@ -26,6 +26,9 @@ ACE_Process_Manager_cleanup (void *instance, void *arg)
+ {
+   ACE_Process_Manager::cleanup (instance, arg);
+ }
++#define ACE_PROCESS_MANAGER_CLEANUP_FUNCTION ACE_Process_Manager_cleanup
++#else
++#define ACE_PROCESS_MANAGER_CLEANUP_FUNCTION ACE_Process_Manager::cleanup
+ #endif
+
+ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+@@ -124,19 +127,10 @@ ACE_Process_Manager::instance (void)
+           // Register with the Object_Manager so that the wrapper to
+           // delete the proactor will be called when Object_Manager is
+           // being terminated.
+-
+-#if defined ACE_HAS_SIG_C_FUNC
+-          ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_,
+-                                       ACE_Process_Manager_cleanup,
+-                                       0,
+-                                       typeid (*ACE_Process_Manager::instance_).name ());
+-#else
+           ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_,
+-                                       ACE_Process_Manager::cleanup,
++                                       ACE_PROCESS_MANAGER_CLEANUP_FUNCTION,
+                                        0,
+-                                       typeid (*ACE_Process_Manager::instance_).name ());
+-#endif /* ACE_HAS_SIG_C_FUNC */
+-
++                                       typeid (ACE_Process_Manager).name ());
+         }
+     }
+
+@@ -157,18 +151,10 @@ ACE_Process_Manager::instance (ACE_Process_Manager *tm)
+   // Register with the Object_Manager so that the wrapper to
+   // delete the proactor will be called when Object_Manager is
+   // being terminated.
+-
+-#if defined ACE_HAS_SIG_C_FUNC
+-  ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_,
+-                                ACE_Process_Manager_cleanup,
+-                                0,
+-                                typeid (*ACE_Process_Manager::instance_).name ());
+-#else
+   ACE_Object_Manager::at_exit (ACE_Process_Manager::instance_,
+-                                ACE_Process_Manager::cleanup,
++                                ACE_PROCESS_MANAGER_CLEANUP_FUNCTION,
+                                 0,
+-                                typeid (*ACE_Process_Manager::instance_).name ());
+-#endif /* ACE_HAS_SIG_C_FUNC */
++                                typeid (*t).name ());
+
+   ACE_Process_Manager::instance_ = tm;
+   return t;

scripts/ci.baseline.txt

@@ -45,13 +45,6 @@
 7zip:x64-osx=fail
 7zip:x64-uwp=fail
 abseil:arm-uwp=fail
-# ace is failing because the port's attempt to make yasm available is not succeeding
-ace:arm-uwp=fail
-ace:arm64-windows=fail
-ace:x64-uwp=fail
-ace:x64-windows-static=fail
-ace:x64-windows=fail
-ace:x86-windows=fail
 activemq-cpp:x64-windows-static=fail
 activemq-cpp:x64-linux=fail
 activemq-cpp:x64-osx=fail