[Cmake-commits] CMake branch, master, updated. v3.14.0-363-g2efecea
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via 2efecea485a76df149ecc5d644cc2a1ec6c33cf3 (commit) from 32a569e8771311348306f15644bfa048ee183892 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2efecea485a76df149ecc5d644cc2a1ec6c33cf3 commit 2efecea485a76df149ecc5d644cc2a1ec6c33cf3 Author: Kitware Robot AuthorDate: Fri Mar 15 00:01:07 2019 -0400 Commit: Kitware Robot CommitDate: Fri Mar 15 00:01:07 2019 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index c9707e1..9340c35 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 14) -set(CMake_VERSION_PATCH 20190314) +set(CMake_VERSION_PATCH 20190315) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.0-362-g32a569e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 32a569e8771311348306f15644bfa048ee183892 (commit)
via e2e8f6b132967844a8bafc866d6cb5c90342af08 (commit)
from 7bc03aa6e24a7120497b639148268d52df3d691d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=32a569e8771311348306f15644bfa048ee183892
commit 32a569e8771311348306f15644bfa048ee183892
Merge: 7bc03aa e2e8f6b
Author: Brad King
AuthorDate: Thu Mar 14 15:12:49 2019 +
Commit: Kitware Robot
CommitDate: Thu Mar 14 11:13:33 2019 -0400
Merge topic 'refactor_cmfilecopier'
e2e8f6b132 cmFileCommand: Factor out cmFileCopier and cmFileInstaller
Acked-by: Kitware Robot
Merge-request: !2664
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2e8f6b132967844a8bafc866d6cb5c90342af08
commit e2e8f6b132967844a8bafc866d6cb5c90342af08
Author: Bryon Bean
AuthorDate: Wed Mar 13 11:51:12 2019 -0400
Commit: Brad King
CommitDate: Wed Mar 13 14:06:32 2019 -0400
cmFileCommand: Factor out cmFileCopier and cmFileInstaller
Split these classes out into their own sources.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 2db276d..696826f 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -224,6 +224,10 @@ set(SRCS
cmFileAPICodemodel.h
cmFileAPICMakeFiles.cxx
cmFileAPICMakeFiles.h
+ cmFileCopier.cxx
+ cmFileCopier.h
+ cmFileInstaller.cxx
+ cmFileInstaller.h
cmFileLock.cxx
cmFileLock.h
cmFileLockPool.cxx
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index a2018c3..d2bc851 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -3,7 +3,6 @@
#include "cmFileCommand.h"
#include "cm_kwiml.h"
-#include "cmsys/Directory.hxx"
#include "cmsys/FStream.hxx"
#include "cmsys/Glob.hxx"
#include "cmsys/RegularExpression.hxx"
@@ -16,20 +15,18 @@
#include
#include
#include
-#include
#include
#include
#include "cmAlgorithms.h"
#include "cmCommandArgumentsHelper.h"
#include "cmCryptoHash.h"
-#include "cmFSPermissions.h"
+#include "cmFileCopier.h"
+#include "cmFileInstaller.h"
#include "cmFileLockPool.h"
-#include "cmFileTimeComparison.h"
#include "cmGeneratorExpression.h"
#include "cmGlobalGenerator.h"
#include "cmHexFileConverter.h"
-#include "cmInstallType.h"
#include "cmListFileCache.h"
#include "cmMakefile.h"
#include "cmMessageType.h"
@@ -56,8 +53,6 @@
class cmSystemToolsFileTime;
-using namespace cmFSPermissions;
-
#if defined(_WIN32)
// libcurl doesn't support file:// urls for unicode filenames on Windows.
// Convert string from UTF-8 to ACP if this is a file:// URL.
@@ -1058,1085 +1053,12 @@ bool cmFileCommand::HandleDifferentCommand(
return true;
}
-// File installation helper class.
-struct cmFileCopier
-{
- cmFileCopier(cmFileCommand* command, const char* name = "COPY")
-: FileCommand(command)
-, Makefile(command->GetMakefile())
-, Name(name)
-, Always(false)
-, MatchlessFiles(true)
-, FilePermissions(0)
-, DirPermissions(0)
-, CurrentMatchRule(nullptr)
-, UseGivenPermissionsFile(false)
-, UseGivenPermissionsDir(false)
-, UseSourcePermissions(true)
-, Doing(DoingNone)
- {
- }
- virtual ~cmFileCopier() = default;
-
- bool Run(std::vector const& args);
-
-protected:
- cmFileCommand* FileCommand;
- cmMakefile* Makefile;
- const char* Name;
- bool Always;
- cmFileTimeComparison FileTimes;
-
- // Whether to install a file not matching any expression.
- bool MatchlessFiles;
-
- // Permissions for files and directories installed by this object.
- mode_t FilePermissions;
- mode_t DirPermissions;
-
- // Properties set by pattern and regex match rules.
- struct MatchProperties
- {
-bool Exclude = false;
-mode_t Permissions = 0;
- };
- struct MatchRule
- {
-cmsys::RegularExpression Regex;
-MatchProperties Properties;
-std::string RegexString;
-MatchRule(std::string const& regex)
- : Regex(regex)
- , RegexString(regex)
-{
-}
- };
- std::vector MatchRules;
-
- // Get the properties from rules matching this input file.
- MatchProperties CollectMatchProperties(const std::string& file)
- {
-// Match rules are case-insensitive on some platforms.
-#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
-const std::string file_to_match = cmSystemTools::LowerCase(file);
-#else
-const std::string& file_to_match = file;
-#endif
-
-// Collect properties from all matching rules.
-bool matched = false;
-MatchProperties result;
-for (MatchRule& mr : this->MatchRules)
[Cmake-commits] CMake annotated tag, v3.14.0, created. v3.14.0
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The annotated tag, v3.14.0 has been created at ec9bc9e5971fe9d76cb32a231259c830c4c40c6a (tag) tagging bf02d625325535f485512eba307cff54c08bb257 (commit) replaces v3.14.0-rc4 tagged by Brad King on Thu Mar 14 10:27:11 2019 -0400 - Log - CMake 3.14.0 -BEGIN PGP SIGNATURE- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAlyKZL8WHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhBYsD/4hx6WkbqiLdrtgy5ipSj9qwQvK ILUBlXei6QZqxgqdrONviVkYHGNJvqG3569UcjlP6gVddVwfhxXTiB5y4BDM4BUm AiHVq3/dILEE37B+ElsGowhg+g7GUFd9Uj86o6/1kvhzEIo1J1EvVE7/POC9hwep STvyPJqc+ejtf5Wi3AlC37GYHOdaMLA01nNCy1ud/JLBmPlNgcr9RcL2jHsSzlp6 c8EyxwXx7JC4252djNv6yHRpPrzy0ACt8pILwsolDMuFVZ0tw2qaWNqIN6+5nX4k qAmPtiuDE0t/4XBbo8NPu6clgCL7qNodlqGmskvP/nvBYnKJgogX3k7OEtNt3/am +2s4EgyKken77GydZzZ2rFP/0RFYuxpq2VHMQklbILzh9cR14mLYa5AXsuP7OQYS GqznXRGVuFrXAUUxB/0hbYa0+DXuFcISR5zU3WjUmB3UxApDIUEIwrZYfIuQFF/X wKnU2pXNZ/ZNSWwkdukxk8AdA2+ioz8xKzOhkkjlwYubjJG8gx9YpCBmSAmJdM+u tcHWReAfpz2janaBZJB6IwZdpiJm1XMMBCM+hvNi6PWUbeRj0q1blQaqFI1souF+ c7VSgnXf82ovMgqYy2gQlHZZi8AJ7cAznx8E4+lSrupxnPeO6AhDlF8jsvzm9Mb8 Rt5NTX44dURl9fZ6Kg== =zASU -END PGP SIGNATURE- Brad King (4): Merge branch 'wix-cmake-downgrade-fix' into release-3.14 VS: Revert "Use MSBuild matching toolset host architecture" Merge branch 'revert-vs-msbuild-arch' into release-3.14 CMake 3.14.0 Nils Gladitz (1): CMake: Fix WiX installer downgrades with versioned binaries --- hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc4-346-g46ad0f7
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, master has been updated via 46ad0f7e9dfa57ed4c1bd9f85f08ec5ec9d32f17 (commit) via bf02d625325535f485512eba307cff54c08bb257 (commit) from e1af2489fda9129e735007a069fae018c4ab3431 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46ad0f7e9dfa57ed4c1bd9f85f08ec5ec9d32f17 commit 46ad0f7e9dfa57ed4c1bd9f85f08ec5ec9d32f17 Merge: e1af248 bf02d62 Author: Brad King AuthorDate: Thu Mar 14 10:28:16 2019 -0400 Commit: Brad King CommitDate: Thu Mar 14 10:28:16 2019 -0400 Merge branch 'release-3.14' --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.14.0-rc4-5-gbf02d62
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, release has been updated via bf02d625325535f485512eba307cff54c08bb257 (commit) from 1b6a3047c6c2fc01afbcdba596bbbcaca8d7b43f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
