Move into third_party/com_github_cxong_tinydir

LwinMoeAung · Oct 11, 2017 · 70d5dd5 · 70d5dd5
1 parent c451eb0
commit 70d5dd5
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 9 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -51,6 +51,7 @@ DRAKE_EXTERNAL_PACKAGE_INSTALLS = ["@%s//:install" % p for p in [
     "pybind11",
     "sdformat",
     "spdlog",
+    "tinydir",
     "tinyobjloader",
     "vtk",
     "yaml_cpp",

diff --git a/WORKSPACE b/WORKSPACE
@@ -26,6 +26,12 @@ local_repository(
     path = "third_party/com_github_google_kythe",
 )
 
+new_local_repository(
+    name = "tinydir",
+    build_file = "tools/workspace/tinydir/tinydir.BUILD.bazel",
+    path = "third_party/com_github_cxong_tinydir",
+)
+
 load("@kythe//tools/build_rules/config:pkg_config.bzl", "pkg_config_package")
 
 pkg_config_package(

diff --git a/drake/CMakeLists.txt b/drake/CMakeLists.txt
@@ -38,6 +38,12 @@ endif()
 
 include(CTest)
 
+# tinydir (via third_party)
+add_library(tinydir ../third_party/com_github_cxong_tinydir/tinydir.h)
+target_include_directories(tinydir PUBLIC ../third_party/com_github_cxong_tinydir)
+set_target_properties(tinydir PROPERTIES LINKER_LANGUAGE CXX)
+drake_install_libraries(tinydir)
+
 add_subdirectory(thirdParty/boost/tcbrindle_cpp17_headers/stx)
 add_subdirectory(thirdParty/bsd/spruce)
 add_subdirectory(common)

diff --git a/drake/build_components.bzl b/drake/build_components.bzl
@@ -317,7 +317,6 @@ LIBDRAKE_COMPONENTS = [
     "//drake/systems/trajectory_optimization:multiple_shooting",
     "//drake/thirdParty:spruce",
     "//drake/thirdParty:stx",
-    "//drake/thirdParty:tinydir",
     "//drake/util:convex_hull",
     "//drake/util:lcm_util",
     "//drake/util:util",

diff --git a/drake/multibody/parsers/BUILD b/drake/multibody/parsers/BUILD
@@ -32,7 +32,7 @@ drake_cc_library(
     deps = [
         "//drake/multibody:rigid_body_tree",
         "//drake/thirdParty:spruce",
-        "//drake/thirdParty:tinydir",
+        "@tinydir",
         "@tinyxml2",
     ],
 )

diff --git a/drake/multibody/parsers/CMakeLists.txt b/drake/multibody/parsers/CMakeLists.txt
@@ -10,6 +10,7 @@ target_link_libraries(drakeMultibodyParsers
     drakeRBM
     Eigen3::Eigen
     spruce
+    tinydir
     tinyxml2)
 drake_install_libraries(drakeMultibodyParsers)
 drake_install_headers(

diff --git a/drake/multibody/parsers/package_map.cc b/drake/multibody/parsers/package_map.cc
@@ -6,13 +6,13 @@
 #include <utility>
 #include <vector>
 
+#include <tinydir.h>
 #include <tinyxml2.h>
 #include "spruce.hh"
 
 #include "drake/common/drake_assert.h"
 #include "drake/common/drake_throw.h"
 #include "drake/common/text_logging.h"
-#include "drake/thirdParty/bsd/tinydir/tinydir.h"
 
 using std::cerr;
 using std::endl;

diff --git a/drake/multibody/parsers/xml_util.cc b/drake/multibody/parsers/xml_util.cc
@@ -5,9 +5,10 @@
 #include <stdexcept>
 #include <string>
 
+#include <tinydir.h>
+
 #include "drake/common/drake_assert.h"
 #include "drake/math/roll_pitch_yaw.h"
-#include "drake/thirdParty/bsd/tinydir/tinydir.h"
 
 using std::string;
 using std::stringstream;

diff --git a/drake/thirdParty/BUILD b/drake/thirdParty/BUILD
@@ -15,11 +15,6 @@ drake_cc_library(
     includes = ["bsd/spruce"],
 )
 
-drake_cc_library(
-    name = "tinydir",
-    hdrs = ["bsd/tinydir/tinydir.h"],
-)
-
 drake_cc_library(
     name = "stx",
     hdrs = ["boost/tcbrindle_cpp17_headers/stx/optional.hpp"],

diff --git a/drake/thirdParty/bsd/tinydir/COPYING → third_party/com_github_cxong_tinydir/COPYING b/drake/thirdParty/bsd/tinydir/COPYING → third_party/com_github_cxong_tinydir/COPYING
diff --git a/drake/thirdParty/bsd/tinydir/README.md → ..._party/com_github_cxong_tinydir/README.md b/drake/thirdParty/bsd/tinydir/README.md → ..._party/com_github_cxong_tinydir/README.md
diff --git a/drake/thirdParty/bsd/tinydir/tinydir.h → ..._party/com_github_cxong_tinydir/tinydir.h b/drake/thirdParty/bsd/tinydir/tinydir.h → ..._party/com_github_cxong_tinydir/tinydir.h
diff --git a/tools/workspace/tinydir/tinydir.BUILD.bazel b/tools/workspace/tinydir/tinydir.BUILD.bazel
@@ -0,0 +1,18 @@
+# -*- python -*-
+
+load("@drake//tools:install.bzl", "install")
+
+package(default_visibility = ["//visibility:public"])
+
+cc_library(
+    name = "tinydir",
+    hdrs = ["tinydir.h"],
+    includes = ["."],
+)
+
+# We do not install the header file (its a private dependency), but we still
+# need to install its license file.
+install(
+    name = "install",
+    docs = ["COPYING"],
+)