Merge pull request #6503 from jamiesnape/tagged-versions

Switch to tagged versions of ccd, octomap, spdlog, and tinyobjloader
RobotLocomotion · Jul 5, 2017 · 12158e0 · 12158e0
2 parents cfe9109 + 2163ff8
commit 12158e0
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -96,8 +96,8 @@ bitbucket_archive(
 github_archive(
     name = "spdlog",
     repository = "gabime/spdlog",
-    commit = "43a4048b92ef5b7eff6dc637a621c7da3a41d194",
-    sha256 = "5166c036eacd625b86f725bfba356547e0bc497232649662c61cde7b1b423292",  # noqa
+    commit = "v0.13.0",
+    sha256 = "d798a6ca19165f0a18a43938859359269f5a07fd8e0eb83ab8674739c9e8f361",  # noqa
     build_file = "tools/spdlog.BUILD",
 )
 
@@ -164,16 +164,16 @@ github_archive(
 github_archive(
     name = "ccd",
     repository = "danfis/libccd",
-    commit = "16b9379fb6e8610566fe5e1396166daf7106f165",
-    sha256 = "fc583888c731d91c9ef287ca9ba443426ecfce75056d6c468b063b383bd8efa1",  # noqa
+    commit = "v2.0",
+    sha256 = "1b4997e361c79262cf1fe5e1a3bf0789c9447d60b8ae2c1f945693ad574f9471",  # noqa
     build_file = "tools/ccd.BUILD",
 )
 
 github_archive(
     name = "octomap",
     repository = "OctoMap/octomap",
-    commit = "6d7c31ae4df2c93cb8a954e44d442338b58d3558",
-    sha256 = "023ddd5b1e8ed1a70374c352cbd5b02bd5a26707f61a13cfb087766d5ca466e3",  # noqa
+    commit = "v1.7.2",
+    sha256 = "fe55efbb9ebf2b3388860e54b1c8a53d23e5a05de5956c043278013e01066c34",  # noqa
     build_file = "tools/octomap.BUILD",
 )
 
@@ -235,8 +235,8 @@ github_archive(
 github_archive(
     name = "tinyobjloader",
     repository = "syoyo/tinyobjloader",
-    commit = "9d9e987c4776d9df54e0ab65639e1befddb1d5ae",
-    sha256 = "e5c7ce01a153a3d9101f6c197e10145490ecd84ba7d0b6463708a60bc2845d4b",  # noqa
+    commit = "v1.0.6",
+    sha256 = "19ee82cd201761954dd833de551edb570e33b320d6027e0d91455faf7cd4c341",  # noqa
     build_file = "tools/tinyobjloader.BUILD",
 )
 

diff --git a/externals/spdlog b/externals/spdlog
diff --git a/externals/tinyobjloader b/externals/tinyobjloader
diff --git a/tools/ccd-create-cps.py b/tools/ccd-create-cps.py
@@ -2,21 +2,21 @@
 
 from cpsutils import read_defs
 
-defs = read_defs("set\(CCD_(VERSION_\w+)\s([0-9]+)")
+defs = read_defs("set\(CCD_(VERSION)\s\"([0-9\.]+)\"\)")
 
 content = """
 {
   "Cps-Version": "0.8.0",
   "Name": "ccd",
   "Description": "Library for collision detection between two convex shapes",
   "License": "BSD-3-Clause",
-  "Version": "%(VERSION_MAJOR)s.%(VERSION_MINOR)s",
-  "Default-Components": [ ":ccd" ],
+  "Version": "%(VERSION)s",
+  "Default-Components": [":ccd"],
   "Components": {
     "ccd": {
       "Type": "dylib",
       "Location": "@prefix@/lib/libccd.so",
-      "Includes": [ "@prefix@/include" ]
+      "Includes": ["@prefix@/include"]
     }
   }
 }

diff --git a/tools/octomap.BUILD b/tools/octomap.BUILD
@@ -18,11 +18,9 @@ filegroup(
 # Generates octomath library
 cc_library(
     name = "octomath",
-    srcs = [
-        "octomap/src/math/Pose6D.cpp",
-        "octomap/src/math/Quaternion.cpp",
-        "octomap/src/math/Vector3.cpp",
-    ],
+    srcs = glob([
+        "octomap/src/math/*.cpp",
+    ]),
     hdrs = glob([
         "octomap/include/octomap/math/*.h*",
     ]),
@@ -40,6 +38,7 @@ cc_library(
         "octomap/src/ColorOcTree.cpp",
         "octomap/src/CountingOcTree.cpp",
         "octomap/src/OcTree.cpp",
+        "octomap/src/OcTreeLUT.cpp",
         "octomap/src/OcTreeNode.cpp",
         "octomap/src/OcTreeStamped.cpp",
         "octomap/src/Pointcloud.cpp",
+3 −1		.gitignore
+10 −3		CMakeLists.txt
+127 −62		README.md
+5 −8		bench/Makefile
+0 −1		bench/boost-bench.cpp
+32 −0		bench/latency/Makefile
+13 −0		bench/latency/compare.sh
+37 −0		bench/latency/g3log-crush.cpp
+129 −0		bench/latency/g3log-latency.cpp
+128 −0		bench/latency/spdlog-latency.cpp
+35 −0		bench/latency/utils.h
+1 −1		bench/spdlog-bench-mt.cpp
+112 −0		bench/spdlog-null-async.cpp
+35 −0		bench/utils.h
+0 −56		bench/zf_log-bench-mt.cpp
+0 −28		bench/zf_log-bench.cpp
+3 −0		example/CMakeLists.txt
+8 −9		example/bench.cpp
+61 −27		example/example.cpp
+3 −2		example/example.vcxproj
+15 −0		example/jni/Android.mk
+2 −0		example/jni/Application.mk
+1 −0		example/jni/example.cpp
+47 −0		example/multisink.cpp
+7 −1		include/spdlog/async_logger.h
+7 −4		include/spdlog/common.h
+56 −45		include/spdlog/details/async_log_helper.h
+30 −5		include/spdlog/details/async_logger_impl.h
+4 −22		include/spdlog/details/file_helper.h
+111 −45		include/spdlog/details/logger_impl.h
+17 −4		include/spdlog/details/mpmc_bounded_q.h
+148 −24		include/spdlog/details/os.h
+126 −88		include/spdlog/details/pattern_formatter_impl.h
+20 −0		include/spdlog/details/registry.h
+106 −25		include/spdlog/details/spdlog_impl.h
+443 −60		include/spdlog/fmt/bundled/format.cc
+125 −39		include/spdlog/fmt/bundled/format.h
+1 −3		include/spdlog/fmt/bundled/ostream.cc
+1 −2		include/spdlog/fmt/bundled/ostream.h
+238 −0		include/spdlog/fmt/bundled/posix.cc
+443 −0		include/spdlog/fmt/bundled/posix.h
+0 −624		include/spdlog/fmt/bundled/printf.h
+58 −0		include/spdlog/fmt/bundled/time.h
+22 −11		include/spdlog/logger.h
+18 −35		include/spdlog/sinks/android_sink.h
+3 −3		include/spdlog/sinks/ansicolor_sink.h
+1 −1		include/spdlog/sinks/base_sink.h
+16 −17		include/spdlog/sinks/dist_sink.h
+42 −45		include/spdlog/sinks/file_sinks.h
+1 −1		include/spdlog/sinks/null_sink.h
+29 −0		include/spdlog/sinks/sink.h
+6 −4		include/spdlog/sinks/stdout_sinks.h
+3 −2		include/spdlog/sinks/syslog_sink.h
+116 −0		include/spdlog/sinks/wincolor_sink.h
+41 −20		include/spdlog/spdlog.h
+15 −1		include/spdlog/tweakme.h
+113 −0		tests/errors.cpp
+7 −6		tests/file_helper.cpp
+38 −19		tests/file_log.cpp
+0 −17		tests/format.cpp
+33 −2		tests/registry.cpp
+1 −0		tests/tests.vcxproj
+3 −0		tests/tests.vcxproj.filters
+6 −3		tests/utils.cpp