Skip to content

Commit 33bc20e

Browse files
WildBeast114514WildBeast114514
committed
feat: release 9.0.0-alpha2
- apollo rules replace native bazel rules - merge the target of the module - bugs fix Change-Id: I2093de61f339bd7f73439d5c8257894630eff759
1 parent 34eaf82 commit 33bc20e

File tree

1,000 files changed

+28365
-34918
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,000 files changed

+28365
-34918
lines changed

‎.bazelrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
# as recommended in https://github.com/bazelbuild/bazel/issues/6319
33
try-import %workspace%/tools/bazel.rc
44
try-import %workspace%/.apollo.bazelrc
5+
6+
# build --remote_cache="http://localhost:8080/

‎.clang-format‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ IncludeCategories:
1010
# Note that the "main" header is priority 0
1111
# The priority is assigned to first match in the ordered list
1212
# Miscelaneous system libraries
13-
- Regex: '<(immintrin.h|malloc.h|wait.h|x86intrin.h|cuda.*)>'
13+
- Regex: '<(cxxabi.h|immintrin.h|malloc.h|wait.h|x86intrin.h|cuda.*)>'
1414
Priority: 3
1515
# third-party libraries
1616
- Regex: '<(tinyxml2.h)>'

‎cyber/BUILD‎

Lines changed: 45 additions & 210 deletions
Original file line numberDiff line numberDiff line change
@@ -1,230 +1,64 @@
1-
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
2-
# load("//tools/install:install.bzl", "install", "install_files", "install_src_files")
31
load("//tools:cpplint.bzl", "cpplint")
4-
load("//tools:apollo_package.bzl", "apollo_package")
5-
2+
load("//tools:apollo_package.bzl", "apollo_cc_library", "apollo_package")
63

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

9-
cc_library(
10-
name = "cyber",
11-
linkstatic = False,
12-
deps = [
13-
":cyber_core",
14-
],
15-
)
16-
17-
# install(
18-
# name = "install",
19-
# data = [
20-
# ":.release.bash",
21-
# ":cyber_conf",
22-
# #"//cyber/python/cyber_py3:runtime_files",
23-
# "//cyber/proto:runtime_files",
24-
# ":cyberfile.xml",
25-
# "cyber.BUILD",
26-
# ],
27-
# data_dest = "cyber",
28-
# library_dest = "cyber/lib",
29-
# rename = {
30-
# "cyber/.release.bash": "setup.bash",
31-
# #"cyber/python/cyber_py3/cyber_py3.BUILD": "BUILD",
32-
# "cyber/proto/py_pb2.BUILD": "BUILD",
33-
# },
34-
# targets = [
35-
# ":libcyber_core.so",
36-
# ],
37-
# deps = [
38-
# "//cyber/mainboard:install",
39-
# "//cyber/plugin_manager:install",
40-
# "//cyber/proto:cyber_proto_hdrs",
41-
# "//cyber/proto:cyber_proto_so",
42-
# "//cyber/proto:pb_cyber",
43-
# "//cyber/python/cyber_py3:cyber_python_library",
44-
# "//cyber/python/internal:install",
45-
# "//cyber/tools:install",
46-
# ],
47-
# )
48-
49-
# install_src_files(
50-
# name = "install_src",
51-
# deps = [
52-
# ":install_cyber_hdrs",
53-
# ":install_cyber_src",
54-
# ],
55-
# )
56-
57-
# install_src_files(
58-
# name = "install_cyber_src",
59-
# dest = "cyber/src",
60-
# filter = "*",
61-
# src_dir = ["."],
62-
# )
63-
64-
# install_src_files(
65-
# name = "install_cyber_hdrs",
66-
# dest = "cyber/include",
67-
# filter = "*.h",
68-
# src_dir = ["."],
69-
# )
70-
71-
cc_library(
72-
name = "binary",
73-
srcs = ["binary.cc"],
74-
hdrs = ["binary.h"],
6+
apollo_cc_library(
7+
name = "cyber_binary",
8+
srcs = ["binary.cc",],
9+
hdrs = ["binary.h",],
7510
)
7611

77-
cc_library(
78-
name = "state",
79-
srcs = ["state.cc"],
80-
hdrs = ["state.h"],
81-
deps = [
82-
"//cyber/common",
83-
],
12+
apollo_cc_library(
13+
name = "cyber_state",
14+
srcs = ["state.cc",],
15+
hdrs = ["state.h",],
16+
deps = ["//cyber/common:cyber_common",],
8417
)
8518

86-
cc_library(
87-
name = "init",
88-
srcs = ["init.cc"],
89-
hdrs = ["init.h"],
90-
deps = [
91-
"//cyber:binary",
92-
"//cyber:state",
93-
"//cyber/common:file",
94-
"//cyber/logger:async_logger",
95-
"//cyber/node",
96-
"//cyber/proto:clock_cc_proto",
97-
"//cyber/sysmo",
98-
"//cyber/time:clock",
99-
"//cyber/timer:timing_wheel",
100-
],
101-
alwayslink = True,
102-
)
103-
104-
cc_binary(
105-
name = "libcyber_core.so",
106-
srcs = glob([
19+
apollo_cc_library(
20+
name = "cyber",
21+
srcs = [
10722
"cyber.cc",
23+
"init.cc",
24+
],
25+
hdrs = [
10826
"cyber.h",
109-
]),
110-
linkopts = ["-lrt"],
111-
linkshared = True,
112-
linkstatic = True,
113-
visibility = ["//visibility:public"],
114-
deps = [
115-
"//cyber:binary",
116-
"//cyber:init",
117-
"//cyber:state",
118-
"//cyber/base",
119-
"//cyber/blocker:blocker_manager",
120-
"//cyber/class_loader",
121-
"//cyber/class_loader:class_loader_manager",
122-
"//cyber/common",
123-
"//cyber/component",
124-
"//cyber/component:timer_component",
125-
"//cyber/croutine",
126-
"//cyber/data",
127-
"//cyber/event:perf_event_cache",
128-
"//cyber/io",
129-
"//cyber/logger",
130-
"//cyber/logger:async_logger",
131-
"//cyber/message:message_traits",
132-
"//cyber/message:protobuf_traits",
133-
"//cyber/message:py_message_traits",
134-
"//cyber/message:raw_message_traits",
135-
"//cyber/node",
136-
"//cyber/parameter:parameter_client",
137-
"//cyber/parameter:parameter_server",
138-
"//cyber/plugin_manager",
139-
"//cyber/profiler",
140-
"//cyber/proto:run_mode_conf_cc_proto",
141-
"//cyber/record",
142-
"//cyber/scheduler",
143-
"//cyber/scheduler:scheduler_factory",
144-
"//cyber/service",
145-
"//cyber/service:client",
146-
"//cyber/service_discovery:topology_manager",
147-
"//cyber/sysmo",
148-
"//cyber/task",
149-
"//cyber/time",
150-
"//cyber/time:clock",
151-
"//cyber/time:duration",
152-
"//cyber/time:rate",
153-
"//cyber/timer",
154-
"//cyber/transport",
155-
"//cyber/transport/rtps:participant",
156-
"//cyber/transport/rtps:sub_listener",
157-
"@com_github_google_glog//:glog",
158-
"@com_google_protobuf//:protobuf",
159-
"@fastrtps",
27+
"init.h",
16028
],
161-
)
162-
163-
cc_library(
164-
name = "cyber_core",
165-
srcs = ["libcyber_core.so"],
166-
hdrs = ["cyber.h"],
16729
includes = ["."],
16830
linkopts = ["-lrt"],
16931
visibility = ["//visibility:public"],
17032
deps = [
171-
"//cyber:binary",
172-
"//cyber:init",
173-
"//cyber:state",
174-
"//cyber/base",
175-
"//cyber/blocker:blocker_manager",
176-
"//cyber/class_loader",
177-
"//cyber/class_loader:class_loader_manager",
178-
"//cyber/common",
179-
"//cyber/component",
180-
"//cyber/component:timer_component",
181-
"//cyber/croutine",
182-
"//cyber/data",
183-
"//cyber/event:perf_event_cache",
184-
"//cyber/io",
185-
"//cyber/logger",
186-
"//cyber/logger:async_logger",
187-
"//cyber/message:message_traits",
188-
"//cyber/message:protobuf_traits",
189-
"//cyber/message:py_message_traits",
190-
"//cyber/message:raw_message_traits",
191-
"//cyber/node",
192-
"//cyber/parameter:parameter_client",
193-
"//cyber/parameter:parameter_server",
194-
"//cyber/plugin_manager",
195-
"//cyber/profiler",
196-
"//cyber/proto:choreography_conf_cc_proto",
197-
"//cyber/proto:classic_conf_cc_proto",
33+
":cyber_binary",
34+
":cyber_state",
35+
"//cyber/base:cyber_base",
36+
"//cyber/blocker:cyber_blocker",
37+
"//cyber/class_loader:cyber_class_loader",
38+
"//cyber/common:cyber_common",
39+
"//cyber/component:cyber_component",
40+
"//cyber/croutine:cyber_croutine",
41+
"//cyber/data:cyber_data",
42+
"//cyber/event:cyber_event",
43+
"//cyber/io:cyber_io",
44+
"//cyber/logger:cyber_logger",
45+
"//cyber/message:cyber_message",
46+
"//cyber/node:cyber_node",
47+
"//cyber/parameter:cyber_parameter",
48+
"//cyber/plugin_manager:cyber_plugin_manager",
49+
"//cyber/profiler:cyber_profiler",
19850
"//cyber/proto:clock_cc_proto",
199-
"//cyber/proto:component_conf_cc_proto",
200-
"//cyber/proto:cyber_conf_cc_proto",
201-
"//cyber/proto:parameter_cc_proto",
202-
"//cyber/proto:perf_conf_cc_proto",
203-
"//cyber/proto:proto_desc_cc_proto",
204-
"//cyber/proto:qos_profile_cc_proto",
205-
"//cyber/proto:record_cc_proto",
206-
"//cyber/proto:role_attributes_cc_proto",
20751
"//cyber/proto:run_mode_conf_cc_proto",
208-
"//cyber/proto:scheduler_conf_cc_proto",
209-
"//cyber/proto:topology_change_cc_proto",
210-
"//cyber/proto:transport_conf_cc_proto",
211-
"//cyber/record",
212-
"//cyber/scheduler",
213-
"//cyber/scheduler:scheduler_factory",
214-
"//cyber/service",
215-
"//cyber/service:client",
216-
"//cyber/service_discovery:topology_manager",
217-
"//cyber/sysmo",
218-
"//cyber/task",
219-
"//cyber/time",
220-
"//cyber/time:clock",
221-
"//cyber/time:duration",
222-
"//cyber/time:rate",
223-
"//cyber/timer",
224-
"//cyber/transport",
225-
"//cyber/transport/rtps:participant",
226-
"//cyber/transport/rtps:sub_listener",
227-
"@com_github_gflags_gflags//:gflags",
52+
"//cyber/record:cyber_record",
53+
"//cyber/scheduler:cyber_scheduler",
54+
"//cyber/service:cyber_service",
55+
"//cyber/service_discovery:cyber_service_discovery",
56+
"//cyber/service_discovery:cyber_service_discovery_role",
57+
"//cyber/sysmo:cyber_sysmo",
58+
"//cyber/task:cyber_task",
59+
"//cyber/time:cyber_time",
60+
"//cyber/timer:cyber_timer",
61+
"//cyber/transport:cyber_transport",
22862
"@com_github_google_glog//:glog",
22963
"@com_google_protobuf//:protobuf",
23064
"@fastrtps",
@@ -239,4 +73,5 @@ filegroup(
23973
)
24074

24175
apollo_package()
76+
24277
cpplint()

0 commit comments

Comments
 (0)