[rollup:2021-07-06] Rollup PR (#18838)

* [rollup:2021-07-06 1/8] PR #18272 (@strega-nil)

[scripts-audit] vcpkg_from_*

* [rollup:2021-07-06 2/8] PR #18319 (@strega-nil)

[scripts-audit] add guidelines for cmake

* [rollup 2021-07-06 3/8] PR #18410 (@mheyman)

[vcpkg-cmake-config] documentation fix

* [rollup:2021-07-06 4/8] PR #18488 (@strega-nil)

[scripts-audit] vcpkg_execute_*

* [rollup:2021-07-06 5/8] PR #18517 (@strega-nil)

[scripts-audit] vcpkg_extract_source_archive

* [rollup:2021-07-06 6/8] PR #18674 (@NancyLi1013)

[vcpkg doc] Update examples

* [rollup:2021-07-06 7/8] PR #18695 (@JackBoosY)

[vcpkg] Update the minimum version of vcpkg

* [rollup:2021-07-06 8/8] PR #18758 (@ras0219-msft)

[vcpkg_from_git] Fix error if downloads folder does not exist

* build docs!

* fix bond:*-windows

* fix nmap

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Michael Heyman <Michael.Heyman@jhuapl.edu>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Robert Schumacher <ras0219@outlook.com>

18 files changed, 109 insertions, 54 deletions

diff --git a/ports/avisynthplus/portfile.cmake b/ports/avisynthplus/portfile.cmake
index 8bbc5eace..af6641c3f 100644
--- a/ports/avisynthplus/portfile.cmake
+++ b/ports/avisynthplus/portfile.cmake
@@ -15,8 +15,8 @@ vcpkg_download_distfile(GHC_ARCHIVE
 )
 
 file(REMOVE_RECURSE ${SOURCE_PATH}/filesystem)
-vcpkg_extract_source_archive(${GHC_ARCHIVE} ${SOURCE_PATH})
-file(RENAME ${SOURCE_PATH}/filesystem-3f1c185ab414e764c694b8171d1c4d8c5c437517 ${SOURCE_PATH}/filesystem)
+vcpkg_extract_source_archive(extracted_archive ARCHIVE "${GHC_ARCHIVE}")
+file(RENAME "${extracted_archive}" "${SOURCE_PATH}/filesystem")
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json
index 58d064b2d..88e47ac01 100644
--- a/ports/avisynthplus/vcpkg.json
+++ b/ports/avisynthplus/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "avisynthplus",
   "version-semver": "3.7.0",
+  "port-version": 1,
   "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness",
   "homepage": "http://avs-plus.net/",
   "supports": "!arm & !uwp"
diff --git a/ports/bond/CONTROL b/ports/bond/CONTROL
deleted file mode 100644
index 64673d992..000000000
--- a/ports/bond/CONTROL
+++ /dev/null
@@ -1,9 +0,0 @@
-Source: bond
-Version: 9.0.3
-Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.
-Homepage: https://github.com/Microsoft/bond
-Build-Depends: rapidjson, boost-config, boost-utility, boost-assign, boost-locale
-
-Feature: bond-over-grpc
-Description: Bond-over-gRPC provides code generation from Bond IDL service definitions to send Bond objects via gRPC.
-Build-Depends: grpc
diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake
index f4b9cdd94..6a56a4534 100644
--- a/ports/bond/portfile.cmake
+++ b/ports/bond/portfile.cmake
@@ -21,13 +21,13 @@ if (VCPKG_TARGET_IS_WINDOWS)
     # Clear the generator to prevent it from updating
     file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/tools/)
     # Extract the precompiled gbc
-    vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/)
-    set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc-${BOND_VER}-amd64.exe)
+    vcpkg_extract_source_archive(extracted_tool_dir ARCHIVE "${GBC_ARCHIVE}" NO_REMOVE_ONE_LEVEL)
+    file(RENAME "${extracted_tool_dir}" "${CURRENT_BUILDTREES_DIR}/tools")
 
-    if (NOT EXISTS "${FETCHED_GBC_PATH}")
-        message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.")
+    set(FETCHED_GBC_PATH "${CURRENT_BUILDTREES_DIR}/tools/gbc-${BOND_VER}-amd64.exe")
+    if(NOT EXISTS "${FETCHED_GBC_PATH}")
+        message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exist, but it doesn't.")
     endif()
-
 else()
     # According to the readme on https://github.com/microsoft/bond/
     # The build needs a version of the Haskel Tool stack that is newer than some distros ship with.
diff --git a/ports/bond/vcpkg.json b/ports/bond/vcpkg.json
new file mode 100644
index 000000000..524cc9d0f
--- /dev/null
+++ b/ports/bond/vcpkg.json
@@ -0,0 +1,22 @@
+{
+  "name": "bond",
+  "version-string": "9.0.3",
+  "port-version": 1,
+  "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.",
+  "homepage": "https://github.com/Microsoft/bond",
+  "dependencies": [
+    "boost-assign",
+    "boost-config",
+    "boost-locale",
+    "boost-utility",
+    "rapidjson"
+  ],
+  "features": {
+    "bond-over-grpc": {
+      "description": "Bond-over-gRPC provides code generation from Bond IDL service definitions to send Bond objects via gRPC.",
+      "dependencies": [
+        "grpc"
+      ]
+    }
+  }
+}
diff --git a/ports/nmap/CONTROL b/ports/nmap/CONTROL
deleted file mode 100644
index a703b496f..000000000
--- a/ports/nmap/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: nmap
-Version: 7.70-4
-Build-Depends: winpcap (windows), libpcap (!windows), lua, openssl, python2 (windows), libssh2, zlib, pcre
-Description: A library for scanning network ports.
diff --git a/ports/nmap/portfile.cmake b/ports/nmap/portfile.cmake
index 829153310..c0252af8d 100644
--- a/ports/nmap/portfile.cmake
+++ b/ports/nmap/portfile.cmake
@@ -58,59 +58,60 @@ if(VCPKG_TARGET_IS_WINDOWS)
     endif()
 else()
     set(ENV{LDFLAGS} "$ENV{LDFLAGS} -pthread")
-    foreach(BUILD_TYPE rel dbg)
-        file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE})
-        file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE})
-        # Since nmap makefile has strong relationshop with codes, copy codes to obj path
-        vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE})
-
-    endforeach()
     set(OPTIONS --without-nmap-update --with-openssl=${CURRENT_INSTALLED_DIR} --with-libssh2=${CURRENT_INSTALLED_DIR} --with-libz=${CURRENT_INSTALLED_DIR} --with-libpcre=${CURRENT_INSTALLED_DIR})
     message(STATUS "Building Options: ${OPTIONS}")
     
     if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Release)
+        # Since nmap makefile has strong relationshop with codes, copy codes to obj path
         message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
-        set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/nmap-7.70)
+	    vcpkg_extract_source_archive(source_path_release
+            ARCHIVE "${ARCHIVE}"
+            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
+        )
 
         vcpkg_execute_required_process(
             COMMAND "./configure" ${OPTIONS}
-            WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+	    WORKING_DIRECTORY "${source_path_release}"
             LOGNAME config-${TARGET_TRIPLET}-rel
         )
         
         message(STATUS "Building ${TARGET_TRIPLET}-rel")
         vcpkg_execute_required_process(
             COMMAND make
-            WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
+            WORKING_DIRECTORY "${source_path_release}"
             LOGNAME build-${TARGET_TRIPLET}-rel
         )
         
         message(STATUS "Installing ${TARGET_TRIPLET}-rel")
-        file(INSTALL ${SOURCE_PATH_RELEASE}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
+        file(INSTALL ${source_path_release}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
     endif()
     
     if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Debug)
+        # Since nmap makefile has strong relationshop with codes, copy codes to obj path
         message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
-        set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/nmap-7.70)
+        vcpkg_extract_source_archive(source_path_debug
+            ARCHIVE "${ARCHIVE}"
+            WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
+        )
 
         vcpkg_execute_required_process(
             COMMAND "./configure" ${OPTIONS}
-            WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+            WORKING_DIRECTORY ${source_path_debug}
             LOGNAME config-${TARGET_TRIPLET}-dbg
         )
         
         message(STATUS "Building ${TARGET_TRIPLET}-dbg")
         vcpkg_execute_required_process(
             COMMAND make
-            WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
+            WORKING_DIRECTORY ${source_path_debug}
             LOGNAME build-${TARGET_TRIPLET}-dbg
         )
         
         message(STATUS "Installing ${TARGET_TRIPLET}-dbg")
-        file(INSTALL ${SOURCE_PATH_RELEASE}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools)
+        file(INSTALL ${source_path_release}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools)
     endif()
     
-    set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/nmap-7.70)
+    set(SOURCE_PATH "${source_path_release}")
 endif()
 
 vcpkg_copy_pdbs()
diff --git a/ports/nmap/vcpkg.json b/ports/nmap/vcpkg.json
new file mode 100644
index 000000000..6aba23611
--- /dev/null
+++ b/ports/nmap/vcpkg.json
@@ -0,0 +1,25 @@
+{
+  "name": "nmap",
+  "version": "7.70",
+  "port-version": 5,
+  "description": "A library for scanning network ports.",
+  "dependencies": [
+    {
+      "name": "libpcap",
+      "platform": "!windows"
+    },
+    "libssh2",
+    "lua",
+    "openssl",
+    "pcre",
+    {
+      "name": "python2",
+      "platform": "windows"
+    },
+    {
+      "name": "winpcap",
+      "platform": "windows"
+    },
+    "zlib"
+  ]
+}
diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake
index 4d93c4f1a..5e298acbc 100644
--- a/ports/opencv3/portfile.cmake
+++ b/ports/opencv3/portfile.cmake
@@ -135,9 +135,9 @@ if("contrib" IN_LIST FEATURES)
           FILENAME "opencv_3rdparty-${COMMIT}.zip"
           SHA512 ${HASH}
       )
-      vcpkg_extract_source_archive(${OCV_DOWNLOAD})
+      vcpkg_extract_source_archive(extracted_ocv ARCHIVE "${OCV_DOWNLOAD}")
       file(MAKE_DIRECTORY "${DOWNLOADS}/opencv-cache/${ID}")
-      file(GLOB XFEATURES2D_I ${CURRENT_BUILDTREES_DIR}/src/opencv_3rdparty-${COMMIT}/*)
+      file(GLOB XFEATURES2D_I "${extracted_ocv}/*")
       foreach(FILE ${XFEATURES2D_I})
         file(COPY ${FILE} DESTINATION "${DOWNLOADS}/opencv-cache/${ID}")
         get_filename_component(XFEATURES2D_I_NAME "${FILE}" NAME)
diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json
index cf7bb1234..50d927750 100644
--- a/ports/opencv3/vcpkg.json
+++ b/ports/opencv3/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "opencv3",
   "version": "3.4.14",
+  "port-version": 1,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "dependencies": [
diff --git a/ports/qcustomplot/CONTROL b/ports/qcustomplot/CONTROL
deleted file mode 100644
index ec7dac08f..000000000
--- a/ports/qcustomplot/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: qcustomplot

-Version: 2.0.1-4

-Description: QCustomPlot is a Qt C++ widget for plotting and data visualization.

-Build-Depends: qt5-base[core]

diff --git a/ports/qcustomplot/portfile.cmake b/ports/qcustomplot/portfile.cmake
index b180d8bd7..026f62fb3 100644
--- a/ports/qcustomplot/portfile.cmake
+++ b/ports/qcustomplot/portfile.cmake
@@ -16,7 +16,9 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME "QCustomPlot-sharedlib-${QCP_VERSION}.tar.gz"

     SHA512 ce90540fca7226eac37746327e1939a9c7af38fc2595f385ed04d6d1f49560da08fb5fae15d1b9d22b6ba578583f70de8f89ef26796770d41bf599c1b15c535d

 )

-vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH})

+vcpkg_extract_source_archive(SharedLib_SOURCE_PATH ARCHIVE "${ARCHIVE}")

+file(RENAME "${SharedLib_SOURCE_PATH}" "${SOURCE_PATH}/qcustomplot-sharedlib")

+

 

 vcpkg_configure_qmake(SOURCE_PATH

     ${SOURCE_PATH}/qcustomplot-sharedlib/sharedlib-compilation/sharedlib-compilation.pro

diff --git a/ports/qcustomplot/vcpkg.json b/ports/qcustomplot/vcpkg.json
new file mode 100644
index 000000000..6d2c2c665
--- /dev/null
+++ b/ports/qcustomplot/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "qcustomplot",
+  "version": "2.0.1",
+  "port-version": 5,
+  "description": "QCustomPlot is a Qt C++ widget for plotting and data visualization.",
+  "dependencies": [
+    {
+      "name": "qt5-base",
+      "default-features": false
+    }
+  ]
+}
diff --git a/ports/qt5-mqtt/CONTROL b/ports/qt5-mqtt/CONTROL
deleted file mode 100644
index eeb831a9f..000000000
--- a/ports/qt5-mqtt/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: qt5-mqtt

-Version: 5.15.2

-Description: Qt5 MQTT module.

-Build-Depends:  qt5-base[core]

diff --git a/ports/qt5-mqtt/portfile.cmake b/ports/qt5-mqtt/portfile.cmake
index 77ef1144b..ca6e25d0d 100644
--- a/ports/qt5-mqtt/portfile.cmake
+++ b/ports/qt5-mqtt/portfile.cmake
@@ -1,20 +1,19 @@
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)

 #qt_submodule_installation() No binary package for this port. 

 if(QT_UPDATE_VERSION)

-    set(UPDATE_PORT_GIT_OPTIONS X_OUT_REF NEW_REF) # TO get an SHA512 error if the variable is set. 

+    set(VCPKG_USE_HEAD_VERSION ON)

 endif()

 

 vcpkg_from_git(

     OUT_SOURCE_PATH SOURCE_PATH

     URL git://code.qt.io/qt/qtmqtt.git

-    TAG v${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}

     REF ${QT_HASH_${PORT}}

-    ${UPDATE_PORT_GIT_OPTIONS}

+    HEAD_REF "v${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}"

     PATCHES ${_qis_PATCHES}

 )

 

-if(NEW_REF)

-    message(STATUS "New qtmqtt ref: ${NEW_REF}")

+if(QT_UPDATE_VERSION)

+    message(STATUS "New qtmqtt ref: ${VCPKG_HEAD_VERSION}")

 endif()

 

 # qt module builds from a git repository require a .git entry to invoke syncqt

diff --git a/ports/qt5-mqtt/vcpkg.json b/ports/qt5-mqtt/vcpkg.json
new file mode 100644
index 000000000..c4dac430a
--- /dev/null
+++ b/ports/qt5-mqtt/vcpkg.json
@@ -0,0 +1,12 @@
+{
+  "name": "qt5-mqtt",
+  "version": "5.15.2",
+  "port-version": 1,
+  "description": "Qt5 MQTT module.",
+  "dependencies": [
+    {
+      "name": "qt5-base",
+      "default-features": false
+    }
+  ]
+}
diff --git a/ports/vcpkg-cmake-config/vcpkg.json b/ports/vcpkg-cmake-config/vcpkg.json
index fde8492dc..49faaf4d4 100644
--- a/ports/vcpkg-cmake-config/vcpkg.json
+++ b/ports/vcpkg-cmake-config/vcpkg.json
@@ -1,4 +1,5 @@
 {
   "name": "vcpkg-cmake-config",
-  "version-date": "2021-05-22"
+  "version-date": "2021-05-22",
+  "port-version": 1
 }
diff --git a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake
index 03a6c1d09..a145d324a 100644
--- a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake
+++ b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake
@@ -9,7 +9,7 @@ Additionally corrects common issues with targets, such as absolute paths and inc
 vcpkg_cmake_config_fixup(
     [PACKAGE_NAME <name>]
     [CONFIG_PATH <config-directory>]
-    [DO_NOT_DELETE_CONFIG_PATH_PARENT]
+    [DO_NOT_DELETE_PARENT_CONFIG_PATH]
     [NO_PREFIX_CORRECTION]
 )
 ```