Build id links generation was introduced
in rpm 4.13.0.1 so files related to them
should be ignored as they are not relevant
for the tests.
Fixes#16710
* upstream-KWSys:
KWSys 2017-03-24 (7e9f7b7b)
Resolve conflicts in `.gitattributes` by integrating changes from both
sides. Keep the `our-c-style` attribute that KWSys uses, but drop their
definition of it in favor of ours (Git only allows custom attributes in
the top level anyway). Then add our own attribute line to unset the
`format.clang-format` attribute for KWSys sources since we do not want
to format third-party code ourselves.
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 7e9f7b7bdc8ac54006a40a775867022c4d678b06 (master).
Upstream Shortlog
-----------------
Brad King (3):
0af48083 Drop custom Git whitespace check attribute
6365886c Define a custom Git attribute to mark sources using our C style
d22c2743 clang-format.bash: Use Git attributes to mark files for formatting
Egor Pugin (3):
ce44c58a FStream: Export ReadBOM() from shared library
04e24b2b ConsoleBuf: Remove export macro from BasicConsoleBuf template
858d5edd Encoding: Export CommandLineArguments from shared library
The KWSys `.gitattributes` file now defines custom attributes.
Git does not support these in a subdirectory where we are about
to place the content, so comment them out during import.
This also ensures that the `our-c-style` attribute on KWSys
sources does not activate the `format.clang-format` attribute
on the third-party import branch.
Provide a helper function that import scripts can use when the
third-party project defines custom Git attributes in its top-level
`.gitattributes` file. These must be commented out because Git
does not support custom attributes in a subdirectory where we
where the third-party project is about to be merged.
Update our release scripts to fetch `refs/stage/master/head` from
the `gitlab.kitware.com` repository. This will allow us to prepare
releases from staged commits before merging them to `master` or
`release`.
41ec3528 IWYU: use pragma export
72ea66b1 Autogen: include what you use
2a827b82 cmCPackGenerator: Move macros to bottom of file
bcd08aa3 cmCTest: Move macros to bottom of file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !619
b5189fda Apple: Add test for bundle resource layout
c51c2cfa Apple: Fix Resources location for all generators
060be58c Xcode: Properly handle Bundle Resources with more than one hierarchy level
484ccb0c Xcode: Properly handle non-resource Bundle files on iOS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !613
d4a693a0 InstallRequiredSystemLibraries: Add support for VS 2017
5ed4e481 InstallRequiredSystemLibraries: Split MFC redist dir variable
dbdb880a InstallRequiredSystemLibraries: Split VS IDE and DLL versions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !616
Encountered on OS X 10.4 with old Xcode:
Expected stderr to match:
expect-err> ^$
Actual stderr:
actual-err> Hit xcodebuild bug : ... bad interpreter: Text file busy
VS 2017 (VS 15) places its redist DLLs in `Microsoft.VC150.*`
directories but still uses version number `140` in the DLL names. The
redist directories now have version numbers in their name, and the MSVC
and MFC runtime DLLs may be in directories with different versions.
Fill out our logic to handle this.
For now assume we are given the `MSVC_REDIST_DIR` value as a cache
entry. Unfortunately we cannot yet find the VS 2017 MSVC redist
directory automatically since there is no registry entry for the VS
installation. Later we will have to use `cmVSSetupHelper` for this.
Issue: #16735
a2aad448 InstallRequiredSystemLibraries: Drop version from variable names
16eb58d5 InstallRequiredSystemLibraries: Refactor to avoid macros
a259e8db InstallRequiredSystemLibraries: Use `MSVC_VERSION` instead of `MSVC##`
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !612
Brad King