Skip to content

ignition-gui[345]: rm qwt dependency #1558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scpeters merged 6 commits into from
Sep 1, 2021
Merged

ignition-gui[345]: rm qwt dependency #1558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36385a2
ignition-gui[345]: rm qwt dependency
scpeters Aug 31, 2021
a728c10
ignition-gui3: revision bump for qwt
scpeters Aug 31, 2021
8f27fa2
ignition-gui4: revision bump for qwt
scpeters Aug 31, 2021
59668b4
ignition-gui5: revision bump for qwt
scpeters Aug 31, 2021
60c75a3
update bottle.
osrfbuild Sep 1, 2021
3d887f9
Merge branch 'master' into ign-gui-no-qwt
scpeters Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Formula/ignition-gui3.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ class IgnitionGui3 < Formula
url "https://osrf-distributions.s3.amazonaws.com/ign-gui/releases/ignition-gui3-3.7.0.tar.bz2"
sha256 "2b0f11cd3de51d5659016526c3858c930dff7c9aee2957a806c875ccf00da03e"
license "Apache-2.0"
revision 1

head "https://github.com/ignitionrobotics/ign-gui.git", branch: "ign-gui3"

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 catalina: "01e3c08c28fc320e634ee46c890c319d083e80d6099071e994cd20685d9771e9"
sha256 mojave: "922656b1a397e86023522e82d6727605621603daed23c99fede9bea04cd1e7f0"
sha256 catalina: "4839a832edbae59e80735e6e1eac0e6f86355e84ff919664452290e541e9e792"
sha256 mojave: "6d3871242421e00a9968c57d1fa46bb6b8f902895d7a61b4022a6a8c564db333"
end

depends_on "cmake" => [:build, :test]
Expand All @@ -23,13 +24,10 @@ class IgnitionGui3 < Formula
depends_on "ignition-transport8"
depends_on macos: :mojave # c++17
depends_on "qt@5"
depends_on "qwt"
depends_on "tinyxml2"

def install
cmake_args = std_cmake_args
cmake_args << "-DQWT_WIN_INCLUDE_DIR=#{HOMEBREW_PREFIX}/lib/qwt.framework/Headers"
cmake_args << "-DQWT_WIN_LIBRARY_DIR=#{HOMEBREW_PREFIX}/lib/qwt.framework"
cmake_args << "-DBUILD_TESTING=Off"

mkdir "build" do
Expand Down
8 changes: 3 additions & 5 deletions Formula/ignition-gui4.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ class IgnitionGui4 < Formula
url "https://osrf-distributions.s3.amazonaws.com/ign-gui/releases/ignition-gui4-4.5.0.tar.bz2"
sha256 "6b1e96fe502813df10d05569218bc2c64919c879122539b133489b7b5895f2cc"
license "Apache-2.0"
revision 1

head "https://github.com/ignitionrobotics/ign-gui.git", branch: "ign-gui4"

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 catalina: "902f194db7b36b71759f7395cdfffd5f762fbfa3b0e486ce21109f25cd181aa1"
sha256 mojave: "8fdf616efd1d53f3d1127d5c43115e15938768dbb6376bed5f180688223936d2"
sha256 catalina: "b6bc9e87243fab42c034670b92c5425752e1c3f6e4d471b646f776e8efc03587"
sha256 mojave: "2da199bc1ec38f3b80c764192097f40ba1a46afb86370befb1a0ce16b92afbaf"
end

depends_on "cmake" => [:build, :test]
Expand All @@ -23,13 +24,10 @@ class IgnitionGui4 < Formula
depends_on "ignition-transport9"
depends_on macos: :mojave # c++17
depends_on "qt@5"
depends_on "qwt"
depends_on "tinyxml2"

def install
cmake_args = std_cmake_args
cmake_args << "-DQWT_WIN_INCLUDE_DIR=#{HOMEBREW_PREFIX}/lib/qwt.framework/Headers"
cmake_args << "-DQWT_WIN_LIBRARY_DIR=#{HOMEBREW_PREFIX}/lib/qwt.framework"
cmake_args << "-DBUILD_TESTING=Off"

mkdir "build" do
Expand Down
8 changes: 3 additions & 5 deletions Formula/ignition-gui5.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ class IgnitionGui5 < Formula
url "https://osrf-distributions.s3.amazonaws.com/ign-gui/releases/ignition-gui5-5.2.0.tar.bz2"
sha256 "386661dea3517919fcf3124ec5791666f561c98a4b0c4b7ec649789d473d4938"
license "Apache-2.0"
revision 1

head "https://github.com/ignitionrobotics/ign-gui.git", branch: "main"

bottle do
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
sha256 catalina: "5b122a2a5e25ca2703c4c026040c8f4524d91af3b70f26a47d848d50aaff090f"
sha256 mojave: "550f0954404bfd9d92648c883d3786e534e9460686b7c19eac7bb2d59d59e20c"
sha256 catalina: "e6a8e5cb3de5a43e948c30a75b1697ddb07ba06e8ce18975719f97935f85560f"
sha256 mojave: "85123b88f23fdbd53cae081ebe3cf17d2f964ea7dd60f5b53a8824892a06bc59"
end

depends_on "cmake" => [:build, :test]
Expand All @@ -23,13 +24,10 @@ class IgnitionGui5 < Formula
depends_on "ignition-transport10"
depends_on macos: :mojave # c++17
depends_on "qt@5"
depends_on "qwt"
depends_on "tinyxml2"

def install
cmake_args = std_cmake_args
cmake_args << "-DQWT_WIN_INCLUDE_DIR=#{HOMEBREW_PREFIX}/lib/qwt.framework/Headers"
cmake_args << "-DQWT_WIN_LIBRARY_DIR=#{HOMEBREW_PREFIX}/lib/qwt.framework"
cmake_args << "-DBUILD_TESTING=Off"

mkdir "build" do
Expand Down