mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 21:28:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg baseline][vtk-m] fix the sha512 (#14884)

Browse Source 
* [vtk-m] fix the sha512

* Bump version

* add FILE_DISAMBIGUATOR to vcpkg_from_gitlab

* actually use the file disambiguator

* regenerate docs

* [moos-core] Add DISABLE_PARALLEL_CONFIGURE

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
This commit is contained in:
nicole mazzuca 2020-12-03 13:24:26 -08:00 committed by GitHub
parent a2135fd97e
commit ef0c3036fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/maintainers/vcpkg_from_github.md
View File

@ -13,6 +13,7 @@ vcpkg_from_github(
[PATCHES <patch1.patch> <patch2.patch>...]
[GITHUB_HOST <https://github.com>]
[AUTHORIZATION_TOKEN <${SECRET_FROM_FILE}>]
[FILE_DISAMBIGUATOR <N>]
)
```

4
docs/maintainers/vcpkg_from_gitlab.md
View File

@ -12,6 +12,7 @@ vcpkg_from_gitlab(
[SHA512 <45d0d7f8cc350...>]
[HEAD_REF <master>]
[PATCHES <patch1.patch> <patch2.patch>...]
[FILE_DISAMBIGUATOR <N>]
)
```
@ -51,6 +52,9 @@ A list of patches to be applied to the extracted sources.
Relative paths are based on the port directory.
### FILE_DISAMBIGUATOR
A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name.
## Notes:
At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.

3
ports/moos-core/CONTROL
View File

@ -1,4 +1,5 @@
Source: moos-core
Version: 10.4.0-4
Version: 10.4.0
Port-Version: 5
Description: A very light weight, easy to use middleware.
Homepage: https://sites.google.com/site/moossoftware/

1
ports/moos-core/portfile.cmake
View File

@ -13,6 +13,7 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DCMAKE_ENABLE_EXPORT=OFF
)

1
ports/vtk-m/CONTROL
View File

@ -1,5 +1,6 @@
Source: vtk-m
Version: 1.5.0
Port-Version: 1
Homepage: https://gitlab.kitware.com/vtk/vtk-m/
Description: VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.
Supports: x64 & !uwp

3
ports/vtk-m/portfile.cmake
View File

@ -41,7 +41,8 @@ vcpkg_from_gitlab(GITLAB_URL "https://gitlab.kitware.com"
OUT_SOURCE_PATH SOURCE_PATH
REPO vtk/vtk-m
REF f2aa6ad5be1a97e3fb41ef4680ee2c76c3434ac0 # v1.5.0 Version is strongly locked to VTK 9.0. Upgrading will most likly brake the VTK build
SHA512 2f2a273f74d9a583df9e25a4792440d8d89652fa14b3153f2ea5afbd329b50970e7b9bd68e0ccd036baf5c1f3ad7a8302d95c01dbb30d9a46c045987eebf5370)
SHA512 35e8a2c0ad6cd3c1f02a71a50d781c89f93909ad27030b406fd69f4fea5c1862c48a6e541fd07562947322c3a69bdfdb54206ae51bb86ef7a710f9e9898e9638
FILE_DISAMBIGUATOR 1)
# For people only wanting vtk-m and not VTK
#REF 74ffad9bd0679d061bc87e544a728f1c3c926269 # v1.5.1
#SHA512 c9e1c18432b6c11ae086445255acf9477fe4c888122a2b2a9713dc63a40d2e4c2375742157526b5f0869f14c62a4ad66d81ee58d6cc75a1d53a1d615525a03c9)

1
scripts/cmake/vcpkg_from_github.cmake
View File

@ -14,6 +14,7 @@ vcpkg_from_github(
[PATCHES <patch1.patch> <patch2.patch>...]
[GITHUB_HOST <https://github.com>]
[AUTHORIZATION_TOKEN <${SECRET_FROM_FILE}>]
[FILE_DISAMBIGUATOR <N>]
)
```

14
scripts/cmake/vcpkg_from_gitlab.cmake
View File

@ -13,6 +13,7 @@ vcpkg_from_gitlab(
[SHA512 <45d0d7f8cc350...>]
[HEAD_REF <master>]
[PATCHES <patch1.patch> <patch2.patch>...]
[FILE_DISAMBIGUATOR <N>]
)
```
@ -52,6 +53,9 @@ A list of patches to be applied to the extracted sources.
Relative paths are based on the port directory.
### FILE_DISAMBIGUATOR
A token to uniquely identify the resulting filename if the SHA512 changes even though a git ref does not, to avoid stepping on the same file name.
## Notes:
At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.
@ -66,7 +70,7 @@ This exports the `VCPKG_HEAD_VERSION` variable during head builds.
include(vcpkg_execute_in_download_mode)
function(vcpkg_from_gitlab)
set(oneValueArgs OUT_SOURCE_PATH GITLAB_URL USER REPO REF SHA512 HEAD_REF)
set(oneValueArgs OUT_SOURCE_PATH GITLAB_URL USER REPO REF SHA512 HEAD_REF FILE_DISAMBIGUATOR)
set(multipleValuesArgs PATCHES)
# parse parameters such that semicolons in options arguments to COMMAND don't get erased
cmake_parse_arguments(PARSE_ARGV 0 _vdud "" "${oneValueArgs}" "${multipleValuesArgs}")
@ -119,11 +123,17 @@ function(vcpkg_from_gitlab)
endif()
string(REPLACE "/" "-" SANITIZED_REF "${_vdud_REF}")
set(downloaded_file_name "${ORG_NAME}-${REPO_NAME}-${SANITIZED_REF}")
if (_vdud_FILE_DISAMBIGUATOR)
set(downloaded_file_name "${downloaded_file_name}-${_vdud_FILE_DISAMBIGUATOR}")
endif()
set(downloaded_file_name "${downloaded_file_name}.tar.gz")
vcpkg_download_distfile(ARCHIVE
URLS "${GITLAB_LINK}/-/archive/${_vdud_REF}/${REPO_NAME}-${_vdud_REF}.tar.gz"
SHA512 "${_vdud_SHA512}"
FILENAME "${ORG_NAME}-${REPO_NAME}-${SANITIZED_REF}.tar.gz"
FILENAME "${downloaded_file_name}"
)
vcpkg_extract_source_archive_ex(