mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 19:42:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Reduce verbosity when building ports. Reduce cleaning requirements for packages\ directory.

Browse Source
This commit is contained in:
Robert Schumacher 2018-06-26 21:48:29 -07:00
parent a2b9325948
commit b93fb28e7c
9 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/cmake/vcpkg_apply_patches.cmake
View File

@ -51,7 +51,6 @@ function(vcpkg_apply_patches)
message(STATUS "Applying patch failed. This is expected if this patch was previously applied.") message(STATUS "Applying patch failed. This is expected if this patch was previously applied.")
endif() endif()
message(STATUS "Applying patch ${PATCH} done")
math(EXPR PATCHNUM "${PATCHNUM}+1") math(EXPR PATCHNUM "${PATCHNUM}+1")
endforeach() endforeach()
endfunction() endfunction()

3
scripts/cmake/vcpkg_build_cmake.cmake
View File

@ -74,7 +74,7 @@ function(vcpkg_build_cmake)
set(CONFIG "Release") set(CONFIG "Release")
endif() endif()
message(STATUS "Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE}") message(STATUS "Building ${TARGET_TRIPLET}-${SHORT_BUILDTYPE}")
set(LOGPREFIX "${CURRENT_BUILDTREES_DIR}/${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}-${SHORT_BUILDTYPE}") set(LOGPREFIX "${CURRENT_BUILDTREES_DIR}/${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}-${SHORT_BUILDTYPE}")
set(LOGS) set(LOGS)
@ -174,7 +174,6 @@ function(vcpkg_build_cmake)
${STRINGIFIED_LOGS}) ${STRINGIFIED_LOGS})
endif() endif()
endif() endif()
message(STATUS "Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} done")
if(_bc_ADD_BIN_TO_PATH) if(_bc_ADD_BIN_TO_PATH)
set(ENV{PATH} "${_BACKUP_ENV_PATH}") set(ENV{PATH} "${_BACKUP_ENV_PATH}")
endif() endif()

1
scripts/cmake/vcpkg_build_qmake.cmake
View File

@ -33,7 +33,6 @@ function(vcpkg_build_qmake)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${LOG_SUFFIX} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${LOG_SUFFIX}
LOGNAME package-${LOG_PREFIX}-${TARGET_TRIPLET}-${LOG_SUFFIX} LOGNAME package-${LOG_PREFIX}-${TARGET_TRIPLET}-${LOG_SUFFIX}
) )
message(STATUS "Package ${LOG_PREFIX}-${TARGET_TRIPLET}-${LOG_SUFFIX} done")
endfunction() endfunction()
# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings

6
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -122,6 +122,9 @@ function(vcpkg_configure_cmake)
if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) if(DEFINED VCPKG_CMAKE_SYSTEM_NAME)
list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}")
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
endif()
endif() endif()
if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") list(APPEND _csc_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}")
@ -239,7 +242,6 @@ function(vcpkg_configure_cmake)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure
LOGNAME config-${TARGET_TRIPLET} LOGNAME config-${TARGET_TRIPLET}
) )
message(STATUS "Configuring ${TARGET_TRIPLET} done")
else() else()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
@ -249,7 +251,6 @@ function(vcpkg_configure_cmake)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
LOGNAME config-${TARGET_TRIPLET}-dbg LOGNAME config-${TARGET_TRIPLET}-dbg
) )
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
endif() endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
@ -260,7 +261,6 @@ function(vcpkg_configure_cmake)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
LOGNAME config-${TARGET_TRIPLET}-rel LOGNAME config-${TARGET_TRIPLET}-rel
) )
message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
endif() endif()
endif() endif()

10
scripts/cmake/vcpkg_download_distfile.cmake
View File

@ -81,9 +81,8 @@ function(vcpkg_download_distfile VAR)
return() return()
endif() endif()
message(STATUS "Testing integrity of ${FILE_KIND}...")
file(SHA512 ${FILE_PATH} FILE_HASH) file(SHA512 ${FILE_PATH} FILE_HASH)
if(NOT "${FILE_HASH}" STREQUAL "${vcpkg_download_distfile_SHA512}") if(NOT FILE_HASH STREQUAL vcpkg_download_distfile_SHA512)
message(FATAL_ERROR message(FATAL_ERROR
"\nFile does not have expected hash:\n" "\nFile does not have expected hash:\n"
" File path: [ ${FILE_PATH} ]\n" " File path: [ ${FILE_PATH} ]\n"
@ -91,10 +90,9 @@ function(vcpkg_download_distfile VAR)
" Actual hash: [ ${FILE_HASH} ]\n" " Actual hash: [ ${FILE_HASH} ]\n"
"${CUSTOM_ERROR_ADVICE}\n") "${CUSTOM_ERROR_ADVICE}\n")
endif() endif()
message(STATUS "Testing integrity of ${FILE_KIND}... OK")
endfunction() endfunction()
if(EXISTS ${downloaded_file_path}) if(EXISTS "${downloaded_file_path}")
message(STATUS "Using cached ${downloaded_file_path}") message(STATUS "Using cached ${downloaded_file_path}")
test_hash("${downloaded_file_path}" "cached file" "Please delete the file and retry if this file should be downloaded again.") test_hash("${downloaded_file_path}" "cached file" "Please delete the file and retry if this file should be downloaded again.")
else() else()
@ -104,7 +102,7 @@ function(vcpkg_download_distfile VAR)
# Tries to download the file. # Tries to download the file.
list(GET vcpkg_download_distfile_URLS 0 SAMPLE_URL) list(GET vcpkg_download_distfile_URLS 0 SAMPLE_URL)
if(${_VCPKG_DOWNLOAD_TOOL} MATCHES "ARIA2" AND NOT ${SAMPLE_URL} MATCHES "aria2") if(_VCPKG_DOWNLOAD_TOOL STREQUAL "ARIA2" AND NOT SAMPLE_URL MATCHES "aria2")
vcpkg_find_acquire_program("ARIA2") vcpkg_find_acquire_program("ARIA2")
message(STATUS "Downloading ${vcpkg_download_distfile_FILENAME}...") message(STATUS "Downloading ${vcpkg_download_distfile_FILENAME}...")
execute_process( execute_process(
@ -127,7 +125,6 @@ function(vcpkg_download_distfile VAR)
) )
set(download_success 0) set(download_success 0)
else() else()
message(STATUS "Downloading ${vcpkg_download_distfile_FILENAME}... OK")
file(REMOVE file(REMOVE
${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-out.log ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-out.log
${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-err.log ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-err.log
@ -144,7 +141,6 @@ function(vcpkg_download_distfile VAR)
message(STATUS "Downloading ${url}... Failed. Status: ${download_status}") message(STATUS "Downloading ${url}... Failed. Status: ${download_status}")
set(download_success 0) set(download_success 0)
else() else()
message(STATUS "Downloading ${url}... OK")
set(download_success 1) set(download_success 1)
break() break()
endif() endif()

1
scripts/cmake/vcpkg_extract_source_archive.cmake
View File

@ -53,7 +53,6 @@ function(vcpkg_extract_source_archive_ex)
) )
file(WRITE ${WORKING_DIRECTORY}/${ARCHIVE_FILENAME}.extracted) file(WRITE ${WORKING_DIRECTORY}/${ARCHIVE_FILENAME}.extracted)
endif() endif()
message(STATUS "Extracting done")
endfunction() endfunction()
function(vcpkg_extract_source_archive ARCHIVE) function(vcpkg_extract_source_archive ARCHIVE)

3
scripts/cmake/vcpkg_from_github.cmake
View File

@ -141,7 +141,7 @@ function(vcpkg_from_github)
endif() endif()
set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE)
message(STATUS "Using source at ${SOURCE_PATH}")
return() return()
endif() endif()
@ -205,4 +205,5 @@ function(vcpkg_from_github)
PATCHES ${_vdud_PATCHES} PATCHES ${_vdud_PATCHES}
) )
set(${_vdud_OUT_SOURCE_PATH} "${TEMP_SOURCE_PATH}" PARENT_SCOPE) set(${_vdud_OUT_SOURCE_PATH} "${TEMP_SOURCE_PATH}" PARENT_SCOPE)
message(STATUS "Using source at ${TEMP_SOURCE_PATH}")
endfunction() endfunction()

2
scripts/cmake/vcpkg_install_meson.cmake
View File

@ -10,7 +10,6 @@ function(vcpkg_install_meson)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
LOGNAME package-${TARGET_TRIPLET}-rel LOGNAME package-${TARGET_TRIPLET}-rel
) )
message(STATUS "Package ${TARGET_TRIPLET}-rel done")
message(STATUS "Package ${TARGET_TRIPLET}-dbg") message(STATUS "Package ${TARGET_TRIPLET}-dbg")
vcpkg_execute_required_process( vcpkg_execute_required_process(
@ -18,6 +17,5 @@ function(vcpkg_install_meson)
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
LOGNAME package-${TARGET_TRIPLET}-dbg LOGNAME package-${TARGET_TRIPLET}-dbg
) )
message(STATUS "Package ${TARGET_TRIPLET}-dbg done")
endfunction() endfunction()

19
scripts/ports.cmake
View File

@ -37,7 +37,7 @@ if(CMD MATCHES "^BUILD$")
message(FATAL_ERROR "Unsupported target triplet. Triplet file does not exist: ${CMAKE_TRIPLET_FILE}") message(FATAL_ERROR "Unsupported target triplet. Triplet file does not exist: ${CMAKE_TRIPLET_FILE}")
endif() endif()
if(NOT DEFINED CURRENT_PORT_DIR) if(NOT DEFINED CURRENT_PORT_DIR)
message(FATAL_ERROR "CURRENT_PORT_DIR was not defined") message(FATAL_ERROR "CURRENT_PORT_DIR was not defined")
endif() endif()
set(TO_CMAKE_PATH "${CURRENT_PORT_DIR}" CURRENT_PORT_DIR) set(TO_CMAKE_PATH "${CURRENT_PORT_DIR}" CURRENT_PORT_DIR)
@ -51,19 +51,18 @@ if(CMD MATCHES "^BUILD$")
message(FATAL_ERROR "Port is missing control file: ${CURRENT_PORT_DIR}/CONTROL") message(FATAL_ERROR "Port is missing control file: ${CURRENT_PORT_DIR}/CONTROL")
endif() endif()
message(STATUS "CURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}")
message(STATUS "DOWNLOADS=${DOWNLOADS}")
message(STATUS "CURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}")
message(STATUS "CURRENT_BUILDTREES_DIR=${CURRENT_BUILDTREES_DIR}")
message(STATUS "CURRENT_PORT_DIR=${CURRENT_PORT_DIR}")
unset(PACKAGES_DIR) unset(PACKAGES_DIR)
unset(BUILDTREES_DIR) unset(BUILDTREES_DIR)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR})
if(EXISTS ${CURRENT_PACKAGES_DIR}) if(EXISTS ${CURRENT_PACKAGES_DIR})
message(FATAL_ERROR "Unable to remove directory: ${CURRENT_PACKAGES_DIR}\n Files are likely in use.") file(GLOB FILES_IN_CURRENT_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}/*")
if(FILES_IN_CURRENT_PACKAGES_DIR)
file(REMOVE_RECURSE ${FILES_IN_CURRENT_PACKAGES_DIR})
file(GLOB FILES_IN_CURRENT_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}/*")
if(FILES_IN_CURRENT_PACKAGES_DIR)
message(FATAL_ERROR "Unable to empty directory: ${CURRENT_PACKAGES_DIR}\n Files are likely in use.")
endif()
endif()
endif() endif()
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR}) file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR})