Skip to content

Commit 2479449

Browse files
authored
Merge pull request #30 from MaximilianToe/update_pubsub
updated RPC and PubSub examples to use ZenohUTransport and updated copyright notices
2 parents ffe1754 + c345fe6 commit 2479449

12 files changed

Lines changed: 111 additions & 455 deletions

CMakeLists.txt

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
1-
# Copyright (c) 2024 General Motors GTO LLC
1+
# SPDX-FileCopyrightText: 2025 Contributors to the Eclipse Foundation
22
#
3-
# Licensed to the Apache Software Foundation (ASF) under one
4-
# or more contributor license agreements. See the NOTICE file
5-
# distributed with this work for additional information
6-
# regarding copyright ownership. The ASF licenses this file
7-
# to you under the Apache License, Version 2.0 (the
8-
# "License"); you may not use this file except in compliance
9-
# with the License. You may obtain a copy of the License at
3+
# See the NOTICE file(s) distributed with this work for additional
4+
# information regarding copyright ownership.
105
#
11-
# http://www.apache.org/licenses/LICENSE-2.0
6+
# This program and the accompanying materials are made available under the
7+
# terms of the Apache License Version 2.0 which is available at
8+
# https://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# SPDX-License-Identifier: Apache-2.0
1211
#
13-
# Unless required by applicable law or agreed to in writing,
14-
# software distributed under the License is distributed on an
15-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16-
# KIND, either express or implied. See the License for the
17-
# specific language governing permissions and limitations
18-
# under the License.
19-
# SPDX-FileType: SOURCE
20-
# SPDX-FileCopyrightText: 2024 General Motors GTO LLC
21-
# SPDX-License-Identifier: Apache-2.0
22-
2312
cmake_minimum_required(VERSION 3.20)
2413
project(samples VERSION 0.1.0 LANGUAGES CXX DESCRIPTION "C++ Examples for uProtocol")
2514

pubsub/CMakeLists.txt

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
1-
# Copyright (c) 2024 General Motors GTO LLC
1+
# SPDX-FileCopyrightText: 2025 Contributors to the Eclipse Foundation
22
#
3-
# Licensed to the Apache Software Foundation (ASF) under one
4-
# or more contributor license agreements. See the NOTICE file
5-
# distributed with this work for additional information
6-
# regarding copyright ownership. The ASF licenses this file
7-
# to you under the Apache License, Version 2.0 (the
8-
# "License"); you may not use this file except in compliance
9-
# with the License. You may obtain a copy of the License at
3+
# See the NOTICE file(s) distributed with this work for additional
4+
# information regarding copyright ownership.
105
#
11-
# http://www.apache.org/licenses/LICENSE-2.0
6+
# This program and the accompanying materials are made available under the
7+
# terms of the Apache License Version 2.0 which is available at
8+
# https://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# SPDX-License-Identifier: Apache-2.0
1211
#
13-
# Unless required by applicable law or agreed to in writing,
14-
# software distributed under the License is distributed on an
15-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16-
# KIND, either express or implied. See the License for the
17-
# specific language governing permissions and limitations
18-
# under the License.
19-
# SPDX-FileType: SOURCE
20-
# SPDX-FileCopyrightText: 2024 General Motors GTO LLC
21-
# SPDX-License-Identifier: Apache-2.0
22-
2312
cmake_minimum_required(VERSION 3.20)
2413
project(pubsub VERSION 0.1.0 LANGUAGES CXX)
2514

@@ -30,23 +19,25 @@ find_package(up-transport-zenoh-cpp REQUIRED)
3019
add_definitions(-DSPDLOG_FMT_EXTERNAL)
3120

3221
# sub
33-
add_executable(sub src/main_sub.cpp src/UTransportDomainSockets.cpp)
22+
add_executable(sub src/main_sub.cpp)
3423
target_link_libraries(sub
3524
PUBLIC
3625
spdlog::spdlog
3726
up-cpp::up-cpp
38-
up-core-api::up-core-api)
27+
up-core-api::up-core-api
28+
up-transport-zenoh-cpp::up-transport-zenoh-cpp)
3929
target_include_directories(sub
4030
PRIVATE
4131
include)
4232

4333
# pub
44-
add_executable(pub src/main_pub.cpp src/UTransportDomainSockets.cpp)
34+
add_executable(pub src/main_pub.cpp)
4535
target_link_libraries(pub
4636
PUBLIC
4737
spdlog::spdlog
4838
up-cpp::up-cpp
49-
up-core-api::up-core-api)
39+
up-core-api::up-core-api
40+
up-transport-zenoh-cpp::up-transport-zenoh-cpp)
5041
target_include_directories(pub
5142
PRIVATE
5243
include)

pubsub/include/common.h

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
1-
// Copyright (c) 2024 General Motors GTO LLC
1+
// SPDX-FileCopyrightText: 2025 Contributors to the Eclipse Foundation
22
//
3-
// Licensed to the Apache Software Foundation (ASF) under one
4-
// or more contributor license agreements. See the NOTICE file
5-
// distributed with this work for additional information
6-
// regarding copyright ownership. The ASF licenses this file
7-
// to you under the Apache License, Version 2.0 (the
8-
// "License"); you may not use this file except in compliance
9-
// with the License. You may obtain a copy of the License at
3+
// See the NOTICE file(s) distributed with this work for additional
4+
// information regarding copyright ownership.
105
//
11-
// http://www.apache.org/licenses/LICENSE-2.0
6+
// This program and the accompanying materials are made available under the
7+
// terms of the Apache License Version 2.0 which is available at
8+
// https://www.apache.org/licenses/LICENSE-2.0
9+
//
10+
// SPDX-License-Identifier: Apache-2.0
1211
//
13-
// Unless required by applicable law or agreed to in writing,
14-
// software distributed under the License is distributed on an
15-
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16-
// KIND, either express or implied. See the License for the
17-
// specific language governing permissions and limitations
18-
// under the License.
19-
// SPDX-FileType: SOURCE
20-
// SPDX-FileCopyrightText: 2024 General Motors GTO LLC
21-
// SPDX-License-Identifier: Apache-2.0
22-
2312
#ifndef PUBSUB_COMMON_H
2413
#define PUBSUB_COMMON_H
2514

pubsub/src/UTransportDomainSockets.cpp

Lines changed: 0 additions & 208 deletions
This file was deleted.

pubsub/src/UTransportDomainSockets.h

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)