diff --git a/.github/workflows/bump-versions.yml b/.github/workflows/bump-versions.yml index 6503d4a..7658535 100644 --- a/.github/workflows/bump-versions.yml +++ b/.github/workflows/bump-versions.yml @@ -35,18 +35,12 @@ jobs: - name: Bump viam-server run: ./bump-version.sh viam-server - - name: Bump carto-grpc-server - run: ./bump-version.sh carto-grpc-server - - name: Bump cartographer-module run: ./bump-version.sh cartographer-module - name: Bump rplidar-module run: ./bump-version.sh rplidar-module - - name: Bump orb-grpc-server - run: ./bump-version.sh orb-grpc-server - - name: Bump orb-slam3-module run: ./bump-version.sh orb-slam3-module diff --git a/Formula/carto-grpc-server.rb b/Formula/carto-grpc-server.rb deleted file mode 100644 index 570c494..0000000 --- a/Formula/carto-grpc-server.rb +++ /dev/null @@ -1,49 +0,0 @@ -class CartoGrpcServer < Formula - desc "Viam slam GRPC server for Cartographer" - homepage "https://www.viam.com/" - url "https://github.com/viamrobotics/viam-cartographer.git", - tag: "v0.3.3", - revision: "82c6dd7af4acd82a9a19a59a98e80cc3048e7485" - license "Apache-2.0" - head "https://github.com/viamrobotics/viam-cartographer.git", branch: "main" - - conflicts_with "cartographer-module", because: "cartographer-module also installs carto_grpc_server" - - depends_on "cmake" => :build - depends_on "go" => :build - depends_on "ninja" => :build - depends_on "abseil" - depends_on "boost" - depends_on "cairo" - depends_on "ceres-solver" - depends_on "eigen" - depends_on "gflags" - depends_on "glog" - depends_on "googletest" - depends_on "grpc" - depends_on "lua@5.3" - depends_on "openssl" - depends_on "pcl" - depends_on "protobuf" - depends_on "sphinx-doc" - depends_on "suite-sparse" - - def install - system "make", "buf" - system "make", "build" - - bin.install "viam-cartographer/build/carto_grpc_server" - lib.install "viam-cartographer/cartographer/build/libcartographer.a" - lib.install "viam-cartographer/build/libviam-cartographer.a" - (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/" - share.install "viam-cartographer/lua_files/updating_a_map.lua" => "cartographer/lua_files/" - share.install "viam-cartographer/cartographer/configuration_files/map_builder.lua" => "cartographer/lua_files/" - share.install "viam-cartographer/cartographer/configuration_files/pose_graph.lua" => "cartographer/lua_files/" - share.install "viam-cartographer/cartographer/configuration_files/trajectory_builder_2d.lua" => "cartographer/lua_files/" - 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 diff --git a/Formula/cartographer-module.rb b/Formula/cartographer-module.rb index 5192664..ca26101 100644 --- a/Formula/cartographer-module.rb +++ b/Formula/cartographer-module.rb @@ -7,8 +7,6 @@ class CartographerModule < Formula license "Apache-2.0" head "https://github.com/viamrobotics/viam-cartographer.git", branch: "main" - conflicts_with "carto-grpc-server", because: "carto-grpc-server also installs carto_grpc_server" - depends_on "cmake" => :build depends_on "go" => :build depends_on "ninja" => :build diff --git a/Formula/orb-grpc-server.rb b/Formula/orb-grpc-server.rb deleted file mode 100644 index 039b409..0000000 --- a/Formula/orb-grpc-server.rb +++ /dev/null @@ -1,45 +0,0 @@ -class OrbGrpcServer < Formula - desc "Viam slam GRPC server for ORB_SLAM3" - homepage "https://www.viam.com/" - url "https://github.com/viamrobotics/viam-orb-slam3.git", - tag: "v0.3.1", - revision: "3726e0f9e8f05402406eeb81d52d39dcbf432b53" - license "Apache-2.0" - head "https://github.com/viamrobotics/viam-orb-slam3.git", branch: "main" - - conflicts_with "orb-slam3-module", because: "orb-slam3-module also installs orb_grpc_server" - - depends_on "cmake" => :build - depends_on "go" => :build - depends_on "pkg-config" => :build - depends_on "boost" - depends_on "eigen" - depends_on "glew" - depends_on "grpc" - depends_on "opencv@4" - depends_on "openssl" - depends_on "pangolin" - - def install - system "make", "buf" - system "make", "build" - if OS.mac? - system "install_name_tool", "-change", -buildpath.to_s.delete_prefix("/private") + "/viam-orb-slam3/ORB_SLAM3/Thirdparty/DBoW2/lib/libDBoW2.dylib", "#{lib}/libDBoW2.dylib", "viam-orb-slam3/ORB_SLAM3/lib/libORB_SLAM3.dylib" - system "install_name_tool", "-change", -buildpath.to_s.delete_prefix("/private") + "/viam-orb-slam3/ORB_SLAM3/Thirdparty/g2o/lib/libg2o.dylib", "#{lib}/libg2o.dylib", "viam-orb-slam3/ORB_SLAM3/lib/libORB_SLAM3.dylib" - system "install_name_tool", "-change", -buildpath.to_s.delete_prefix("/private") + "/viam-orb-slam3/ORB_SLAM3/Thirdparty/DBoW2/lib/libDBoW2.dylib", "#{lib}/libDBoW2.dylib", "viam-orb-slam3/bin/orb_grpc_server" - system "install_name_tool", "-change", -buildpath.to_s.delete_prefix("/private") + "/viam-orb-slam3/ORB_SLAM3/Thirdparty/g2o/lib/libg2o.dylib", "#{lib}/libg2o.dylib", "viam-orb-slam3/bin/orb_grpc_server" - system "install_name_tool", "-change", -buildpath.to_s.delete_prefix("/private") + "/viam-orb-slam3/ORB_SLAM3/lib/libORB_SLAM3.dylib", "#{lib}/libORB_SLAM3.dylib", "viam-orb-slam3/bin/orb_grpc_server" - end - bin.install "viam-orb-slam3/bin/orb_grpc_server" - lib.install Dir["viam-orb-slam3/ORB_SLAM3/lib/*"] - lib.install Dir["viam-orb-slam3/ORB_SLAM3/Thirdparty/DBoW2/lib/*"] - lib.install Dir["viam-orb-slam3/ORB_SLAM3/Thirdparty/g2o/lib/*"] - (share/"orbslam/Vocabulary").mkpath - share.install "viam-orb-slam3/ORB_SLAM3/Vocabulary/ORBvoc.txt" => "orbslam/Vocabulary/ORBvoc.txt" - end -end diff --git a/Formula/orb-slam3-module.rb b/Formula/orb-slam3-module.rb index c4f90f1..269c815 100644 --- a/Formula/orb-slam3-module.rb +++ b/Formula/orb-slam3-module.rb @@ -7,8 +7,6 @@ class OrbSlam3Module < Formula license "Apache-2.0" head "https://github.com/viamrobotics/viam-orb-slam3.git", branch: "main" - conflicts_with "orb-grpc-server", because: "orb-grpc-server also installs orb_grpc_server" - depends_on "cmake" => :build depends_on "go" => :build depends_on "pkg-config" => :build