From 02ab67396799253f5935f2300731753c2bb3ab9c Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 8 Aug 2022 13:48:44 -0700 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20Bump=20main=20to=206.0.?= =?UTF-8?q?0~pre1=20(#412)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Louise Poubel --- .github/workflows/macos.yml | 2 +- BUILD.bazel | 8 ++++---- CMakeLists.txt | 2 +- Changelog.md | 5 +++++ av/BUILD.bazel | 4 ++-- events/BUILD.bazel | 4 ++-- examples/CMakeLists.txt | 4 ++-- graphics/BUILD.bazel | 4 ++-- profiler/BUILD.bazel | 4 ++-- tutorials/profiler.md | 8 ++++---- 10 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e544a8c4..c0d0255d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: build: env: - PACKAGE: gz-common5 + PACKAGE: gz-common6 runs-on: macos-latest steps: - uses: actions/checkout@v2 diff --git a/BUILD.bazel b/BUILD.bazel index e97f57bf..383d3249 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -19,7 +19,7 @@ exports_files(["LICENSE"]) PROJECT_NAME = "gz-common" -PROJECT_MAJOR = 5 +PROJECT_MAJOR = 6 PROJECT_MINOR = 0 @@ -84,9 +84,9 @@ cc_library( ) cc_binary( - name = "libgz-common5.so", + name = "libgz-common6.so", includes = ["include"], - linkopts = ["-Wl,-soname,libgz-common5.so"], + linkopts = ["-Wl,-soname,libgz-common6.so"], linkshared = True, deps = [":gz_common"], ) @@ -99,7 +99,7 @@ test_srcs = glob( [cc_test( name = src.replace("/", "_").replace(".cc", "").replace("src_", ""), srcs = [src], - data = [":libgz-common5.so"], + data = [":libgz-common6.so"], deps = [ ":gz_common", GZ_ROOT + "gz_bazel:utilities", diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c231c53..fcfde4ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(gz-common5 VERSION 5.0.0) +project(gz-common6 VERSION 6.0.0) set(GZ_COMMON_VER ${PROJECT_VERSION_MAJOR}) #============================================================================ diff --git a/Changelog.md b/Changelog.md index 995740a4..e8fdb764 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,9 @@ +## Gazebo Common 6.x + +## Gazebo Common 6.0.0 (20XX-XX-XX) + ## Gazebo Common 5.x + ## Gazebo Common 5.0.0 (20XX-XX-XX) ## Gazebo Common 4.x diff --git a/av/BUILD.bazel b/av/BUILD.bazel index a2d74f5f..8ca6ffef 100644 --- a/av/BUILD.bazel +++ b/av/BUILD.bazel @@ -65,9 +65,9 @@ cc_library( ) cc_binary( - name = "libgz-common5-av.so", + name = "libgz-common6-av.so", includes = ["include"], - linkopts = ["-Wl,-soname,libgz-common5-av.so"], + linkopts = ["-Wl,-soname,libgz-common6-av.so"], linkshared = True, deps = [":av"], ) diff --git a/events/BUILD.bazel b/events/BUILD.bazel index 792ccd8a..deca01dc 100644 --- a/events/BUILD.bazel +++ b/events/BUILD.bazel @@ -57,9 +57,9 @@ cc_library( ) cc_binary( - name = "libgz-common5-events.so", + name = "libgz-common6-events.so", includes = ["include"], - linkopts = ["-Wl,-soname,libgz-common5-events.so"], + linkopts = ["-Wl,-soname,libgz-common6-events.so"], linkshared = True, deps = [":events"], ) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index d522cfb1..dad57e8d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR) # Find the gz-common library -find_package(gz-common5 QUIET REQUIRED COMPONENTS events profiler) -set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) +find_package(gz-common6 QUIET REQUIRED COMPONENTS events profiler) +set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) add_executable(assert_example assert_example.cc) target_link_libraries(assert_example gz-common${GZ_COMMON_VER}::core) diff --git a/graphics/BUILD.bazel b/graphics/BUILD.bazel index 4e41cff3..3d23f250 100644 --- a/graphics/BUILD.bazel +++ b/graphics/BUILD.bazel @@ -63,9 +63,9 @@ cc_library( ) cc_binary( - name = "libgz-common5-graphics.so", + name = "libgz-common6-graphics.so", includes = ["include"], - linkopts = ["-Wl,-soname,libgz-common5-graphics.so"], + linkopts = ["-Wl,-soname,libgz-common6-graphics.so"], linkshared = True, deps = [":graphics"], ) diff --git a/profiler/BUILD.bazel b/profiler/BUILD.bazel index 6a39767d..403424bf 100644 --- a/profiler/BUILD.bazel +++ b/profiler/BUILD.bazel @@ -100,9 +100,9 @@ cc_library( ) cc_binary( - name = "libgz-common5-profiler.so", + name = "libgz-common6-profiler.so", includes = ["include"], - linkopts = ["-Wl,-soname,libgz-common5-profiler.so"], + linkopts = ["-Wl,-soname,libgz-common6-profiler.so"], linkshared = True, deps = [":profiler"], ) diff --git a/tutorials/profiler.md b/tutorials/profiler.md index 595a9283..f3aff918 100644 --- a/tutorials/profiler.md +++ b/tutorials/profiler.md @@ -60,10 +60,10 @@ enabled at compile time in order to function. cmake_minimum_required(VERSION 2.8 FATAL_ERROR) # Find the gz-common library -find_package(gz-common5 QUIET REQUIRED COMPONENTS profiler) +find_package(gz-common6 QUIET REQUIRED COMPONENTS profiler) add_executable(profiler_example profiler.cc) -target_link_libraries(profiler_example ignition-common5::profiler) +target_link_libraries(profiler_example ignition-common6::profiler) # Enable the profiler for the example target_compile_definitions(profiler_example PUBLIC "GZ_PROFILER_ENABLE=1") ``` @@ -99,10 +99,10 @@ xdg-open $SOURCE_DIR/gz-common/profiler/src/Remotery/vis/index.html # Use the installation path (Linux) # This may vary depending on where you have choosen to install -xdg-open /usr/share/gz/gz-common5/profiler_vis/index.html +xdg-open /usr/share/gz/gz-common6/profiler_vis/index.html # Use the installation path (macOS) -open /usr/share/gz/gz-common5/profiler_vis/index.html +open /usr/share/gz/gz-common6/profiler_vis/index.html # Inside a Docker container with port 8000 exposed # 1. Find your container's IP with `ifconfig`