[vcpkg] fatal_error when patch fails to apply (#8087)

vcpkg will now fail on failure to apply patches except when using `--head`.

Author: cenit

ports/ace/portfile.cmake

@@ -1,3 +1,21 @@
+include(vcpkg_common_functions)
+
+# 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_6/ACE-src-6.5.6.zip"
+    FILENAME ACE-src-6.5.6.zip
+    SHA512 4ee42aafc86af159ab20dbb14c7c2a49bed733645f5cc3afa8cef3e9688ff929002f3420eb33e859afe10a534afc276340faa21d029fa56bd07bd9aed3403ab4
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
+
+set(ACE_ROOT ${SOURCE_PATH})
+set(ENV{ACE_ROOT} ${ACE_ROOT})
+set(ACE_SOURCE_PATH ${ACE_ROOT}/ace)
+
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "${PORT} does not currently support UWP")
 endif()
@@ -23,16 +41,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
   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})
 
 vcpkg_find_acquire_program(PERL)
 get_filename_component(PERL_PATH ${PERL} DIRECTORY)
@@ -58,7 +66,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   else()
     set(SOLUTION_TYPE vc14)
   endif()
-  file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
+  file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
 endif()
 
 if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
@@ -67,8 +75,8 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
   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")
+  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")
 endif()
 
 # Invoke mwc.pl to generate the necessary solution and project files
@@ -80,7 +88,7 @@ vcpkg_execute_required_process(
 
 if(NOT VCPKG_CMAKE_SYSTEM_NAME)
   vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/ace.sln
+    PROJECT_PATH ${ACE_SOURCE_PATH}/ace.sln
     PLATFORM ${MSBUILD_PLATFORM}
     USE_VCPKG_INTEGRATION
   )
@@ -101,34 +109,34 @@ 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)
+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})
 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 ${SOURCE_PATH}/*.h ${SOURCE_PATH}/*.inl ${SOURCE_PATH}/*.cpp)
+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(${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")
+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")
 if("ssl" IN_LIST FEATURES)
-    install_ace_headers_subdirectory(${SOURCE_PATH} "SSL")
+    install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "SSL")
 endif()
 
 # Install the libraries
-function(install_ace_library SOURCE_PATH ACE_LIBRARY)
-    set(LIB_PATH ${SOURCE_PATH}/lib/)
+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

ports/activemq-cpp/CONTROL

@@ -1,4 +1,4 @@
 Source: activemq-cpp
-Version: 3.9.5
+Version: 3.9.5-1
 Build-Depends: apr
 Description: Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.

ports/activemq-cpp/portfile.cmake

@@ -5,12 +5,11 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 endif()
 
 set(VERSION 3.9.5)
-                                              
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/activemq-cpp-library-${VERSION})
+
 vcpkg_download_distfile(ARCHIVE
     URLS "https://www.apache.org/dist/activemq/activemq-cpp/${VERSION}/activemq-cpp-library-${VERSION}-src.tar.bz2"
     FILENAME "activemq-cpp-library-${VERSION}-src.tar.bz2"
-    SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2  
+    SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2
 )
 
 vcpkg_extract_source_archive_ex(
@@ -42,12 +41,12 @@ vcpkg_build_msbuild(
 )
 
 vcpkg_copy_pdbs()
- 
+
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/activemq-cpp)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/activemq-cpp/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/activemq-cpp/copyright)
 
-     
+
 file(
     COPY
     ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.lib

ports/alac-decoder/CONTROL

@@ -1,4 +1,4 @@
-Source: alac-decoder
-Version: 0.2-1
-Homepage: https://distfiles.macports.org/alac_decoder
-Description:  ALAC C implementation of a decoder, written from reverse engineering the file format
+Source: alac-decoder
+Version: 0.2-3
+Homepage: https://distfiles.macports.org/alac_decoder
+Description:  ALAC C implementation of a decoder, written from reverse engineering the file format

ports/alac-decoder/no-pragma-warning.patch

@@ -1,14 +1,14 @@
-diff --git a/alac.c b/alac.c
-index b829e29..8e8805f 100644
---- a/alac.c
-+++ b/alac.c
-@@ -284,7 +284,9 @@ static int count_leading_zeros(int input)
-     return output;
- }
- #else
-+#if !defined(_MSC_VER)
- #warning using generic count leading zeroes. You may wish to write one for your CPU / compiler
-+#endif
- static int count_leading_zeros(int input)
- {
-     int output = 0;
+diff --git a/alac.c b/alac.c
+index b829e29..8e8805f 100644
+--- a/alac.c
++++ b/alac.c
+@@ -284,7 +284,9 @@ static int count_leading_zeros(int input)
+     return output;
+ }
+ #else
++#if !defined(_MSC_VER)
+ #warning using generic count leading zeroes. You may wish to write one for your CPU / compiler
++#endif
+ static int count_leading_zeros(int input)
+ {
+     int output = 0;

ports/alac-decoder/portfile.cmake

@@ -2,33 +2,33 @@ include(vcpkg_common_functions)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/alac_decoder)
 vcpkg_download_distfile(ARCHIVE
     URLS "https://distfiles.macports.org/alac_decoder/alac_decoder-0.2.0.tgz"
     FILENAME "alac_decoder-0.2.0.tgz"
     SHA512 4b37d4fe37681bfccaa4a27fbaf11eb2a1fba5f14e77d219a6d9814ff44d1168534d05eb19443dd2fd11e6fcdf4da3a22e3f3c79314cb7a6767c152351b13e29
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/decomp.c DESTINATION ${SOURCE_PATH})
-
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
     PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/remove_stdint_headers.patch
-        ${CMAKE_CURRENT_LIST_DIR}/no-pragma-warning.patch
+        remove_stdint_headers.patch
+        no-pragma-warning.patch
 )
 
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/decomp.c DESTINATION ${SOURCE_PATH})
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
+    OPTIONS_DEBUG
+      -DDISABLE_INSTALL_HEADERS=ON
+      -DDISABLE_INSTALL_TOOLS=ON
 )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/alac-decoder)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
 
-file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/alac-decoder RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

ports/angelscript/CONTROL

@@ -1,6 +1,6 @@
-Source: angelscript
-Version: 2.33.1-1
-Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.
-
-Feature: addons
-Description: Installs all addons for use in compiling scripts addons
+Source: angelscript
+Version: 2.33.1-2
+Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.
+
+Feature: addons
+Description: Installs all addons for use in compiling scripts addons

ports/angelscript/LICENSE

@@ -1,13 +1,13 @@
-AngelCode Scripting Library
-
-Copyright © 2003-2018 Andreas Jönsson
-
-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
-
-    The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-
-    Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-
-    This notice may not be removed or altered from any source distribution.
+AngelCode Scripting Library
+
+Copyright © 2003-2018 Andreas Jönsson
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+    The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+    Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+    This notice may not be removed or altered from any source distribution.

ports/angelscript/mark-threads-private.patch

@@ -1,13 +1,13 @@
-diff --git a/angelscript/projects/cmake/CMakeLists.txt b/angelscript/projects/cmake/CMakeLists.txt
-index 7c800c5..982ad8b 100644
---- a/angelscript/projects/cmake/CMakeLists.txt
-+++ b/angelscript/projects/cmake/CMakeLists.txt
-@@ -145,7 +145,7 @@ endif()
- 
- # Don't override the default library output path to avoid conflicts when building for multiple target platforms
- #set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib)
--target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} Threads::Threads)
-+target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE Threads::Threads)
- 
- set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
- 
+diff --git a/angelscript/projects/cmake/CMakeLists.txt b/angelscript/projects/cmake/CMakeLists.txt
+index 7c800c5..982ad8b 100644
+--- a/angelscript/projects/cmake/CMakeLists.txt
++++ b/angelscript/projects/cmake/CMakeLists.txt
+@@ -145,7 +145,7 @@ endif()
+ 
+ # Don't override the default library output path to avoid conflicts when building for multiple target platforms
+ #set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib)
+-target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} Threads::Threads)
++target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE Threads::Threads)
+ 
+ set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
+ 

ports/angelscript/portfile.cmake

@@ -1,38 +1,31 @@
-include(vcpkg_common_functions)
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.33.0.zip"
-    FILENAME "angelscript_2.33.0.zip"
-    SHA512 eaf972ecf965fe4f72e55755f5e796499018e918f93cfd835b1ca20f9338e299e8dbd707240341eef81ae920f07d2280646151f515f5990a62550689445c86f0
-)
-
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    PATCHES
-       mark-threads-private.patch
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
-    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
-    # OPTIONS_RELEASE -DOPTIMIZE=1
-    # OPTIONS_DEBUG -DDEBUGGABLE=1
-)
-
-vcpkg_install_cmake()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Angelscript)
-
-# Handle copyright
-file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angelscript RENAME copyright)
-
-# Copy the addon files
-if("addons" IN_LIST FEATURES)
-	file(INSTALL ${SOURCE_PATH}/add_on/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/angelscript FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp")
-endif()
-
-# Post-build test for cmake libraries
-# vcpkg_test_cmake(PACKAGE_NAME angelscript)
+include(vcpkg_common_functions)
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.33.0.zip"
+    FILENAME "angelscript_2.33.0.zip"
+    SHA512 eaf972ecf965fe4f72e55755f5e796499018e918f93cfd835b1ca20f9338e299e8dbd707240341eef81ae920f07d2280646151f515f5990a62550689445c86f0
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    PATCHES
+       mark-threads-private.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Angelscript)
+
+# Copy the addon files
+if("addons" IN_LIST FEATURES)
+	file(INSTALL ${SOURCE_PATH}/add_on/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/angelscript FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp")
+endif()
+
+file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)