Skip to content

Commit 879f80f

Browse files
authored
Added spruce as third-party element within dairlib, removing problematic drake references. (#26)
1 parent 80afccb commit 879f80f

File tree

7 files changed

+561
-5
lines changed

7 files changed

+561
-5
lines changed

common/BUILD.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ cc_library(
77
],
88
srcs = ["find_resource.cc"],
99
deps = [
10-
"@drake//common",
10+
"@drake//common:essential",
11+
"//third_party/spruce",
1112
]
1213
)

common/find_resource.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
#include <utility>
55
#include <vector>
66

7-
#include <spruce.hh>
7+
#include "third_party/spruce/spruce.hh"
88

9-
#include "drake/common/drake_marker.h"
109
#include "drake/common/drake_throw.h"
11-
#include "drake/common/find_loaded_library.h"
1210
#include "drake/common/never_destroyed.h"
1311

1412
using std::string;

common/find_resource.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#include "drake/common/drake_assert.h"
77
#include "drake/common/drake_copyable.h"
88
#include "drake/common/drake_optional.h"
9-
#include "drake/common/find_resource.h"
109

1110
// Copied from drake/common/find_resource.h
1211
namespace dairlib {

third_party/spruce/BUILD.bazel

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
licenses(["notice"]) # BSD-3-Clause
4+
5+
cc_library(
6+
name = "spruce",
7+
hdrs = [
8+
"spruce.hh"
9+
],
10+
srcs = ["spruce.cc"],
11+
deps = [
12+
]
13+
)

third_party/spruce/LICENSE

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Copyright (c) 2014, Joseph Davis (@josephdavisco)
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
6+
7+
* Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
9+
10+
* Redistributions in binary form must reproduce the above copyright notice,
11+
this list of conditions and the following disclaimer in the documentation
12+
and/or other materials provided with the distribution.
13+
14+
* Neither the name of the project nor the names of its
15+
contributors may be used to endorse or promote products derived from
16+
this software without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)