[Cmake-commits] CMake branch, next, updated. v3.7.2-2348-g2a1a1cd
Brad King
brad.king at kitware.com
Thu Jan 26 10:20:56 EST 2017
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 2a1a1cd66b63cac5cf2aff533bec4c35984a115c (commit)
via 46177cceae13afa80baa87e6d84c17ed45ecb298 (commit)
from e2dadb0802b1e329d6b1df771ce6bfbe84b08a4b (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=2a1a1cd66b63cac5cf2aff533bec4c35984a115c
commit 2a1a1cd66b63cac5cf2aff533bec4c35984a115c
Merge: e2dadb0 46177cc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:20:55 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 26 10:20:55 2017 -0500
Merge topic 'topic-reproducible-build' into next
46177cce Revert topic 'topic-reproducible-build'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46177cceae13afa80baa87e6d84c17ed45ecb298
commit 46177cceae13afa80baa87e6d84c17ed45ecb298
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 26 10:20:34 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 26 10:20:34 2017 -0500
Revert topic 'topic-reproducible-build'
diff --git a/Help/command/string.rst b/Help/command/string.rst
index 2c7847a..77538f6 100644
--- a/Help/command/string.rst
+++ b/Help/command/string.rst
@@ -329,12 +329,6 @@ If no explicit ``<format string>`` is given it will default to:
Write a string which can be used as an identifier in C.
-.. note::
-
- If the ``SOURCE_DATE_EPOCH`` environment variable is set,
- its value will be used instead of the current time.
- See https://reproducible-builds.org/specs/source-date-epoch/ for details.
-
UUID
""""
diff --git a/Help/release/dev/SOURCE_DATE_EPOCH.rst b/Help/release/dev/SOURCE_DATE_EPOCH.rst
deleted file mode 100644
index 576e1da..0000000
--- a/Help/release/dev/SOURCE_DATE_EPOCH.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCE_DATE_EPOCH
------------------
-
-* The :command:`string(TIMESTAMP)` will now honor the ``SOURCE_DATE_EPOCH``
- environment variable and use its value instead of the current time.
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 87677ec..4a97114 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -5,7 +5,6 @@
#include <cmConfigure.h>
#include <cstring>
#include <sstream>
-#include <stdlib.h>
#include "cmSystemTools.h"
@@ -13,16 +12,6 @@ std::string cmTimestamp::CurrentTime(const std::string& formatString,
bool utcFlag)
{
time_t currentTimeT = time(CM_NULLPTR);
- std::string source_date_epoch;
- cmSystemTools::GetEnv("SOURCE_DATE_EPOCH", source_date_epoch);
- if (!source_date_epoch.empty()) {
- std::istringstream iss(source_date_epoch);
- iss >> currentTimeT;
- if (iss.fail() || !iss.eof()) {
- cmSystemTools::Error("Error parsing SOURCE_DATE_EPOCH as int");
- exit(27);
- }
- }
if (currentTimeT == time_t(-1)) {
return std::string();
}
diff --git a/Tests/RunCMake/string/RunCMakeTest.cmake b/Tests/RunCMake/string/RunCMakeTest.cmake
index 38a77b0..8067d9d 100644
--- a/Tests/RunCMake/string/RunCMakeTest.cmake
+++ b/Tests/RunCMake/string/RunCMakeTest.cmake
@@ -6,11 +6,6 @@ run_cmake(AppendNoArgs)
run_cmake(Concat)
run_cmake(ConcatNoArgs)
-run_cmake(Timestamp)
-run_cmake(TimestampEmpty)
-run_cmake(TimestampInvalid)
-run_cmake(TimestampInvalid2)
-
run_cmake(Uuid)
run_cmake(UuidMissingNamespace)
run_cmake(UuidMissingNamespaceValue)
diff --git a/Tests/RunCMake/string/Timestamp-result.txt b/Tests/RunCMake/string/Timestamp-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/string/Timestamp-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/string/Timestamp-stderr.txt b/Tests/RunCMake/string/Timestamp-stderr.txt
deleted file mode 100644
index 10952b2..0000000
--- a/Tests/RunCMake/string/Timestamp-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-RESULT=2005-08-07 23:19:49
diff --git a/Tests/RunCMake/string/Timestamp.cmake b/Tests/RunCMake/string/Timestamp.cmake
deleted file mode 100644
index b698627..0000000
--- a/Tests/RunCMake/string/Timestamp.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(ENV{SOURCE_DATE_EPOCH} "1123456789")
-string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
-message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampEmpty-result.txt b/Tests/RunCMake/string/TimestampEmpty-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/string/TimestampEmpty-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/string/TimestampEmpty-stderr.txt b/Tests/RunCMake/string/TimestampEmpty-stderr.txt
deleted file mode 100644
index 35cbd3c..0000000
--- a/Tests/RunCMake/string/TimestampEmpty-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-RESULT=2
diff --git a/Tests/RunCMake/string/TimestampEmpty.cmake b/Tests/RunCMake/string/TimestampEmpty.cmake
deleted file mode 100644
index 21b770f..0000000
--- a/Tests/RunCMake/string/TimestampEmpty.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(ENV{SOURCE_DATE_EPOCH} "")
-string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
-message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampInvalid-result.txt b/Tests/RunCMake/string/TimestampInvalid-result.txt
deleted file mode 100644
index f64f5d8..0000000
--- a/Tests/RunCMake/string/TimestampInvalid-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-27
diff --git a/Tests/RunCMake/string/TimestampInvalid-stderr.txt b/Tests/RunCMake/string/TimestampInvalid-stderr.txt
deleted file mode 100644
index f7195c2..0000000
--- a/Tests/RunCMake/string/TimestampInvalid-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Error parsing SOURCE_DATE_EPOCH as int
diff --git a/Tests/RunCMake/string/TimestampInvalid.cmake b/Tests/RunCMake/string/TimestampInvalid.cmake
deleted file mode 100644
index ab36270..0000000
--- a/Tests/RunCMake/string/TimestampInvalid.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(ENV{SOURCE_DATE_EPOCH} "invalid-integer")
-string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
-message("RESULT=${RESULT}")
diff --git a/Tests/RunCMake/string/TimestampInvalid2-result.txt b/Tests/RunCMake/string/TimestampInvalid2-result.txt
deleted file mode 100644
index f64f5d8..0000000
--- a/Tests/RunCMake/string/TimestampInvalid2-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-27
diff --git a/Tests/RunCMake/string/TimestampInvalid2-stderr.txt b/Tests/RunCMake/string/TimestampInvalid2-stderr.txt
deleted file mode 100644
index f7195c2..0000000
--- a/Tests/RunCMake/string/TimestampInvalid2-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Error parsing SOURCE_DATE_EPOCH as int
diff --git a/Tests/RunCMake/string/TimestampInvalid2.cmake b/Tests/RunCMake/string/TimestampInvalid2.cmake
deleted file mode 100644
index 5cc61b8..0000000
--- a/Tests/RunCMake/string/TimestampInvalid2.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set(ENV{SOURCE_DATE_EPOCH} "123trailing-garbage")
-string(TIMESTAMP RESULT "%Y-%m-%d %H:%M:%S" UTC)
-message("RESULT=${RESULT}")
-----------------------------------------------------------------------
Summary of changes:
Help/command/string.rst | 6 ------
Help/release/dev/SOURCE_DATE_EPOCH.rst | 5 -----
Source/cmTimestamp.cxx | 11 -----------
Tests/RunCMake/string/RunCMakeTest.cmake | 5 -----
Tests/RunCMake/string/Timestamp-result.txt | 1 -
Tests/RunCMake/string/Timestamp-stderr.txt | 1 -
Tests/RunCMake/string/Timestamp.cmake | 3 ---
Tests/RunCMake/string/TimestampEmpty-result.txt | 1 -
Tests/RunCMake/string/TimestampEmpty-stderr.txt | 1 -
Tests/RunCMake/string/TimestampEmpty.cmake | 3 ---
Tests/RunCMake/string/TimestampInvalid-result.txt | 1 -
Tests/RunCMake/string/TimestampInvalid-stderr.txt | 1 -
Tests/RunCMake/string/TimestampInvalid.cmake | 3 ---
Tests/RunCMake/string/TimestampInvalid2-result.txt | 1 -
Tests/RunCMake/string/TimestampInvalid2-stderr.txt | 1 -
Tests/RunCMake/string/TimestampInvalid2.cmake | 3 ---
16 files changed, 47 deletions(-)
delete mode 100644 Help/release/dev/SOURCE_DATE_EPOCH.rst
delete mode 100644 Tests/RunCMake/string/Timestamp-result.txt
delete mode 100644 Tests/RunCMake/string/Timestamp-stderr.txt
delete mode 100644 Tests/RunCMake/string/Timestamp.cmake
delete mode 100644 Tests/RunCMake/string/TimestampEmpty-result.txt
delete mode 100644 Tests/RunCMake/string/TimestampEmpty-stderr.txt
delete mode 100644 Tests/RunCMake/string/TimestampEmpty.cmake
delete mode 100644 Tests/RunCMake/string/TimestampInvalid-result.txt
delete mode 100644 Tests/RunCMake/string/TimestampInvalid-stderr.txt
delete mode 100644 Tests/RunCMake/string/TimestampInvalid.cmake
delete mode 100644 Tests/RunCMake/string/TimestampInvalid2-result.txt
delete mode 100644 Tests/RunCMake/string/TimestampInvalid2-stderr.txt
delete mode 100644 Tests/RunCMake/string/TimestampInvalid2.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list