[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2605-g718ea14
Stephen Kelly
steveire at gmail.com
Wed Apr 30 03:18:05 EDT 2014
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, next has been updated
via 718ea14557ec6a12256bb4f0e9061e52e3380810 (commit)
via 0f1d42baa2df602525c5c4a5d8512ad676e6ed5d (commit)
from 29ede8a5f2c73a0afb55487ed38bedadcb8a1951 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=718ea14557ec6a12256bb4f0e9061e52e3380810
commit 718ea14557ec6a12256bb4f0e9061e52e3380810
Merge: 29ede8a 0f1d42b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 30 03:18:04 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 30 03:18:04 2014 -0400
Merge topic 'file-generate-if-different' into next
0f1d42ba Clean up a bit.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f1d42baa2df602525c5c4a5d8512ad676e6ed5d
commit 0f1d42baa2df602525c5c4a5d8512ad676e6ed5d
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 29 16:20:32 2014 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Apr 29 17:03:26 2014 +0200
Clean up a bit.
Don't guard this behavior with a policy because it is too noisy.
Use cmGeneratedFileStream to atomically create the file.
diff --git a/Help/policy/CMP0053.rst b/Help/policy/CMP0053.rst
deleted file mode 100644
index cd7fa54..0000000
--- a/Help/policy/CMP0053.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-CMP0053
--------
-
-Always write the output of file(GENERATE).
-
-CMake 3.0 and lower always writes the output file specified in a
-:command:`file(GENERATE)` command, even if the content is unchanged.
-
-The OLD behavior for this policy is for the :command:`file(GENERATE)`
-command to always write the to the output file. The NEW behavior for
-this policy is to write the output file only if the content to be written
-is different.
-
-This policy was introduced in CMake version 3.1.
-CMake version |release| warns when the policy is not set and uses
-``OLD`` behavior. Use the :command:`cmake_policy` command to set it
-to ``OLD`` or ``NEW`` explicitly.
diff --git a/Help/release/dev/file-GENERATE-CMP0053.rst b/Help/release/dev/file-GENERATE-CMP0053.rst
deleted file mode 100644
index 991a0f5..0000000
--- a/Help/release/dev/file-GENERATE-CMP0053.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-
-file-GENERATE-CMP0053
----------------------
-
-* The :command:`file(GENERATE)` command changed behavior to write the
- output file only when content is changed. Policy :policy:`CMP0053` was
- introduced to control the behavior.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 92fe3c6..5bfb664 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -3265,8 +3265,7 @@ cmFileCommand::HandleUploadCommand(std::vector<std::string> const& args)
void cmFileCommand::AddEvaluationFile(const std::string &inputName,
const std::string &outputExpr,
const std::string &condition,
- bool inputIsContent,
- bool writeAlways
+ bool inputIsContent
)
{
cmListFileBacktrace lfbt;
@@ -3285,8 +3284,7 @@ void cmFileCommand::AddEvaluationFile(const std::string &inputName,
outputCge,
this->Makefile,
conditionCge,
- inputIsContent,
- writeAlways);
+ inputIsContent);
}
//----------------------------------------------------------------------------
@@ -3303,23 +3301,6 @@ bool cmFileCommand::HandleGenerateCommand(
this->SetError("Incorrect arguments to GENERATE subcommand.");
return false;
}
- bool writeAlways = false;
-
- switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0053))
- {
- case cmPolicies::WARN:
- this->Makefile->IssueMessage(cmake::AUTHOR_WARNING,
- this->Makefile->GetPolicies()->
- GetPolicyWarning(cmPolicies::CMP0053));
- case cmPolicies::OLD:
- writeAlways = true;
- break;
- case cmPolicies::NEW:
- case cmPolicies::REQUIRED_ALWAYS:
- case cmPolicies::REQUIRED_IF_USED:
- break;
- }
-
std::string condition;
if (args.size() > 5)
{
@@ -3350,8 +3331,7 @@ bool cmFileCommand::HandleGenerateCommand(
}
std::string input = args[4];
- this->AddEvaluationFile(input, output, condition,
- inputIsContent, writeAlways);
+ this->AddEvaluationFile(input, output, condition, inputIsContent);
return true;
}
diff --git a/Source/cmFileCommand.h b/Source/cmFileCommand.h
index 12fa699..8d66fdf 100644
--- a/Source/cmFileCommand.h
+++ b/Source/cmFileCommand.h
@@ -80,8 +80,7 @@ private:
void AddEvaluationFile(const std::string &inputName,
const std::string &outputExpr,
const std::string &condition,
- bool inputIsContent,
- bool writeAlways);
+ bool inputIsContent);
};
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index 61c4ded..01d31d3 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -13,6 +13,7 @@
#include "cmGeneratorExpressionEvaluationFile.h"
#include "cmMakefile.h"
+#include "cmGeneratedFileStream.h"
#include <cmsys/FStream.hxx>
#include <assert.h>
@@ -23,14 +24,12 @@ cmGeneratorExpressionEvaluationFile::cmGeneratorExpressionEvaluationFile(
cmsys::auto_ptr<cmCompiledGeneratorExpression> outputFileExpr,
cmMakefile *makefile,
cmsys::auto_ptr<cmCompiledGeneratorExpression> condition,
- bool inputIsContent,
- bool writeAlways)
+ bool inputIsContent)
: Input(input),
OutputFileExpr(outputFileExpr),
Makefile(makefile),
Condition(condition),
- InputIsContent(inputIsContent),
- WriteAlways(writeAlways)
+ InputIsContent(inputIsContent)
{
}
@@ -81,28 +80,9 @@ void cmGeneratorExpressionEvaluationFile::Generate(const std::string& config,
this->Files.push_back(outputFileName);
outputFiles[outputFileName] = outputContent;
- std::string outputTempFileName = this->Makefile->GetCurrentOutputDirectory();
- outputTempFileName += "/CMakeFiles/evaluation_file.tmp";
-
- cmsys::ofstream fout(outputTempFileName.c_str());
-
- if(!fout)
- {
- cmOStringStream e;
- e << "Evaluation file \"" << outputFileName << "\" cannot be written to "
- "temporary location \"" << outputTempFileName << "\".";
- this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
- return;
- }
-
+ cmGeneratedFileStream fout(outputFileName.c_str());
+ fout.SetCopyIfDifferent(true);
fout << outputContent;
-
- fout.close();
-
- cmSystemTools::CopyAFile(outputTempFileName.c_str(),
- outputFileName.c_str(), this->WriteAlways);
-
- cmSystemTools::RemoveFile(outputTempFileName.c_str());
}
//----------------------------------------------------------------------------
diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h
index cffc18b..f939916 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.h
+++ b/Source/cmGeneratorExpressionEvaluationFile.h
@@ -25,8 +25,7 @@ public:
cmsys::auto_ptr<cmCompiledGeneratorExpression> outputFileExpr,
cmMakefile *makefile,
cmsys::auto_ptr<cmCompiledGeneratorExpression> condition,
- bool inputIsContent,
- bool writeAlways);
+ bool inputIsContent);
void Generate();
@@ -44,7 +43,6 @@ private:
const cmsys::auto_ptr<cmCompiledGeneratorExpression> Condition;
std::vector<std::string> Files;
const bool InputIsContent;
- const bool WriteAlways;
};
#endif
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 4314932..f09f7b3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2959,14 +2959,12 @@ void cmGlobalGenerator::AddEvaluationFile(const std::string &inputFile,
cmsys::auto_ptr<cmCompiledGeneratorExpression> outputExpr,
cmMakefile *makefile,
cmsys::auto_ptr<cmCompiledGeneratorExpression> condition,
- bool inputIsContent,
- bool writeAlways)
+ bool inputIsContent)
{
this->EvaluationFiles.push_back(
new cmGeneratorExpressionEvaluationFile(inputFile, outputExpr,
makefile, condition,
- inputIsContent,
- writeAlways));
+ inputIsContent));
}
//----------------------------------------------------------------------------
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 43a88e4..82fb1e5 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -309,8 +309,7 @@ public:
cmsys::auto_ptr<cmCompiledGeneratorExpression> outputName,
cmMakefile *makefile,
cmsys::auto_ptr<cmCompiledGeneratorExpression> condition,
- bool inputIsContent,
- bool writeAlways);
+ bool inputIsContent);
void ProcessEvaluationFiles();
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 5a7700c..309f280 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -354,11 +354,6 @@ cmPolicies::cmPolicies()
"Reject source and build dirs in installed "
"INTERFACE_INCLUDE_DIRECTORIES.",
3,1,0, cmPolicies::WARN);
-
- this->DefinePolicy(
- CMP0053, "CMP0053",
- "Always write the output of file(GENERATE).",
- 3,1,0, cmPolicies::WARN);
}
cmPolicies::~cmPolicies()
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index f735a67..60f35c2 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -107,7 +107,6 @@ public:
CMP0051, ///< List TARGET_OBJECTS in SOURCES target property
CMP0052, ///< Reject source and build dirs in installed
/// INTERFACE_INCLUDE_DIRECTORIES
- CMP0053, ///< Always write the output of file(GENERATE).
/** \brief Always the last entry.
*
diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
index b7c65b4..8e21c32 100644
--- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
@@ -20,9 +20,6 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Makefile")
# now set up the test:
if (NOT CMAKE_VERSION VERSION_LESS 2.8.12)
- if (POLICY CMP0053)
- cmake_policy(SET CMP0053 NEW)
- endif()
file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk"
CONTENT "CMAKE = \"$<TARGET_FILE:cmake>\"\n"
)
diff --git a/Tests/RunCMake/File_Generate/CMP0053-NEW.cmake b/Tests/RunCMake/File_Generate/CMP0053-NEW.cmake
deleted file mode 100644
index fc6e8ca..0000000
--- a/Tests/RunCMake/File_Generate/CMP0053-NEW.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-
-cmake_policy(SET CMP0053 NEW)
-
-file(GENERATE
- OUTPUT output_file.txt
- CONTENT "123"
-)
diff --git a/Tests/RunCMake/File_Generate/CMP0053-OLD-result.txt b/Tests/RunCMake/File_Generate/CMP0053-OLD-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/File_Generate/CMP0053-OLD-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/File_Generate/CMP0053-OLD-stderr.txt b/Tests/RunCMake/File_Generate/CMP0053-OLD-stderr.txt
deleted file mode 100644
index 10f3293..0000000
--- a/Tests/RunCMake/File_Generate/CMP0053-OLD-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-^$
diff --git a/Tests/RunCMake/File_Generate/CMP0053-OLD.cmake b/Tests/RunCMake/File_Generate/CMP0053-OLD.cmake
deleted file mode 100644
index 3b4acde..0000000
--- a/Tests/RunCMake/File_Generate/CMP0053-OLD.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-
-cmake_policy(SET CMP0053 OLD)
-
-file(GENERATE
- OUTPUT output_file.txt
- CONTENT "123"
-)
diff --git a/Tests/RunCMake/File_Generate/CMP0053-WARN-result.txt b/Tests/RunCMake/File_Generate/CMP0053-WARN-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/File_Generate/CMP0053-WARN-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/File_Generate/CMP0053-WARN-stderr.txt b/Tests/RunCMake/File_Generate/CMP0053-WARN-stderr.txt
deleted file mode 100644
index e895bad..0000000
--- a/Tests/RunCMake/File_Generate/CMP0053-WARN-stderr.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-CMake Warning \(dev\) at CMP0053-WARN.cmake:2 \(file\):
- Policy CMP0053 is not set: Always write the output of file\(GENERATE\). Run
- "cmake --help-policy CMP0053" for policy details. Use the cmake_policy
- command to set the policy and suppress this warning.
-Call Stack \(most recent call first\):
- CMakeLists.txt:3 \(include\)
-This warning is for project developers. Use -Wno-dev to suppress it.
diff --git a/Tests/RunCMake/File_Generate/CMakeLists.txt b/Tests/RunCMake/File_Generate/CMakeLists.txt
index 8f85fbf..12cd3c7 100644
--- a/Tests/RunCMake/File_Generate/CMakeLists.txt
+++ b/Tests/RunCMake/File_Generate/CMakeLists.txt
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 2.8.4)
project(${RunCMake_TEST} NONE)
-include(${RunCMake_TEST}.cmake NO_POLICY_SCOPE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index 1f70ef4..f23fa19 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -11,45 +11,27 @@ run_cmake(DebugEvaluate)
set(timeformat "%Y%j%H%M%S")
-macro(prepare_CMP0053_test policyStatus)
- file(REMOVE "${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build/output_file.txt")
- set(RunCMake_TEST_FILE "CMP0053-${policyStatus}")
- set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build")
- run_cmake(CMP0053-${policyStatus}-prepare)
- unset(RunCMake_TEST_FILE)
- unset(RunCMake_TEST_BINARY_DIR)
- file(TIMESTAMP "${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build/output_file.txt" timestamp_${policyStatus} ${timeformat})
- if(NOT timestamp_${policyStatus})
- message(SEND_ERROR "Could not get timestamp for \"${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build/output_file.txt\"")
- endif()
-endmacro()
-
-prepare_CMP0053_test(OLD)
-prepare_CMP0053_test(NEW)
-prepare_CMP0053_test(WARN)
+file(REMOVE "${RunCMake_BINARY_DIR}/WriteIfDifferent-build/output_file.txt")
+set(RunCMake_TEST_FILE "WriteIfDifferent")
+set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/WriteIfDifferent-build")
+run_cmake(WriteIfDifferent-prepare)
+unset(RunCMake_TEST_FILE)
+unset(RunCMake_TEST_BINARY_DIR)
+file(TIMESTAMP "${RunCMake_BINARY_DIR}/WriteIfDifferent-build/output_file.txt" timestamp ${timeformat})
+if(NOT timestamp)
+ message(SEND_ERROR "Could not get timestamp for \"${RunCMake_BINARY_DIR}/WriteIfDifferent-build/output_file.txt\"")
+endif()
execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1)
-macro(run_CMP0053_test policyStatus)
- run_cmake(CMP0053-${policyStatus})
- file(TIMESTAMP "${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build/output_file.txt" timestamp_${policyStatus}_after ${timeformat})
- if(NOT timestamp_${policyStatus}_after)
- message(SEND_ERROR "Could not get timestamp for \"${RunCMake_BINARY_DIR}/CMP0053-${policyStatus}-build/output_file.txt\"")
- endif()
-endmacro()
-
set(RunCMake_TEST_NO_CLEAN ON)
-run_CMP0053_test(OLD)
-run_CMP0053_test(NEW)
-run_CMP0053_test(WARN)
+run_cmake(WriteIfDifferent)
+file(TIMESTAMP "${RunCMake_BINARY_DIR}/WriteIfDifferent-build/output_file.txt" timestamp_after ${timeformat})
+if(NOT timestamp_after)
+ message(SEND_ERROR "Could not get timestamp for \"${RunCMake_BINARY_DIR}/WriteIfDifferent-build/output_file.txt\"")
+endif()
unset(RunCMake_TEST_NO_CLEAN)
-if (timestamp_OLD_after STREQUAL timestamp_OLD)
- message(SEND_ERROR "CMP0053 OLD behavior did not change output file.")
-endif()
-if (NOT timestamp_NEW_after STREQUAL timestamp_NEW)
- message(SEND_ERROR "CMP0053 NEW behavior changed output file. Before: ${timestamp_NEW}, After: ${timestamp_NEW_after}")
-endif()
-if (timestamp_WARN_after STREQUAL timestamp_WARN)
- message(SEND_ERROR "CMP0053 WARN behavior did not change output file.")
+if (NOT timestamp_after STREQUAL timestamp)
+ message(SEND_ERROR "WriteIfDifferent changed output file.")
endif()
diff --git a/Tests/RunCMake/File_Generate/CMP0053-NEW-result.txt b/Tests/RunCMake/File_Generate/WriteIfDifferent-result.txt
similarity index 100%
rename from Tests/RunCMake/File_Generate/CMP0053-NEW-result.txt
rename to Tests/RunCMake/File_Generate/WriteIfDifferent-result.txt
diff --git a/Tests/RunCMake/File_Generate/CMP0053-NEW-stderr.txt b/Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
similarity index 100%
rename from Tests/RunCMake/File_Generate/CMP0053-NEW-stderr.txt
rename to Tests/RunCMake/File_Generate/WriteIfDifferent-stderr.txt
diff --git a/Tests/RunCMake/File_Generate/CMP0053-WARN.cmake b/Tests/RunCMake/File_Generate/WriteIfDifferent.cmake
similarity index 100%
rename from Tests/RunCMake/File_Generate/CMP0053-WARN.cmake
rename to Tests/RunCMake/File_Generate/WriteIfDifferent.cmake
-----------------------------------------------------------------------
Summary of changes:
Help/policy/CMP0053.rst | 17 -------
Help/release/dev/file-GENERATE-CMP0053.rst | 7 ---
Source/cmFileCommand.cxx | 26 ++--------
Source/cmFileCommand.h | 3 +-
Source/cmGeneratorExpressionEvaluationFile.cxx | 30 ++---------
Source/cmGeneratorExpressionEvaluationFile.h | 4 +-
Source/cmGlobalGenerator.cxx | 6 +--
Source/cmGlobalGenerator.h | 3 +-
Source/cmPolicies.cxx | 5 --
Source/cmPolicies.h | 1 -
Tests/FindPackageModeMakefileTest/CMakeLists.txt | 3 --
Tests/RunCMake/File_Generate/CMP0053-NEW.cmake | 7 ---
.../RunCMake/File_Generate/CMP0053-OLD-result.txt | 1 -
.../RunCMake/File_Generate/CMP0053-OLD-stderr.txt | 1 -
Tests/RunCMake/File_Generate/CMP0053-OLD.cmake | 7 ---
.../RunCMake/File_Generate/CMP0053-WARN-result.txt | 1 -
.../RunCMake/File_Generate/CMP0053-WARN-stderr.txt | 7 ---
Tests/RunCMake/File_Generate/CMakeLists.txt | 2 +-
Tests/RunCMake/File_Generate/RunCMakeTest.cmake | 52 +++++++-------------
...-NEW-result.txt => WriteIfDifferent-result.txt} | 0
...-NEW-stderr.txt => WriteIfDifferent-stderr.txt} | 0
.../{CMP0053-WARN.cmake => WriteIfDifferent.cmake} | 0
22 files changed, 31 insertions(+), 152 deletions(-)
delete mode 100644 Help/policy/CMP0053.rst
delete mode 100644 Help/release/dev/file-GENERATE-CMP0053.rst
delete mode 100644 Tests/RunCMake/File_Generate/CMP0053-NEW.cmake
delete mode 100644 Tests/RunCMake/File_Generate/CMP0053-OLD-result.txt
delete mode 100644 Tests/RunCMake/File_Generate/CMP0053-OLD-stderr.txt
delete mode 100644 Tests/RunCMake/File_Generate/CMP0053-OLD.cmake
delete mode 100644 Tests/RunCMake/File_Generate/CMP0053-WARN-result.txt
delete mode 100644 Tests/RunCMake/File_Generate/CMP0053-WARN-stderr.txt
rename Tests/RunCMake/File_Generate/{CMP0053-NEW-result.txt => WriteIfDifferent-result.txt} (100%)
rename Tests/RunCMake/File_Generate/{CMP0053-NEW-stderr.txt => WriteIfDifferent-stderr.txt} (100%)
rename Tests/RunCMake/File_Generate/{CMP0053-WARN.cmake => WriteIfDifferent.cmake} (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list