Skip to content

Commit

Permalink
Merge branch 'main' into nkoenig/remove-ign
Browse files Browse the repository at this point in the history
  • Loading branch information
azeey authored Oct 13, 2023
2 parents 0bc3b58 + b7561e8 commit 2de6dba
Show file tree
Hide file tree
Showing 13 changed files with 618 additions and 234 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Ubuntu Focal CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@focal
Expand All @@ -22,7 +22,7 @@ jobs:
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@jammy
9 changes: 4 additions & 5 deletions .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Add ticket to inbox
uses: technote-space/create-project-card-action@v1
uses: actions/[email protected]
with:
PROJECT: Core development
COLUMN: Inbox
GITHUB_TOKEN: ${{ secrets.TRIAGE_TOKEN }}
CHECK_ORG_PROJECT: true
project-url: https://github.com/orgs/gazebosim/projects/7
github-token: ${{ secrets.TRIAGE_TOKEN }}

139 changes: 139 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
load(
"@gz//bazel/skylark:build_defs.bzl",
"GZ_FEATURES",
"GZ_ROOT",
"GZ_VISIBILITY",
"gz_configure_header",
"gz_export_header",
"gz_include_header",
)

package(
default_visibility = GZ_VISIBILITY,
features = GZ_FEATURES,
)

licenses(["notice"]) # Apache-2.0

gz_configure_header(
name = "config",
src = "core/include/gz/plugin/config.hh.in",
cmakelists = ["CMakeLists.txt"],
package = "plugin",
)

gz_export_header(
name = "core/include/gz/plugin/Export.hh",
export_base = "GZ_PLUGIN",
lib_name = "gz-plugin",
visibility = ["//visibility:private"],
)

public_headers_no_gen = glob([
"core/include/gz/plugin/*.hh",
"core/include/gz/plugin/detail/*.hh",
])

sources = glob(
["core/src/*.cc"],
exclude = ["core/src/*_TEST.cc"],
)

gz_include_header(
name = "pluginhh_genrule",
out = "core/include/gz/plugin.hh",
hdrs = public_headers_no_gen + [
"core/include/gz/plugin/config.hh",
"core/include/gz/plugin/Export.hh",
],
)

public_headers = public_headers_no_gen + [
"core/include/gz/plugin/config.hh",
"core/include/gz/plugin/Export.hh",
"core/include/gz/plugin.hh",
]

cc_library(
name = "core",
srcs = sources,
hdrs = public_headers,
includes = ["core/include"],
deps = [
GZ_ROOT + "utils",
],
)

[cc_test(
name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
srcs = [src],
deps = [
":core",
"@gtest",
"@gtest//:gtest_main",
],
) for src in glob(
[
"core/src/*_TEST.cc",
],
)]

cc_library(
name = "register",
hdrs = [
"register/include/gz/plugin/Register.hh",
"register/include/gz/plugin/RegisterMore.hh",
"register/include/gz/plugin/RegisterStatic.hh",
"register/include/gz/plugin/detail/Common.hh",
"register/include/gz/plugin/detail/Register.hh",
"register/include/gz/plugin/detail/RegisterStatic.hh",
],
includes = [
"register/include",
],
deps = [
":core",
],
)

gz_export_header(
name = "loader/include/gz/plugin/loader/Export.hh",
export_base = "GZ_PLUGIN_LOADER",
lib_name = "gz-plugin-loader",
visibility = ["//visibility:private"],
)

cc_library(
name = "loader",
srcs = [
"loader/src/Loader.cc",
"loader/src/detail/Registry.cc",
"loader/src/detail/StaticRegistry.cc",
],
hdrs = [
"loader/include/gz/plugin/Loader.hh",
"loader/include/gz/plugin/detail/Loader.hh",
"loader/include/gz/plugin/detail/Registry.hh",
"loader/include/gz/plugin/detail/StaticRegistry.hh",
"loader/include/gz/plugin/loader/Export.hh",
],
includes = ["loader/include"],
deps = [
":core",
GZ_ROOT + "utils",
],
)

cc_test(
name = "Loader_TEST",
srcs = ["loader/src/Loader_TEST.cc"],
defines = [
'GzDummyPlugins_LIB=\\"./plugin/test/libGzDummyPlugins.so\\"',
],
deps = [
":loader",
GZ_ROOT + "plugin/test:test_plugins",
"@gtest",
"@gtest//:gtest_main",
],
)
178 changes: 0 additions & 178 deletions COPYING

This file was deleted.

Loading

0 comments on commit 2de6dba

Please sign in to comment.