From c549d4156c5b3cecd440b80a29bf2fcb9e4586cd Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Wed, 5 Jul 2017 12:15:14 -0400 Subject: [PATCH 1/4] Use ccd tag v2.0 --- WORKSPACE | 4 ++-- tools/ccd-create-cps.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index ea4f8d078099..f82df43bfd60 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -164,8 +164,8 @@ 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", ) diff --git a/tools/ccd-create-cps.py b/tools/ccd-create-cps.py index 10465ce27313..a9ec638e7f15 100644 --- a/tools/ccd-create-cps.py +++ b/tools/ccd-create-cps.py @@ -2,7 +2,7 @@ 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 = """ { @@ -10,13 +10,13 @@ "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"] } } } From 95d7d507eec8dc77a4a06b3ea6aae5858c428865 Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Wed, 5 Jul 2017 12:15:14 -0400 Subject: [PATCH 2/4] Use octomap tag v1.7.2 --- WORKSPACE | 4 ++-- tools/octomap.BUILD | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index f82df43bfd60..884321280ab7 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -172,8 +172,8 @@ github_archive( github_archive( name = "octomap", repository = "OctoMap/octomap", - commit = "6d7c31ae4df2c93cb8a954e44d442338b58d3558", - sha256 = "023ddd5b1e8ed1a70374c352cbd5b02bd5a26707f61a13cfb087766d5ca466e3", # noqa + commit = "v1.7.2", + sha256 = "fe55efbb9ebf2b3388860e54b1c8a53d23e5a05de5956c043278013e01066c34", # noqa build_file = "tools/octomap.BUILD", ) diff --git a/tools/octomap.BUILD b/tools/octomap.BUILD index bca4dce1ef6e..fae61237abbd 100644 --- 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", From 4ba10ce4386d948bd06910e69159b3608306c3be Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Wed, 5 Jul 2017 12:15:14 -0400 Subject: [PATCH 3/4] Use spdlog tag v0.13.0 --- WORKSPACE | 4 ++-- externals/spdlog | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 884321280ab7..4a6ccd53ae3b 100644 --- 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", ) diff --git a/externals/spdlog b/externals/spdlog index 43a4048b92ef..f85a08622e20 160000 --- a/externals/spdlog +++ b/externals/spdlog @@ -1 +1 @@ -Subproject commit 43a4048b92ef5b7eff6dc637a621c7da3a41d194 +Subproject commit f85a08622e20b74bff34381cafcb8ef8167b29d0 From 2163ff872c091bfa3d239bcfc5eb66183adb0e0b Mon Sep 17 00:00:00 2001 From: Jamie Snape Date: Wed, 5 Jul 2017 12:15:14 -0400 Subject: [PATCH 4/4] Use tinyobjloader tag v1.0.6 --- WORKSPACE | 4 ++-- externals/tinyobjloader | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 4a6ccd53ae3b..4970570f8c10 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -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/tinyobjloader b/externals/tinyobjloader index 9d9e987c4776..e60d33385e2e 160000 --- a/externals/tinyobjloader +++ b/externals/tinyobjloader @@ -1 +1 @@ -Subproject commit 9d9e987c4776d9df54e0ab65639e1befddb1d5ae +Subproject commit e60d33385e2e4f7fa891513150f2532b5bbcb093