Skip to content

Commit

Permalink
RSDK-5474 style fixes (#43)
Browse files Browse the repository at this point in the history
  • Loading branch information
abe-winter authored Jan 2, 2024
1 parent 3302c4d commit 111a529
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 28 deletions.
13 changes: 6 additions & 7 deletions Formula/cartographer-module.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ class CartographerModule < Formula
depends_on "go" => :build
depends_on "ninja" => :build
depends_on "pkg-config" => :build
depends_on "protobuf@21"
depends_on "grpc"
depends_on "googletest"
depends_on "cairo"
depends_on "ceres-solver"
depends_on "pcl"
depends_on "googletest"
depends_on "grpc"
depends_on "[email protected]"
depends_on "cairo"
depends_on "nlopt-static"
depends_on "pcl"
depends_on "protobuf@21"

def install
system "make", "buf"
Expand All @@ -37,7 +37,7 @@ def install
bin.install "bin/Darwin-arm64/cartographer-module" => "cartographer-module"
end
end

(share/"cartographer/lua_files").mkpath
share.install "viam-cartographer/lua_files/locating_in_map.lua" => "cartographer/lua_files/"
share.install "viam-cartographer/lua_files/mapping_new_map.lua" => "cartographer/lua_files/"
Expand All @@ -48,6 +48,5 @@ def install
share.install "viam-cartographer/cartographer/configuration_files/map_builder_server.lua" => "cartographer/lua_files/"
share.install "viam-cartographer/cartographer/configuration_files/trajectory_builder.lua" => "cartographer/lua_files/"
share.install "viam-cartographer/cartographer/configuration_files/trajectory_builder_3d.lua" => "cartographer/lua_files/"

end
end
2 changes: 1 addition & 1 deletion Formula/intel-real-grpc-server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ class IntelRealGrpcServer < Formula
depends_on "go" => :build
depends_on "pkg-config" => :build
depends_on "grpc"
depends_on "librealsense"
depends_on "jpeg-turbo"
depends_on "librealsense"
depends_on "openssl"

def install
Expand Down
32 changes: 16 additions & 16 deletions Formula/pangolin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ class Pangolin < Formula
homepage "https://github.com/stevenlovegrove/Pangolin"
url "https://github.com/stevenlovegrove/Pangolin/archive/refs/tags/v0.8.tar.gz"
sha256 "a680d1b52cd432f93f3359cb8f2179b25acf384d29dbaa2530b2eb3dfe5a81c6"
revision 1
license "MIT"
revision 1
depends_on "catch2" => :build
depends_on "cmake" => :build
depends_on "eigen"
Expand All @@ -23,21 +23,21 @@ def install
system "cmake", "-S", ".", "-B", "build", *std_cmake_args
system "cmake", "--build", "build"
if OS.mac?
system "install_name_tool", "-add_rpath", lib, "build/libpango_core.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_display.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_geometry.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_glgeometry.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_image.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_opengl.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_packetstream.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_plot.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_python.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_scene.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_tools.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_vars.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_video.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_windowing.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libtinyobj.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_core.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_display.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_geometry.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_glgeometry.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_image.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_opengl.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_packetstream.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_plot.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_python.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_scene.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_tools.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_vars.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_video.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libpango_windowing.dylib"
system "install_name_tool", "-add_rpath", lib, "build/libtinyobj.dylib"
end
system "cmake", "--install", "build"
end
Expand Down
6 changes: 3 additions & 3 deletions Formula/viam-server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ class ViamServer < Formula
head "https://github.com/viamrobotics/rdk.git", branch: "main"

depends_on "go" => :build
depends_on "pkg-config" => :build
depends_on "node@18" => :build
depends_on "pkg-config" => :build
depends_on "ffmpeg"
depends_on "jpeg-turbo"
depends_on "nlopt-static"
depends_on "opus"
depends_on "tensorflowlite"
depends_on "x264"
depends_on "jpeg-turbo"


def install
with_env(
"TAG_VERSION" => "v#{version}",
Expand Down
3 changes: 2 additions & 1 deletion Formula/viam.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
class Viam < Formula
desc "CLI for managing robots, orgs, etc. (See viam-server for running a robot)"
homepage "https://docs.viam.com/fleet/cli/"
url "https://github.com/viamrobotics/rdk/archive/refs/tags/v0.16.0.tar.gz"
sha256 "562ff529fa5e7c7b3f84687dc91755beb14d49c7977a3cd438147bae9c5da96a"
head "https://github.com/viamrobotics/rdk.git", branch: "main"
desc "Viam CLI for managing robots, modules, orgs, etc. on the Viam platform. (See also: viam-server for running a robot)."

depends_on "go" => :build

Expand Down

0 comments on commit 111a529

Please sign in to comment.