microsoft · Jack·Boos·Yu (JackBoosY) · Aug 26, 2021 · Aug 26, 2021 · Aug 26, 2021 · Aug 26, 2021
diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md
@@ -6,7 +6,7 @@
 - [vcpkg\_add\_to\_path](vcpkg_add_to_path.md)
 - [vcpkg\_apply\_patches](vcpkg_apply_patches.md) (deprecated)
 - [vcpkg\_build\_cmake](vcpkg_build_cmake.md) (deprecated, use [vcpkg\_cmake\_build](ports/vcpkg-cmake/vcpkg_cmake_build.md))
-- [vcpkg\_build\_make](vcpkg_build_make.md)
+- [vcpkg\_build\_make](vcpkg_build_make.md) (deprecated, use [vcpkg\_make\_build](ports/vcpkg-make/vcpkg_make_build.md))
 - [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md)
 - [vcpkg\_build\_ninja](vcpkg_build_ninja.md)
 - [vcpkg\_build\_nmake](vcpkg_build_nmake.md)
@@ -19,7 +19,7 @@
 - [vcpkg\_common\_definitions](vcpkg_common_definitions.md)
 - [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md) (deprecated, use [vcpkg\_cmake\_configure](ports/vcpkg-cmake/vcpkg_cmake_configure.md))
 - [vcpkg\_configure\_gn](vcpkg_configure_gn.md)
-- [vcpkg\_configure\_make](vcpkg_configure_make.md)
+- [vcpkg\_configure\_make](vcpkg_configure_make.md) (deprecated, use [vcpkg\_make\_configure](ports/vcpkg-make/vcpkg_make_configure.md))
 - [vcpkg\_configure\_meson](vcpkg_configure_meson.md)
 - [vcpkg\_configure\_qmake](vcpkg_configure_qmake.md)
 - [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md)
@@ -46,7 +46,7 @@
 - [vcpkg\_get\_windows\_sdk](vcpkg_get_windows_sdk.md)
 - [vcpkg\_install\_cmake](vcpkg_install_cmake.md) (deprecated, use [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md))
 - [vcpkg\_install\_gn](vcpkg_install_gn.md)
-- [vcpkg\_install\_make](vcpkg_install_make.md)
+- [vcpkg\_install\_make](vcpkg_install_make.md) (deprecated, use [vcpkg\_make\_install](ports/vcpkg-make/vcpkg_make_install.md))
 - [vcpkg\_install\_meson](vcpkg_install_meson.md)
 - [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md)
 - [vcpkg\_install\_nmake](vcpkg_install_nmake.md)

diff --git a/docs/maintainers/vcpkg_build_make.md b/docs/maintainers/vcpkg_build_make.md
@@ -1,5 +1,7 @@
 # vcpkg_build_make
 
+**This function has been deprecated in favor of [`vcpkg_make_build`](ports/vcpkg-make/vcpkg_make_build.md) from the vcpkg-make port.**
+
 The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_build_make.md).
 
 Build a linux makefile project.

diff --git a/docs/maintainers/vcpkg_configure_make.md b/docs/maintainers/vcpkg_configure_make.md
@@ -1,5 +1,7 @@
 # vcpkg_configure_make
 
+**This function has been deprecated in favor of [`vcpkg_make_configure`](ports/vcpkg-make/vcpkg_make_configure.md) from the vcpkg-make port.**
+
 The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_configure_make.md).
 
 Configure configure for Debug and Release builds of a project.

diff --git a/docs/maintainers/vcpkg_install_make.md b/docs/maintainers/vcpkg_install_make.md
@@ -1,5 +1,7 @@
 # vcpkg_install_make
 
+**This function has been deprecated in favor of [`vcpkg_make_install`](ports/vcpkg-make/vcpkg_make_install.md) from the vcpkg-make port.**
+
 The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_make.md).
 
 Build and install a make project.

diff --git a/ports/vcpkg-make/README.md b/ports/vcpkg-make/README.md
@@ -0,0 +1,7 @@
+# vcpkg-make
+
+This port contains make functions for dealing with a Make buildsystem.
+
+In the common case, `vcpkg_make_configure()` (with appropriate arguments)
+followed by `vcpkg_make_install()` will be enough to build and install a port.
+`vcpkg_make_build()` is provided for more complex cases.
diff --git a/ports/vcpkg-make/copyright b/ports/vcpkg-make/copyright
@@ -0,0 +1,23 @@
+Copyright (c) Microsoft Corporation
+
+All rights reserved. 
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/ports/vcpkg-make/portfile.cmake b/ports/vcpkg-make/portfile.cmake
@@ -0,0 +1,14 @@
+if(NOT TARGET_TRIPLET STREQUAL _HOST_TRIPLET)
+    # make FATAL_ERROR in CI when issue #16773 fixed
+    message(WARNING "vcpkg-make is a host-only port; please mark it as a host port in your dependencies.")
+endif()
+
+file(INSTALL
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_configure.cmake"
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_build.cmake"
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_install.cmake"
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
+    "${CMAKE_CURRENT_LIST_DIR}/copyright"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/vcpkg-make/vcpkg-port-config.cmake b/ports/vcpkg-make/vcpkg-port-config.cmake
@@ -0,0 +1,3 @@
+include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_configure.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_build.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_make_install.cmake")
diff --git a/ports/vcpkg-make/vcpkg.json b/ports/vcpkg-make/vcpkg.json
@@ -0,0 +1,4 @@
+{
+  "name": "vcpkg-make",
+  "version-date": "2021-08-25"
+}
diff --git a/ports/vcpkg-make/vcpkg_make_build.cmake b/ports/vcpkg-make/vcpkg_make_build.cmake
@@ -0,0 +1,261 @@
+#[===[.md:
+# vcpkg_make_build
+
+Build a linux makefile project.
+
+```cmake
+vcpkg_make_build(
+    [BUILD_TARGET <target>]
+    [ADD_BIN_TO_PATH]
+    [ENABLE_INSTALL]
+    [MAKEFILE <makefileName>]
+    [LOGFILE_BASE <logfilebase>]
+)
+```
+
+### BUILD_TARGET
+The target passed to the make build command (`./make <target>`). If not specified, the 'all' target will
+be passed.
+
+### ADD_BIN_TO_PATH
+Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs.
+
+### ENABLE_INSTALL
+IF the port supports the install target use vcpkgl_make_instal() instead of vcpkg_make_build()
+
+### MAKEFILE
+Specifies the Makefile as a relative path from the root of the sources passed to `vcpkg_make_configure()`
+
+### BUILD_TARGET
+The target passed to the make build command (`./make <target>`). Defaults to 'all'.
+
+### INSTALL_TARGET
+The target passed to the make build command (`./make <target>`) if `ENABLE_INSTALL` is used. Defaults to 'install'.
+
+### DISABLE_PARALLEL
+The underlying buildsystem will be instructed to not parallelize
+
+### SUBPATH
+Additional subdir to invoke make in. Useful if only parts of a port should be built. 
+
+## Notes:
+This command should be preceded by a call to [`vcpkg_make_configure()`](vcpkg_make_configure.md).
+You can use the alias [`vcpkgl_make_instal()`](vcpkgl_make_instal.md) function if your makefile supports the
+"install" target
+
+## Examples
+
+* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake)
+* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake)
+* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake)
+* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake)
+#]===]
+
+if(Z_VCPKG_MAKE_BUILD_GUARD)
+    return()
+endif()
+set(Z_VCPKG_MAKE_BUILD_GUARD ON CACHE INTERNAL "guard variable")
+
+function(vcpkg_make_build)
+    z_vcpkg_get_cmake_vars(cmake_vars_file)
+    include("${cmake_vars_file}")
+
+    # parse parameters such that semicolons in options arguments to COMMAND don't get erased
+    cmake_parse_arguments(PARSE_ARGV 0 arg
+        "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL"
+        "LOGFILE_BASE;BUILD_TARGET;SUBPATH;MAKEFILE;INSTALL_TARGET"
+        ""
+    )
+
+    if(DEFINED arg_UNPARSED_ARGUMENTS)
+        message(FATAL_ERROR "vcpkg_make_build was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")
+    endif()
+
+    if(NOT DEFINED arg_LOGFILE_BASE)
+        set(arg_LOGFILE_BASE "build")
+    endif()
+
+    if(NOT DEFINED arg_BUILD_TARGET)
+        set(arg_BUILD_TARGET "all")
+    endif()
+
+    if (NOT DEFINED arg_MAKEFILE)
+        set(arg_MAKEFILE Makefile)
+    endif()
+
+    if(NOT DEFINED arg_INSTALL_TARGET)
+        set(arg_INSTALL_TARGET "install")
+    endif()
+
+    if(WIN32)
+        set(_vcpkg_prefix ${CURRENT_PACKAGES_DIR})
+        set(_vcpkg_installed ${CURRENT_INSTALLED_DIR})
+    else()
+        string(REPLACE " " "\ " _vcpkg_prefix "${CURRENT_PACKAGES_DIR}")
+        string(REPLACE " " "\ " _vcpkg_installed "${CURRENT_INSTALLED_DIR}")
+    endif()
+
+    set(make_opts )
+    set(install_opts )
+    if (CMAKE_HOST_WIN32)
+        set(path_global "$ENV{PATH}")
+        vcpkg_add_to_path(PREPEND "${SCRIPTS}/buildsystems/make_wrapper")
+        if(NOT DEFINED Z_VCPKG_MAKE)
+            vcpkg_acquire_msys(MSYS_ROOT)
+            find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED)
+        endif()
+        set(make_command "${Z_VCPKG_MAKE}")
+        set(make_opts ${arg_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} --trace -f ${arg_MAKEFILE} ${arg_BUILD_TARGET})
+        set(no_parallel_make_opts ${arg_MAKE_OPTIONS} -j 1 --trace -f ${arg_MAKEFILE} ${arg_BUILD_TARGET})
+
+        string(REPLACE " " "\\\ " _vcpkg_package_prefix ${CURRENT_PACKAGES_DIR})
+        string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _vcpkg_package_prefix "${_vcpkg_package_prefix}")
+        set(install_opts -j ${VCPKG_CONCURRENCY} --trace -f ${arg_MAKEFILE} ${arg_INSTALL_TARGET} DESTDIR=${_vcpkg_package_prefix})
+        #TODO: optimize for install-data (release) and install-exec (release/debug)
+    else()
+        if(VCPKG_HOST_IS_OPENBSD)
+            find_program(Z_VCPKG_MAKE gmake REQUIRED)
+        else()
+            find_program(Z_VCPKG_MAKE make REQUIRED)
+        endif()
+        set(make_command "${Z_VCPKG_MAKE}")
+        set(make_opts ${arg_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f ${arg_MAKEFILE} ${arg_BUILD_TARGET})
+        set(no_parallel_make_opts ${arg_MAKE_OPTIONS} V=1 -j 1 -f ${arg_MAKEFILE} ${arg_BUILD_TARGET})
+        set(install_opts -j ${VCPKG_CONCURRENCY} -f ${arg_MAKEFILE} ${arg_INSTALL_TARGET} DESTDIR=${CURRENT_PACKAGES_DIR})
+    endif()
+
+    # Since includes are buildtype independent those are setup by vcpkg_make_configure
+    _vcpkg_backup_env_variables(LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH)
+
+    foreach(buildtype IN ITEMS debug release)
+        if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL buildtype)
+            if(buildtype STREQUAL "debug")
+                # Skip debug generate
+                if (_VCPKG_NO_DEBUG)
+                    continue()
+                endif()
+                set(short_buildtype "-dbg")
+                set(cmake_buildtype "DEBUG")
+                set(path_suffix "/debug")
+            else()
+                # In NO_DEBUG mode, we only use ${TARGET_TRIPLET} directory.
+                if (_VCPKG_NO_DEBUG)
+                    set(short_buildtype "")
+                else()
+                    set(short_buildtype "-rel")
+                endif()
+                set(cmake_buildtype "RELEASE")
+                set(path_suffix "")
+            endif()
+
+            set(working_directory "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}${arg_SUBPATH}")
+            message(STATUS "Building ${TARGET_TRIPLET}${short_buildtype}")
+
+            _vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${cmake_buildtype})
+
+            if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+                set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_STATIC_LINKER_FLAGS_${cmake_buildtype}}")
+            else() # dynamic
+                set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_SHARED_LINKER_FLAGS_${cmake_buildtype}}")
+            endif()
+            if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_C_COMPILER MATCHES "cl.exe")
+                set(LDFLAGS_${cmake_buildtype} "-L${_vcpkg_installed}${path_suffix}/lib -L${_vcpkg_installed}${path_suffix}/lib/manual-link")
+                set(LINK_ENV_${cmake_buildtype} "$ENV{_LINK_} ${LINKER_FLAGS_${cmake_buildtype}}")
+            else()
+                set(LDFLAGS_${cmake_buildtype} "-L${_vcpkg_installed}${path_suffix}/lib -L${_vcpkg_installed}${path_suffix}/lib/manual-link ${LINKER_FLAGS_${cmake_buildtype}}")
+            endif()
+
+            # Setup environment
+            set(ENV{CPPFLAGS} "${CPPFLAGS_${cmake_buildtype}}")
+            set(ENV{CFLAGS} "${CFLAGS_${cmake_buildtype}}")
+            set(ENV{CXXFLAGS} "${CXXFLAGS_${cmake_buildtype}}")
+            set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${cmake_buildtype}}")
+            set(ENV{LDFLAGS} "${LDFLAGS_${cmake_buildtype}}")
+            set(ENV{LIB} "${_vcpkg_installed}${path_suffix}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_vcpkg_installed}${path_suffix}/lib/manual-link/${LIB_PATHLIKE_CONCAT}")
+            set(ENV{LIBPATH} "${_vcpkg_installed}${path_suffix}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_vcpkg_installed}${path_suffix}/lib/manual-link/${LIBPATH_PATHLIKE_CONCAT}")
+            set(ENV{LIBRARY_PATH} "${_vcpkg_installed}${path_suffix}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_vcpkg_installed}${path_suffix}/lib/manual-link/${LIBRARY_PATH_PATHLIKE_CONCAT}")
+            #set(ENV{LD_LIBRARY_PATH} "${_vcpkg_installed}${path_suffix_${buildtype}}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_vcpkg_installed}${path_suffix_${buildtype}}/lib/manual-link/${LD_LIBRARY_PATH_PATHLIKE_CONCAT}")
+
+            if(LINK_ENV_${_VAR_SUFFIX})
+                set(config_link_backup "$ENV{_LINK_}")
+                set(ENV{_LINK_} "${LINK_ENV_${_VAR_SUFFIX}}")
+            endif()
+
+            if(arg_ADD_BIN_TO_PATH)
+                set(env_backup_path "$ENV{PATH}")
+                vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}${path_suffix}/bin")
+            endif()
+
+            if(MAKE_BASH)
+                set(make_cmd_line "${make_command} ${make_opts}")
+                set(no_parallel_make_cmd_line "${make_command} ${no_parallel_make_opts}")
+            else()
+                set(make_cmd_line ${make_command} ${make_opts})
+                set(no_parallel_make_cmd_line ${make_command} ${no_parallel_make_opts})
+            endif()
+
+            if (arg_DISABLE_PARALLEL)
+                vcpkg_execute_build_process(
+                        COMMAND "${MAKE_BASH}" ${no_parallel_make_cmd_line}
+                        WORKING_DIRECTORY "${working_directory}"
+                        LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}${short_buildtype}"
+                )
+            else()
+                vcpkg_execute_build_process(
+                        COMMAND "${MAKE_BASH}" ${make_cmd_line}
+                        NO_PARALLEL_COMMAND "${MAKE_BASH}" ${no_parallel_make_cmd_line}
+                        WORKING_DIRECTORY "${working_directory}"
+                        LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}${short_buildtype}"
+                )
+            endif()
+
+            file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-${TARGET_TRIPLET}${short_buildtype}-out.log" logdata) 
+            if(logdata MATCHES "Warning: linker path does not have real file for library")
+                message(FATAL_ERROR "libtool could not find a file being linked against!")
+            endif()
+
+            if (arg_ENABLE_INSTALL)
+                message(STATUS "Installing ${TARGET_TRIPLET}${short_buildtype}")
+                if(MAKE_BASH)
+                    set(make_cmd_line "${make_command} ${install_opts}")
+                else()
+                    set(make_cmd_line ${make_command} ${install_opts})
+                endif()
+                vcpkg_execute_build_process(
+                    COMMAND "${MAKE_BASH}" ${make_cmd_line}
+                    WORKING_DIRECTORY "${working_directory}"
+                    LOGNAME "install-${TARGET_TRIPLET}${short_buildtype}"
+                )
+            endif()
+
+            if(config_link_backup)
+                set(ENV{_LINK_} "${config_link_backup}")
+                unset(config_link_backup)
+            endif()
+
+            if(arg_ADD_BIN_TO_PATH)
+                set(ENV{PATH} "${env_backup_path}")
+            endif()
+        endif()
+    endforeach()
+
+    if (arg_ENABLE_INSTALL)
+        string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_INSTALL_PREFIX "${CURRENT_INSTALLED_DIR}")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}_tmp")
+        file(RENAME "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}_tmp")
+        file(RENAME "${CURRENT_PACKAGES_DIR}_tmp${_VCPKG_INSTALL_PREFIX}" "${CURRENT_PACKAGES_DIR}")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}_tmp")
+    endif()
+
+    # Remove libtool files since they contain absolute paths and are not necessary. 
+    file(GLOB_RECURSE libtool_files "${CURRENT_PACKAGES_DIR}/**/*.la")
+    if(libtool_files)
+        file(REMOVE ${libtool_files})
+    endif()
+
+    if (CMAKE_HOST_WIN32)
+        set(ENV{PATH} "${path_global}")
+    endif()
+
+    _vcpkg_restore_env_variables(LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH)
+endfunction()