You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2018/07/26 19:49:36 UTC
[1/2] mesos git commit: Stripped hidden macOS files from
rapidjson-1.1.0.tar.gz.
Repository: mesos
Updated Branches:
refs/heads/master 9cfb59695 -> ddd00e54c
Stripped hidden macOS files from rapidjson-1.1.0.tar.gz.
Re-applied the instructions from 3rdparty/rapidjson.md; last time
I followed this instructions was on my macbook pro, and when I
looked at the extracted folder using finder it generated hidden
files.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ddd00e54
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ddd00e54
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ddd00e54
Branch: refs/heads/master
Commit: ddd00e54ca7086d40d33fba05a96b9afd77a466c
Parents: 454dd90
Author: Benjamin Mahler <bm...@apache.org>
Authored: Thu Jul 26 12:31:29 2018 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Jul 26 12:43:14 2018 -0700
----------------------------------------------------------------------
3rdparty/cmake/Versions.cmake | 2 +-
3rdparty/rapidjson-1.1.0.tar.gz | Bin 114867 -> 111904 bytes
2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ddd00e54/3rdparty/cmake/Versions.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/cmake/Versions.cmake b/3rdparty/cmake/Versions.cmake
index 849b72d..c65d7b3 100644
--- a/3rdparty/cmake/Versions.cmake
+++ b/3rdparty/cmake/Versions.cmake
@@ -32,7 +32,7 @@ set(PICOJSON_HASH "SHA256=056805CA2691798F5545935A14BB477F2E1D827C9FB8
set(PROTOBUF_VERSION "3.5.0")
set(PROTOBUF_HASH "SHA256=F046682F05C39605E1687DC37E2E0EEBCEB8298CA1B046D64EE00AE124924EBC")
set(RAPIDJSON_VERSION "1.1.0")
-set(RAPIDJSON_HASH "SHA256=CF60F30E3D760142D8D3F876714FC9712B17038270678878CFA222E6B62C0BF5")
+set(RAPIDJSON_HASH "SHA256=302DE01D5EB4F15A5A4D4A8B0213C79DC40510AA5F64A5D0B4C16DF43EC6CDF5")
set(LIBARCHIVE_VERSION "3.3.2")
set(LIBARCHIVE_HASH "SHA256=ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce")
set(BZIP2_VERSION "1.0.6")
http://git-wip-us.apache.org/repos/asf/mesos/blob/ddd00e54/3rdparty/rapidjson-1.1.0.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/rapidjson-1.1.0.tar.gz b/3rdparty/rapidjson-1.1.0.tar.gz
index 73d85d2..9ff34a2 100644
Binary files a/3rdparty/rapidjson-1.1.0.tar.gz and b/3rdparty/rapidjson-1.1.0.tar.gz differ
[2/2] mesos git commit: Fixed the rapidjson upgrade instructions.
Posted by bm...@apache.org.
Fixed the rapidjson upgrade instructions.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/454dd905
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/454dd905
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/454dd905
Branch: refs/heads/master
Commit: 454dd9056cf9aa3cfa382ed4c8b448b0ea27c482
Parents: 9cfb596
Author: Benjamin Mahler <bm...@apache.org>
Authored: Thu Jul 26 12:43:08 2018 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Thu Jul 26 12:43:14 2018 -0700
----------------------------------------------------------------------
3rdparty/rapidjson.md | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/454dd905/3rdparty/rapidjson.md
----------------------------------------------------------------------
diff --git a/3rdparty/rapidjson.md b/3rdparty/rapidjson.md
index ddf306c..cb4ad0c 100644
--- a/3rdparty/rapidjson.md
+++ b/3rdparty/rapidjson.md
@@ -22,11 +22,12 @@ $ curl --location https://github.com/Tencent/rapidjson/archive/v1.1.0.tar.gz -o
# Extract, strip everything but the license and include
# folder, and re-bundle.
-$ tar -zxvf rapidjson-1.1.0.tar.gz
-$ mkdir -p stripped-rapidjson/rapidjson-1.1.0
-$ mv rapidjson-1.1.0/license.txt stripped-rapidjson/rapidjson-1.1.0
-$ mv rapidjson-1.1.0/include stripped-rapidjson/rapidjson-1.1.0
-$ tar -zcvf rapidjson-1.1.0.tar.gz stripped-rapidjson/rapidjson-1.1.0
+$ mkdir tmp
+$ tar -zxvf rapidjson-1.1.0.tar.gz --directory=tmp
+$ mkdir rapidjson-1.1.0
+$ mv tmp/rapidjson-1.1.0/license.txt rapidjson-1.1.0
+$ mv tmp/rapidjson-1.1.0/include rapidjson-1.1.0
+$ tar -zcvf rapidjson-1.1.0.tar.gz rapidjson-1.1.0
# Place it into 3rdparty.
# Update 3rdparty/versions.am with the new version.