From d0274371cb34a26f74df9e36d51235ff48a0ef66 Mon Sep 17 00:00:00 2001 From: Thomas Debrunner Date: Fri, 5 Nov 2021 23:37:06 +0100 Subject: [PATCH 1/3] fastddsgen: Upgrade to Fast-DDS 2.0.2 --- Formula/fastcdr.rb | 5 ++--- Formula/fastdds.rb | 21 +++++++++++++++++++++ Formula/fastddsgen.rb | 17 +++++++++++++++++ Formula/fastrtps.rb | 24 ------------------------ Formula/foonathan-memory.rb | 18 ++++++++++++++++++ 5 files changed, 58 insertions(+), 27 deletions(-) create mode 100644 Formula/fastdds.rb create mode 100644 Formula/fastddsgen.rb delete mode 100644 Formula/fastrtps.rb create mode 100644 Formula/foonathan-memory.rb diff --git a/Formula/fastcdr.rb b/Formula/fastcdr.rb index 772f365..b53efec 100644 --- a/Formula/fastcdr.rb +++ b/Formula/fastcdr.rb @@ -1,9 +1,8 @@ class Fastcdr < Formula desc "OMG RTPS / DDS implementation" homepage "http://www.eprosima.com/index.php/products-all/eprosima-fast-rtps" - url "https://github.com/eProsima/Fast-CDR/archive/v1.0.8.tar.gz" - version "1.6.0" - sha256 "d47d924b76bc2fc7821dcadda4f8d1cb0f56df8353aa57cdf1106c49a612507f" + url "https://github.com/eProsima/Fast-CDR/archive/v1.0.22.tar.gz" + sha256 "7ca7f09c633963622431bdb216eeb4145e378f81a2ce5113e341b9eee55e4f44" depends_on "cmake" => :build diff --git a/Formula/fastdds.rb b/Formula/fastdds.rb new file mode 100644 index 0000000..34234dd --- /dev/null +++ b/Formula/fastdds.rb @@ -0,0 +1,21 @@ +class Fastdds < Formula + desc "OMG RTPS / DDS implementation" + homepage "https://www.eprosima.com/index.php/products-all/eprosima-fast-dds" + url "https://github.com/eProsima/Fast-DDS/archive/refs/tags/v2.0.2.tar.gz" + sha256 "d8c87e84c41a5628cc41658476137b6a392f218b844a6f5e2ff5d8c359fd5b10" + + depends_on "cmake" => :build + depends_on "asio" + depends_on "tinyxml2" + depends_on "fastcdr" + depends_on "foonathan-memory" + + + def install + Dir.mkdir("./build") + Dir.chdir("./build") + system "cmake", "-DCMAKE_INSTALL_PREFIX:PATH=#{prefix}", ".." + system "make" + system "make", "install" + end +end diff --git a/Formula/fastddsgen.rb b/Formula/fastddsgen.rb new file mode 100644 index 0000000..665ddd8 --- /dev/null +++ b/Formula/fastddsgen.rb @@ -0,0 +1,17 @@ +class Fastddsgen < Formula + desc "Fast-DDS IDL code generator tool " + homepage "https://www.eprosima.com/index.php/products-all/eprosima-fast-dds" + url "https://github.com/eProsima/Fast-DDS-Gen.git", tag: "v1.0.4" + sha256 "a75399160aab20490a64a4e936230f446441a2717c756e478bbd83822fcb97a2" + license "Apache-2.0" + + depends_on "gradle" => :build + depends_on "fastdds" + depends_on "openjdk@11" + + def install + system "./gradlew", "assemble" + system "./gradlew", "install", "--install_path=#{prefix}" + end + +end diff --git a/Formula/fastrtps.rb b/Formula/fastrtps.rb deleted file mode 100644 index 7ce38d7..0000000 --- a/Formula/fastrtps.rb +++ /dev/null @@ -1,24 +0,0 @@ -class Fastrtps < Formula - desc "OMG RTPS / DDS implementation" - homepage "http://www.eprosima.com/index.php/products-all/eprosima-fast-rtps" - url "http://px4-tools.s3.amazonaws.com/fastrtps-v1.6.0.tar.gz" - sha256 "a999f30e945c2be856cc4cbed3b338646c4016e6a26e0416dc442f07f658a2b5" - - bottle do - root_url "http://px4-tools.s3.amazonaws.com" - sha256 cellar: :any, high_sierra: "c3de7e9fde7eb59dbc30e398ea7332c083a664667eacfcb9898370c256384c4f" - sha256 cellar: :any, mojave: "c3de7e9fde7eb59dbc30e398ea7332c083a664667eacfcb9898370c256384c4f" - end - - depends_on "cmake" => :build - depends_on "gradle" => :build - depends_on "openjdk" - - def install - Dir.mkdir("./build") - Dir.chdir("./build") - system "cmake", "-DTHIRDPARTY=ON", "-DBUILD_JAVA=ON", "-DCMAKE_INSTALL_PREFIX:PATH=#{prefix}", ".." - system "make" - system "make", "install" - end -end diff --git a/Formula/foonathan-memory.rb b/Formula/foonathan-memory.rb new file mode 100644 index 0000000..2f4ea8c --- /dev/null +++ b/Formula/foonathan-memory.rb @@ -0,0 +1,18 @@ +class FoonathanMemory < Formula + desc "STL compatible C++ memory allocator library using a new RawAllocator concept that is similar to an Allocator but easier to use and write." + homepage "https://memory.foonathan.net" + url "https://github.com/foonathan/memory/archive/refs/tags/v0.7-1.tar.gz" + sha256 "19eb61c5cba6ccc40b8ee741350fd29402a46641ba752c30b7079528d87dbc79" + license "Zlib" + + depends_on "cmake" => :build + + def install + Dir.mkdir("./build") + Dir.chdir("./build") + system "cmake", "-DCMAKE_INSTALL_PREFIX:PATH=#{prefix}", ".." + system "make" + system "make", "install" + end + +end From 688fc3df1c657d4e076b92feb4a5a1fb47d19c76 Mon Sep 17 00:00:00 2001 From: Thomas Debrunner Date: Fri, 5 Nov 2021 23:41:59 +0100 Subject: [PATCH 2/3] px4-dev: Depend on fastdds instead of fastrtps --- Formula/px4-dev.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Formula/px4-dev.rb b/Formula/px4-dev.rb index d9b5d80..dd80485 100644 --- a/Formula/px4-dev.rb +++ b/Formula/px4-dev.rb @@ -10,8 +10,7 @@ class Px4Dev < Formula depends_on "ccache" depends_on "cmake" depends_on "discoteq/discoteq/flock" - depends_on "fastcdr" - depends_on "fastrtps" + depends_on "fastdds" depends_on "gcc-arm-none-eabi" depends_on "genromfs" depends_on "kconfig-frontends" From 6230d19de78a782babe7131c8ddeeebbefccfd40 Mon Sep 17 00:00:00 2001 From: Thomas Debrunner Date: Sat, 6 Nov 2021 00:06:06 +0100 Subject: [PATCH 3/3] kconfig-frontends: disable ncurses frontend on apple silicon --- Formula/kconfig-frontends.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Formula/kconfig-frontends.rb b/Formula/kconfig-frontends.rb index 505cc7c..6813701 100644 --- a/Formula/kconfig-frontends.rb +++ b/Formula/kconfig-frontends.rb @@ -29,8 +29,17 @@ class KconfigFrontends < Formula def install system "./bootstrap" - system "./configure", "--disable-debug", "--disable-dependency-tracking", - "--prefix=#{prefix}" + + args = %W[ + --prefix=#{prefix} + --disable-debug + --disable-dependency-tracking + ] + if Hardware::CPU.arm? + args << "--disable-nconf" + end + + system "./configure", *args system "make", "install" end