Skip to content

Commit

Permalink
Merge 701e715 into cafb09a
Browse files Browse the repository at this point in the history
  • Loading branch information
stephane-caron committed Dec 18, 2023
2 parents cafb09a + 701e715 commit 916c60b
Show file tree
Hide file tree
Showing 97 changed files with 192 additions and 1,534 deletions.
2 changes: 1 addition & 1 deletion CPPLINT.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# notice:
#
# Copyright 2012-2016 Robot Locomotion Group @ CSAIL
# License: BSD-3-Clause (see licenses/LICENSE-drake)
# SPDX-License-Identifier: BSD-3-Clause

# Don't search for other CPPLINT.cfg files in parent directories.
set noparent
Expand Down
12 changes: 0 additions & 12 deletions licenses/LICENSE-bullet

This file was deleted.

31 changes: 0 additions & 31 deletions licenses/LICENSE-drake

This file was deleted.

25 changes: 0 additions & 25 deletions licenses/LICENSE-lipm_walking_controller

This file was deleted.

25 changes: 0 additions & 25 deletions licenses/LICENSE-mc_rtc

This file was deleted.

201 changes: 0 additions & 201 deletions licenses/LICENSE-pi3hat

This file was deleted.

2 changes: 1 addition & 1 deletion tools/lint/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# notice:
#
# Copyright 2012-2016 Robot Locomotion Group @ CSAIL
# License: BSD-3-Clause (see licenses/LICENSE-drake)
# SPDX-License-Identifier: BSD-3-Clause

package(default_visibility = ["//visibility:public"])

Expand Down
2 changes: 1 addition & 1 deletion tools/lint/clang_format_lint.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# notice:
#
# Copyright 2012-2016 Robot Locomotion Group @ CSAIL
# License: BSD-3-Clause (see licenses/LICENSE-drake)
# SPDX-License-Identifier: BSD-3-Clause

import os
import shutil
Expand Down
2 changes: 1 addition & 1 deletion tools/lint/cpplint.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# notice:
#
# Copyright 2012-2016 Robot Locomotion Group @ CSAIL
# License: BSD-3-Clause (see licenses/LICENSE-drake)
# SPDX-License-Identifier: BSD-3-Clause

load("@rules_python//python:defs.bzl", "py_test")

Expand Down
2 changes: 1 addition & 1 deletion tools/lint/lint.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# notice:
#
# Copyright 2012-2016 Robot Locomotion Group @ CSAIL
# License: BSD-3-Clause (see licenses/LICENSE-drake)
# SPDX-License-Identifier: BSD-3-Clause

load("//tools/lint:cpplint.bzl", "cpplint")
load("//tools/lint:python_lint.bzl", "python_lint")
Expand Down
2 changes: 1 addition & 1 deletion tools/lint/python_lint.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# notice:
#
# Copyright 2012-2016 Robot Locomotion Group @ CSAIL
# License: BSD-3-Clause (see licenses/LICENSE-drake)
# SPDX-License-Identifier: BSD-3-Clause

load("@rules_python//python:defs.bzl", "py_test")

Expand Down
17 changes: 2 additions & 15 deletions tools/shm/clean.cpp
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
/*
* Copyright 2022 Stéphane Caron
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2022 Stéphane Caron
// SPDX-License-Identifier: Apache-2.0

#include <fcntl.h>
#include <spdlog/spdlog.h>
Expand Down
2 changes: 1 addition & 1 deletion tools/workspace/generate_file.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# notice:
#
# Copyright 2012-2016 Robot Locomotion Group @ CSAIL
# License: BSD-3-Clause (see licenses/LICENSE-drake)
# SPDX-License-Identifier: BSD-3-Clause

def _generate_file_impl(ctx):
out = ctx.actions.declare_file(ctx.label.name)
Expand Down
2 changes: 1 addition & 1 deletion tools/workspace/github_archive.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# permission notice:
#
# Copyright 2018 Josh Pieper, jjp@pobox.com.
# License: Apache-2.0
# SPDX-License-Identifier: Apache-2.0

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

Expand Down
Loading

0 comments on commit 916c60b

Please sign in to comment.