Add doxygen and add packages option to vcpkg_require_msys (#2869)

* Add doxygen to acquired programs

* Add packages option to msys function

* Add documentation for PACKAGES in vcpkg_require_msys

* [ffmpeg][x264] Update to use `PACKAGES` parameter. Tweak docs.

5 files changed, 8 insertions, 31 deletions

diff --git a/ports/ffmpeg/build.sh b/ports/ffmpeg/build.sh
index eea05c959..048d9ec08 100644
--- a/ports/ffmpeg/build.sh
+++ b/ports/ffmpeg/build.sh
@@ -8,7 +8,6 @@ fi
 if [ "$HTTPS_PROXY" ]; then
     export https_proxy=$HTTPS_PROXY
 fi
-pacman -Sy --noconfirm --needed diffutils make
 
 PATH_TO_BUILD_DIR="`cygpath "$1"`"
 PATH_TO_SRC_DIR="`cygpath "$2"`"
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake
index 9e969bf6c..56b467685 100644
--- a/ports/ffmpeg/portfile.cmake
+++ b/ports/ffmpeg/portfile.cmake
@@ -17,7 +17,11 @@ vcpkg_find_acquire_program(YASM)
 get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
 set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}")
 
-vcpkg_acquire_msys(MSYS_ROOT)
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES perl gcc diffutils make)
+else()
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils make)
+endif()
 set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
 set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}")
 set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib;$ENV{LIB}")
@@ -45,14 +49,6 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
             get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY)
             set(ENV{PATH} "$ENV{PATH};${GAS_ITEM_PATH}")
         endforeach(GAS_PATH)
-
-        ## Get Perl and GCC for MSYS2
-        vcpkg_execute_required_process(
-            COMMAND ${BASH} --noprofile --norc -c 'PATH=/usr/bin:\$PATH;pacman -Sy --noconfirm --needed perl gcc'
-            WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}
-            LOGNAME msys-${TARGET_TRIPLET}
-        )
-
     elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
     elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     else()
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
index 11637b061..dcf9efda5 100644
--- a/ports/icu/portfile.cmake
+++ b/ports/icu/portfile.cmake
@@ -15,7 +15,7 @@ vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
     PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-escapestr-tool.patch)

 

 # Acquire tools

-vcpkg_acquire_msys(MSYS_ROOT)

+vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15)

 

 # Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe".

 string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}")

@@ -23,11 +23,6 @@ string(REPLACE ";$ENV{SystemRoot}\\System32;" ";${MSYS_ROOT}/usr/bin;$ENV{System
 set(ENV{PATH} "${NEWPATH}")

 set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)

 

-vcpkg_execute_required_process(

-    COMMAND ${BASH} --noprofile --norc -c "pacman -Sy --noconfirm --needed make automake1.15"

-    WORKING_DIRECTORY "${MSYS_ROOT}"

-    LOGNAME "pacman-${TARGET_TRIPLET}")

-

 set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.15)

 file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source)

 

diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake
index f7e36b5a8..31630332a 100644
--- a/ports/libvpx/portfile.cmake
+++ b/ports/libvpx/portfile.cmake
@@ -22,20 +22,12 @@ vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_find_acquire_program(YASM)
 vcpkg_find_acquire_program(PERL)
-vcpkg_acquire_msys(MSYS_ROOT)
+vcpkg_acquire_msys(MSYS_ROOT PACKAGES make)
 get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY)
 get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
 set(ENV{PATH} "${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}")
 set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
 
-message(STATUS "Installing MSYS Packages")
-vcpkg_execute_required_process(
-    COMMAND
-        ${BASH} --noprofile --norc -c
-        "pacman -Sy --noconfirm --needed make"
-    WORKING_DIRECTORY ${MSYS_ROOT}
-    LOGNAME pacman-${TARGET_TRIPLET})
-
 file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
 
 if(VCPKG_CRT_LINKAGE STREQUAL static)
diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake
index a6115f8d1..b9dbfa34d 100644
--- a/ports/x264/portfile.cmake
+++ b/ports/x264/portfile.cmake
@@ -11,18 +11,13 @@ vcpkg_from_github(
 )
 
 # Acquire tools
-vcpkg_acquire_msys(MSYS_ROOT)
+vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15)
 
 # Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe".
 string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}")
 set(ENV{PATH} "${NEWPATH}")
 set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
 
-vcpkg_execute_required_process(
-    COMMAND ${BASH} --noprofile --norc -c "pacman -Sy --noconfirm --needed make automake1.15"
-    WORKING_DIRECTORY "${MSYS_ROOT}"
-    LOGNAME "pacman-${TARGET_TRIPLET}")
-
 set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.15)
 #file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source)