From cc93e474fb24397989f1340ee392e0b572e37ab2 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Fri, 6 Oct 2023 17:05:09 -0500 Subject: [PATCH 1/3] Bumps in ionic : ci_matching_branch/bump_ionic_gz-common6 Signed-off-by: Addisu Z. Taddese --- Aliases/gz-common6 | 1 - Formula/gz-common6.rb | 76 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) delete mode 120000 Aliases/gz-common6 create mode 100644 Formula/gz-common6.rb diff --git a/Aliases/gz-common6 b/Aliases/gz-common6 deleted file mode 120000 index f5b16c572..000000000 --- a/Aliases/gz-common6 +++ /dev/null @@ -1 +0,0 @@ -../Formula/gz-common5.rb \ No newline at end of file diff --git a/Formula/gz-common6.rb b/Formula/gz-common6.rb new file mode 100644 index 000000000..c06c48b66 --- /dev/null +++ b/Formula/gz-common6.rb @@ -0,0 +1,76 @@ +class GzCommon6 < Formula + desc "Common libraries for robotics applications" + homepage "https://gazebosim.org" + url "https://github.com/gazebosim/gz-common.git", branch: "main" + version "5.999.999~0~20231006" + license "Apache-2.0" + + head "https://github.com/gazebosim/gz-common.git", branch: "gz-common6" + + depends_on "assimp" + depends_on "cmake" + depends_on "ffmpeg" + depends_on "freeimage" + depends_on "gdal" + depends_on "gts" + depends_on "gz-cmake4" + depends_on "gz-math8" + depends_on "gz-utils3" + depends_on macos: :high_sierra # c++17 + depends_on "ossp-uuid" + depends_on "pkg-config" + depends_on "tinyxml2" + + def install + cmake_args = std_cmake_args + cmake_args << "-DBUILD_TESTING=OFF" + cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpath}" + + # Use build folder + mkdir "build" do + system "cmake", "..", *cmake_args + system "make", "install" + end + end + + test do + (testpath/"test.cpp").write <<-EOS + #include + #include + int main() { + gzdbg << "debug" << std::endl; + gzwarn << "warn" << std::endl; + gzerr << "error" << std::endl; + return 0; + } + EOS + (testpath/"CMakeLists.txt").write <<-EOS + cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + find_package(gz-common6 QUIET REQUIRED) + add_executable(test_cmake test.cpp) + target_link_libraries(test_cmake gz-common6::gz-common6) + EOS + system "pkg-config", "gz-common6" + cflags = `pkg-config --cflags gz-common6`.split + system ENV.cc, "test.cpp", + *cflags, + "-L#{lib}", + "-lgz-common6", + "-lc++", + "-o", "test" + system "./test" + # test building with cmake + mkdir "build" do + ENV.append "LIBRARY_PATH", Formula["gettext"].opt_lib + system "cmake", ".." + system "make" + system "./test_cmake" + end + # check for Xcode frameworks in bottle + # ! requires system with single argument, which uses standard shell + # put in variable to avoid audit complaint + # enclose / in [] so the following line won't match itself + cmd_not_grep_xcode = "! grep -rnI 'Applications[/]Xcode' #{prefix}" + system cmd_not_grep_xcode + end +end From 029ab78f09c9df54c9ea51d64c92b6bb10d741b2 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 9 Oct 2023 16:42:24 -0500 Subject: [PATCH 2/3] Bumps in ionic : ci_matching_branch/bump_ionic_gz-common6 Signed-off-by: Addisu Z. Taddese --- Formula/gz-common6.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/gz-common6.rb b/Formula/gz-common6.rb index c06c48b66..a8bb8577d 100644 --- a/Formula/gz-common6.rb +++ b/Formula/gz-common6.rb @@ -2,7 +2,7 @@ class GzCommon6 < Formula desc "Common libraries for robotics applications" homepage "https://gazebosim.org" url "https://github.com/gazebosim/gz-common.git", branch: "main" - version "5.999.999~0~20231006" + version "5.999.999~0~20231009" license "Apache-2.0" head "https://github.com/gazebosim/gz-common.git", branch: "gz-common6" From b79ffeeb4cc93b82300e15151e0c4a44c363cf3c Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 13 Oct 2023 13:47:41 -0700 Subject: [PATCH 3/3] gz-common6: use - in version string --- Formula/gz-common6.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Formula/gz-common6.rb b/Formula/gz-common6.rb index a8bb8577d..58f361393 100644 --- a/Formula/gz-common6.rb +++ b/Formula/gz-common6.rb @@ -2,7 +2,7 @@ class GzCommon6 < Formula desc "Common libraries for robotics applications" homepage "https://gazebosim.org" url "https://github.com/gazebosim/gz-common.git", branch: "main" - version "5.999.999~0~20231009" + version "5.999.999-0-20231009" license "Apache-2.0" head "https://github.com/gazebosim/gz-common.git", branch: "gz-common6"