From 32d220298fc90e59b4c3f77e5cb119196dc2d239 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Wed, 30 Aug 2023 00:24:58 -0700 Subject: [PATCH 1/2] Ventura bottles for citadel/fortress base Cosmetic changes the the following formulae: * gz-cmake2 * gz-common3 * gz-common4 * gz-math6 * gz-plugin1 Signed-off-by: Steve Peters --- Formula/ignition-cmake2.rb | 2 +- Formula/ignition-common3.rb | 2 +- Formula/ignition-common4.rb | 2 +- Formula/ignition-math6.rb | 2 +- Formula/ignition-plugin1.rb | 2 +- Formula/ignition-tools.rb | 1 + Formula/ignition-utils1.rb | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Formula/ignition-cmake2.rb b/Formula/ignition-cmake2.rb index 4c6e6d268..5daf09aa2 100644 --- a/Formula/ignition-cmake2.rb +++ b/Formula/ignition-cmake2.rb @@ -18,7 +18,7 @@ class IgnitionCmake2 < Formula def install cmake_args = std_cmake_args - cmake_args << "-DBUILD_TESTING=Off" + cmake_args << "-DBUILD_TESTING=OFF" # Use build folder mkdir "build" do diff --git a/Formula/ignition-common3.rb b/Formula/ignition-common3.rb index 5a67c0307..2891f037c 100644 --- a/Formula/ignition-common3.rb +++ b/Formula/ignition-common3.rb @@ -26,7 +26,7 @@ class IgnitionCommon3 < Formula def install cmake_args = std_cmake_args - cmake_args << "-DBUILD_TESTING=Off" + cmake_args << "-DBUILD_TESTING=OFF" cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpath}" if Hardware::CPU.arm? diff --git a/Formula/ignition-common4.rb b/Formula/ignition-common4.rb index 28ef88b51..99326eac8 100644 --- a/Formula/ignition-common4.rb +++ b/Formula/ignition-common4.rb @@ -27,7 +27,7 @@ class IgnitionCommon4 < Formula def install cmake_args = std_cmake_args - cmake_args << "-DBUILD_TESTING=Off" + cmake_args << "-DBUILD_TESTING=OFF" cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpath}" # Use build folder diff --git a/Formula/ignition-math6.rb b/Formula/ignition-math6.rb index 488273310..1cd18ad8d 100644 --- a/Formula/ignition-math6.rb +++ b/Formula/ignition-math6.rb @@ -23,7 +23,7 @@ class IgnitionMath6 < Formula def install cmake_args = std_cmake_args - cmake_args << "-DBUILD_TESTING=Off" + cmake_args << "-DBUILD_TESTING=OFF" cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpath}" # Use build folder diff --git a/Formula/ignition-plugin1.rb b/Formula/ignition-plugin1.rb index 1b792daa7..862c89072 100644 --- a/Formula/ignition-plugin1.rb +++ b/Formula/ignition-plugin1.rb @@ -22,7 +22,7 @@ class IgnitionPlugin1 < Formula def install cmake_args = std_cmake_args - cmake_args << "-DBUILD_TESTING=Off" + cmake_args << "-DBUILD_TESTING=OFF" cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpath}" # Use build folder diff --git a/Formula/ignition-tools.rb b/Formula/ignition-tools.rb index c88913617..8ada769f4 100644 --- a/Formula/ignition-tools.rb +++ b/Formula/ignition-tools.rb @@ -24,6 +24,7 @@ def install s.gsub! "@CMAKE_INSTALL_PREFIX@", HOMEBREW_PREFIX end + # Use build folder mkdir "build" do system "cmake", "..", *std_cmake_args system "make", "install" diff --git a/Formula/ignition-utils1.rb b/Formula/ignition-utils1.rb index c25e4a890..e93420c80 100644 --- a/Formula/ignition-utils1.rb +++ b/Formula/ignition-utils1.rb @@ -19,7 +19,7 @@ class IgnitionUtils1 < Formula def install cmake_args = std_cmake_args - cmake_args << "-DBUILD_TESTING=Off" + cmake_args << "-DBUILD_TESTING=OFF" cmake_args << "-DCMAKE_INSTALL_RPATH=#{rpath}" # Use build folder From 92e0fa5ca90d32850cbdbfd480c5fc3d4e410b6d Mon Sep 17 00:00:00 2001 From: OSRF Build Bot Date: Wed, 30 Aug 2023 08:12:21 +0000 Subject: [PATCH 2/2] update bottle. --- Formula/ignition-cmake2.rb | 1 + Formula/ignition-common3.rb | 1 + Formula/ignition-common4.rb | 1 + Formula/ignition-math6.rb | 1 + Formula/ignition-plugin1.rb | 1 + Formula/ignition-tools.rb | 1 + Formula/ignition-utils1.rb | 1 + 7 files changed, 7 insertions(+) diff --git a/Formula/ignition-cmake2.rb b/Formula/ignition-cmake2.rb index 5daf09aa2..1c1cf38f2 100644 --- a/Formula/ignition-cmake2.rb +++ b/Formula/ignition-cmake2.rb @@ -9,6 +9,7 @@ class IgnitionCmake2 < Formula bottle do root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 cellar: :any_skip_relocation, ventura: "12777ebc41414783c5f7950539fd00ae68e188fdfcd45c0713eeae9a3b7ed2a6" sha256 cellar: :any_skip_relocation, monterey: "435c9652a8babe216da87d176185f4bd21f54dfdd5a7039f16837e707c86605b" sha256 cellar: :any_skip_relocation, big_sur: "b3652d54d1d32c62e2af34f8d5e537c59d07afee81798deea7151364007eee87" end diff --git a/Formula/ignition-common3.rb b/Formula/ignition-common3.rb index 2891f037c..a32edfce3 100644 --- a/Formula/ignition-common3.rb +++ b/Formula/ignition-common3.rb @@ -9,6 +9,7 @@ class IgnitionCommon3 < Formula bottle do root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 cellar: :any, ventura: "68a95bf32afccc4b773d268814976ca8e4b5b4de591edde70e3200cfa8aa546a" sha256 cellar: :any, monterey: "3f6ca9d7fb45d95d6b9765329c98c15f5fa352477514591bf9e8f81a53da465f" sha256 cellar: :any, big_sur: "7f280c787e5990dc8affb4d760bcef6bef14ab050394db1ca2cb0b79151c99c6" end diff --git a/Formula/ignition-common4.rb b/Formula/ignition-common4.rb index 99326eac8..ca0e65d72 100644 --- a/Formula/ignition-common4.rb +++ b/Formula/ignition-common4.rb @@ -9,6 +9,7 @@ class IgnitionCommon4 < Formula bottle do root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 cellar: :any, ventura: "aa18a1f275373952271db06b9e16ef49fdd6f5c5dd2c327222e496dd75d342b6" sha256 cellar: :any, monterey: "f83c51a0ace19ed6a45fbccccc2e94b2ed68198e16684033df565561f48ef500" sha256 cellar: :any, big_sur: "02fa82a28eb2855d965f5b185410b829bf6fb625fed27e578aaa6dc6a6bde6bd" end diff --git a/Formula/ignition-math6.rb b/Formula/ignition-math6.rb index 1cd18ad8d..8249aa3dc 100644 --- a/Formula/ignition-math6.rb +++ b/Formula/ignition-math6.rb @@ -9,6 +9,7 @@ class IgnitionMath6 < Formula bottle do root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 cellar: :any, ventura: "f8ebd38e80f1cfb35e322d03842c645e3cda1aeae47fd9a83a504f672f43c3b3" sha256 cellar: :any, monterey: "2aff9d73a5febd3240329bd6bb1052b454987848e419031f4c412ff8e0786918" sha256 cellar: :any, big_sur: "07522fbb858c6ada7d2926867eb736b9ea997d2be28f019c5355c0415832d73d" end diff --git a/Formula/ignition-plugin1.rb b/Formula/ignition-plugin1.rb index 862c89072..b7ebec824 100644 --- a/Formula/ignition-plugin1.rb +++ b/Formula/ignition-plugin1.rb @@ -9,6 +9,7 @@ class IgnitionPlugin1 < Formula bottle do root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 cellar: :any, ventura: "2c9887d57d32fb9c58d9497d38c12889039a554290b49bcd9d229a577cbb99eb" sha256 cellar: :any, monterey: "c6e836c62b75fcfee2bdf7a1b7bdd232b351591efaceef0e05b37c483cbbef83" sha256 cellar: :any, big_sur: "712f0971c2fa85a07b4e5971d4801ad7f324cd644cd170a603e850c57c4a30cd" sha256 cellar: :any, catalina: "fe41a0a740d6c61fc5dc145c89e43c9fc3476588c56b606786d7de122c3276f1" diff --git a/Formula/ignition-tools.rb b/Formula/ignition-tools.rb index 8ada769f4..9cb0c6657 100644 --- a/Formula/ignition-tools.rb +++ b/Formula/ignition-tools.rb @@ -10,6 +10,7 @@ class IgnitionTools < Formula bottle do root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 cellar: :any, ventura: "5aa02b63f35605148b4d2d698bc6fb259a801e71b2d3d30ca5570f9ce9712def" sha256 cellar: :any, monterey: "b71312917e1bf3be636dd7b328529cee00246681a13088a26a1da94f3cc9bd79" sha256 cellar: :any, big_sur: "9402482d4365a56f82a98e2ba77bd8dfbccbf13a046b7e8fed764914120509d4" sha256 cellar: :any, catalina: "41f0d2252bf63b397066d8b82b1e48186deac5aabc57cc9a7dbb4b332fa7131f" diff --git a/Formula/ignition-utils1.rb b/Formula/ignition-utils1.rb index e93420c80..60d29ee19 100644 --- a/Formula/ignition-utils1.rb +++ b/Formula/ignition-utils1.rb @@ -9,6 +9,7 @@ class IgnitionUtils1 < Formula bottle do root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation" + sha256 cellar: :any, ventura: "2d41a1fb2240d04e459bcadfb6154acd4b260d4b3f28951eac5513e644ea1aa1" sha256 cellar: :any, monterey: "f7a68cade6eef655b58433c502758c7361221cadf1df46af611f094db817ef10" sha256 cellar: :any, big_sur: "dfbfdd2ad1aa2b2915d80104a89eaf23f05efc6317b70a53896ba1aa2f46a579" end