From b72da9bbfad4d2cca58b6884d83ad27602ee44f5 Mon Sep 17 00:00:00 2001 From: Steffen Planthaber Date: Tue, 12 Nov 2024 15:54:47 +0100 Subject: [PATCH 1/3] remove flavors --- libs.autobuild | 733 +++++++++++++++++++++++------------------------ orogen.autobuild | 241 ++++++++-------- 2 files changed, 479 insertions(+), 495 deletions(-) diff --git a/libs.autobuild b/libs.autobuild index 3578d21..6fdd8a1 100644 --- a/libs.autobuild +++ b/libs.autobuild @@ -181,186 +181,182 @@ end ## #################################################################################" #################################################################################" +cmake_package 'multiagent/fipa_services' +cmake_package 'slam/ceres_solver' do |pkg| + pkg.define("BUILD_TESTING","OFF") + pkg.define("BUILD_EXAMPLES","OFF") + pkg.define("BUILD_SHARED_LIBS","ON") +end -in_flavor 'master' do - cmake_package 'multiagent/fipa_services' - cmake_package 'slam/ceres_solver' do |pkg| - pkg.define("BUILD_TESTING","OFF") - pkg.define("BUILD_EXAMPLES","OFF") - pkg.define("BUILD_SHARED_LIBS","ON") - end - - bundle_package 'bundles/rock_auv' - ruby_package 'tools/rbind' do |pkg| - pkg.depends_on 'gem-hooks' - pkg.depends_on 'clang-dev' - end - cmake_package 'perception/projection' - metapackage 'image_processing/projection', 'perception/projection' - - cmake_package 'gui/point_cloud' - cmake_package 'gui/qcam_calib' - - cmake_package 'perception/viso2' do |pkg| - pkg.disable_doc - pkg.depends_on 'base/cmake' - - # Seamlessly migrate from the SVN to the archive. We must delete the svn - # directory ! - if pkg.importer.kind_of?(Autobuild::ArchiveImporter) && File.directory?(File.join(pkg.srcdir, ".git")) - Autoproj.config.declare "UPDATE_VISO2_FROM_GIT", "boolean", - :doc => ["delete perception/viso2 to update to a release tarball ?", - "Rock was previously checking out from a Git repository but just switched to", - "using the release tarball. Updating requires the deletion of the", - "currently checked out perception/viso2 directory.", - "Should I do it ? This is required to continue building"], - :default => 'yes' - - if Autoproj.config.get("UPDATE_VISO2_FROM_GIT") - Autoproj.warn "deleting Viso2 source directory to migrate from the Git checkout to the release tarball" - FileUtils.rm_rf pkg.srcdir - else - raise ConfigError, "user refused to delete perception/viso2, aborting the build" - end - end - end - metapackage 'image_processing/viso2', 'perception/viso2' - - cmake_package 'planning/randward' do |pkg| - #build is already a file in the repro, re have to rename the buildfolder - pkg.builddir = "build-rock" - end +bundle_package 'bundles/rock_auv' +ruby_package 'tools/rbind' do |pkg| + pkg.depends_on 'gem-hooks' + pkg.depends_on 'clang-dev' +end +cmake_package 'perception/projection' +metapackage 'image_processing/projection', 'perception/projection' - cmake_package 'planning/arvand_herd' - cmake_package 'planning/fd_cedalion' - cmake_package 'planning/fd_uniform' - cmake_package 'planning/bfsf' - cmake_package 'planning/fast_downward' do |pkg| - bin,_,_ = Rock.activate_python_path(pkg) - pkg.define 'PYTHON_EXECUTABLE', bin if bin - end - cmake_package 'planning/lama' - cmake_package 'planning/pddl_planner' - cmake_package 'planning/simple_path_planner' +cmake_package 'gui/point_cloud' +cmake_package 'gui/qcam_calib' - cmake_package 'control/hysteresis_model' +cmake_package 'perception/viso2' do |pkg| + pkg.disable_doc + pkg.depends_on 'base/cmake' - cmake_package 'slam/pose_estimation' - cmake_package 'slam/terrain_estimator' - cmake_package 'slam/eslam' - cmake_package 'slam/gmapping' do |pkg| - pkg.define "BUILD_SHARED_LIBS", "ON" + # Seamlessly migrate from the SVN to the archive. We must delete the svn + # directory ! + if pkg.importer.kind_of?(Autobuild::ArchiveImporter) && File.directory?(File.join(pkg.srcdir, ".git")) + Autoproj.config.declare "UPDATE_VISO2_FROM_GIT", "boolean", + :doc => ["delete perception/viso2 to update to a release tarball ?", + "Rock was previously checking out from a Git repository but just switched to", + "using the release tarball. Updating requires the deletion of the", + "currently checked out perception/viso2 directory.", + "Should I do it ? This is required to continue building"], + :default => 'yes' + + if Autoproj.config.get("UPDATE_VISO2_FROM_GIT") + Autoproj.warn "deleting Viso2 source directory to migrate from the Git checkout to the release tarball" + FileUtils.rm_rf pkg.srcdir + else + raise ConfigError, "user refused to delete perception/viso2, aborting the build" + end end +end +metapackage 'image_processing/viso2', 'perception/viso2' - cmake_package 'slam/polygonnet' - remove_from_default 'slam/polygonnet' +cmake_package 'planning/randward' do |pkg| + #build is already a file in the repro, re have to rename the buildfolder + pkg.builddir = "build-rock" +end - cmake_package 'gui/map2d' +cmake_package 'planning/arvand_herd' +cmake_package 'planning/fd_cedalion' +cmake_package 'planning/fd_uniform' +cmake_package 'planning/bfsf' +cmake_package 'planning/fast_downward' do |pkg| + bin,_,_ = Rock.activate_python_path(pkg) + pkg.define 'PYTHON_EXECUTABLE', bin if bin +end +cmake_package 'planning/lama' +cmake_package 'planning/pddl_planner' +cmake_package 'planning/simple_path_planner' - cmake_package 'drivers/tofcamera_mesasr' +cmake_package 'control/hysteresis_model' - cmake_package 'drivers/imu_stim300' - metapackage 'drivers/stim300', 'drivers/imu_stim300' - cmake_package 'drivers/imu_imar' - metapackage 'drivers/imar', 'drivers/imu_imar' - cmake_package 'drivers/alt_imagenex' - cmake_package 'drivers/ctd_seabird' - cmake_package 'drivers/mbeam_imagenex' - cmake_package 'drivers/pressure_paroscientific' - cmake_package 'drivers/ucm_schilling' - cmake_package 'drivers/act_schilling' - cmake_package 'drivers/phins_ixsea' - cmake_package 'drivers/camera_aravis' +cmake_package 'slam/pose_estimation' +cmake_package 'slam/terrain_estimator' +cmake_package 'slam/eslam' +cmake_package 'slam/gmapping' do |pkg| + pkg.define "BUILD_SHARED_LIBS", "ON" end -in_flavor 'master', 'stable' do - cmake_package 'gui/vizkit_3d_plugins' - cmake_package 'drivers/dps_desertstar_ssp1' - - autotools_package 'drivers/aravis' do |pkg| - pkg.depends_on 'gobject-introspection' - pkg.depends_on 'gstreamer' - pkg.depends_on 'gtk+-2.0' - pkg.depends_on 'gtk-doc-tools' - end - cmake_package 'slam/mtk' - cmake_package 'planning/sbpl' - metapackage 'external/sbpl', 'planning/sbpl' - cmake_package 'planning/ompl' do |pkg| - # this will prevent the ompl-CMakeLists from spawning a browser to - # register... - pkg.define("OMPL_REGISTRATION","Off") - end - metapackage 'external/ompl', 'planning/ompl' - cmake_package 'external/aruco' do |pkg| - pkg.depends_on 'opencv' - end - cmake_package 'external/lemon' - cmake_package 'external/snap' do |pkg| - pkg.depends_on 'base/cmake' - pkg.parallel_build_level = 1 - end - cmake_package 'external/gexf' do |pkg| - pkg.depends_on 'base/cmake' - pkg.depends_on 'libxml2' - end - cmake_package 'simulation/imumodel' - - cmake_package 'slam/octomap' - - cmake_package "drivers/freenect" do |pkg| - pkg.define "BUILD_AUDIO", "ON" - pkg.define "BUILD_FAKENECT", "OFF" - pkg.define "BUILD_EXAMPLES", "OFF" - pkg.define "BUILD_C_SYNC", "OFF" - pkg.depends_on 'libusb1_0_13' - pkg.source_tree_excludes << /doc/ - pkg.doc_dir = File.join(pkg.srcdir, 'doc', 'html') - pkg.doc_task do - pkg.in_dir(File.join(pkg.srcdir, 'doc')) do - pkg.progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do - Autobuild::Subprocess.run(pkg, 'doc', Autobuild.tool(:doxygen), "Doxyfile") - end +cmake_package 'slam/polygonnet' +remove_from_default 'slam/polygonnet' + +cmake_package 'gui/map2d' + +cmake_package 'drivers/tofcamera_mesasr' + +cmake_package 'drivers/imu_stim300' +metapackage 'drivers/stim300', 'drivers/imu_stim300' +cmake_package 'drivers/imu_imar' +metapackage 'drivers/imar', 'drivers/imu_imar' +cmake_package 'drivers/alt_imagenex' +cmake_package 'drivers/ctd_seabird' +cmake_package 'drivers/mbeam_imagenex' +cmake_package 'drivers/pressure_paroscientific' +cmake_package 'drivers/ucm_schilling' +cmake_package 'drivers/act_schilling' +cmake_package 'drivers/phins_ixsea' +cmake_package 'drivers/camera_aravis' + +cmake_package 'gui/vizkit_3d_plugins' +cmake_package 'drivers/dps_desertstar_ssp1' + +autotools_package 'drivers/aravis' do |pkg| + pkg.depends_on 'gobject-introspection' + pkg.depends_on 'gstreamer' + pkg.depends_on 'gtk+-2.0' + pkg.depends_on 'gtk-doc-tools' +end +cmake_package 'slam/mtk' +cmake_package 'planning/sbpl' +metapackage 'external/sbpl', 'planning/sbpl' +cmake_package 'planning/ompl' do |pkg| + # this will prevent the ompl-CMakeLists from spawning a browser to + # register... + pkg.define("OMPL_REGISTRATION","Off") +end +metapackage 'external/ompl', 'planning/ompl' +cmake_package 'external/aruco' do |pkg| + pkg.depends_on 'opencv' +end +cmake_package 'external/lemon' +cmake_package 'external/snap' do |pkg| + pkg.depends_on 'base/cmake' + pkg.parallel_build_level = 1 +end +cmake_package 'external/gexf' do |pkg| + pkg.depends_on 'base/cmake' + pkg.depends_on 'libxml2' +end +cmake_package 'simulation/imumodel' + +cmake_package 'slam/octomap' + +cmake_package "drivers/freenect" do |pkg| + pkg.define "BUILD_AUDIO", "ON" + pkg.define "BUILD_FAKENECT", "OFF" + pkg.define "BUILD_EXAMPLES", "OFF" + pkg.define "BUILD_C_SYNC", "OFF" + pkg.depends_on 'libusb1_0_13' + pkg.source_tree_excludes << /doc/ + pkg.doc_dir = File.join(pkg.srcdir, 'doc', 'html') + pkg.doc_task do + pkg.in_dir(File.join(pkg.srcdir, 'doc')) do + pkg.progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do + Autobuild::Subprocess.run(pkg, 'doc', Autobuild.tool(:doxygen), "Doxyfile") end end end - Autoproj.add_osdeps_overrides 'freenect', :package => 'drivers/freenect' - metapackage 'external/freenect', 'drivers/freenect' - - - cmake_package 'control/urdfdom' - cmake_package 'tools/ignition-math2' - cmake_package 'control/sdformat' - cmake_package 'control/urdfdom_headers' - cmake_package 'control/kdl_parser' - cmake_package 'control/robot_frames' - cmake_package 'gui/robot_model' do |pkg| - pkg.env_add_path "VIZKIT_PLUGIN_RUBY_PATH", File.join(pkg.prefix,"lib") - # the tests in gui/robot_model is an app for a human to run. Do not let - # autoproj believe there is something to run automatically - pkg.test_utility.available = false - end - cmake_package 'gui/control_ui' - cmake_package 'control/joint_dispatcher' - cmake_package 'control/kdl_conversions' - cmake_package 'data_processing/openann' do |pkg| - pkg.depends_on 'base/cmake' - end - cmake_package 'data_processing/type_to_vector' - cmake_package 'drivers/video_capture_vlc' - cmake_package 'drivers/video_streamer_vlc' - autotools_package 'drivers/phidgets' do |pkg| - pkg.disable_doc - pkg.using[:autoheader] = false - if pkg.respond_to?(:automake_flags) - pkg.automake_flags = "--add-missing" - end +end +Autoproj.add_osdeps_overrides 'freenect', :package => 'drivers/freenect' +metapackage 'external/freenect', 'drivers/freenect' + + +cmake_package 'control/urdfdom' +cmake_package 'tools/ignition-math2' +cmake_package 'control/sdformat' +cmake_package 'control/urdfdom_headers' +cmake_package 'control/kdl_parser' +cmake_package 'control/robot_frames' +cmake_package 'gui/robot_model' do |pkg| + pkg.env_add_path "VIZKIT_PLUGIN_RUBY_PATH", File.join(pkg.prefix,"lib") + # the tests in gui/robot_model is an app for a human to run. Do not let + # autoproj believe there is something to run automatically + pkg.test_utility.available = false +end +cmake_package 'gui/control_ui' +cmake_package 'control/joint_dispatcher' +cmake_package 'control/kdl_conversions' +cmake_package 'data_processing/openann' do |pkg| + pkg.depends_on 'base/cmake' +end +cmake_package 'data_processing/type_to_vector' +cmake_package 'drivers/video_capture_vlc' +cmake_package 'drivers/video_streamer_vlc' +autotools_package 'drivers/phidgets' do |pkg| + pkg.disable_doc + pkg.using[:autoheader] = false + if pkg.respond_to?(:automake_flags) + pkg.automake_flags = "--add-missing" end +end # cmake_package 'drivers/gsf' #Link iscurrently death, no new one could be found. - cmake_package 'control/reflexxes' +cmake_package 'control/reflexxes' - #No compiling version can be found currently 05.2015 + #No compiling version can be found currently 05.2015 # cmake_package 'planning/openrave' do |pkg| # pkg.depends_on 'assimp' # pkg.depends_on 'sympy' @@ -373,250 +369,249 @@ in_flavor 'master', 'stable' do # Autoproj.env_add_path 'PYTHONPATH', File.join(pkg.prefix, 'lib', 'python2.7', 'site-packages') # end # remove_from_default 'planning/openrave' - cmake_package 'drivers/actuator_dispatcher' +cmake_package 'drivers/actuator_dispatcher' - bundle_package 'bundles/rock_ugv_nav' - cmake_package 'control/kdl' do |pkg| - pkg.depends_on 'base/cmake' - pkg.with_doc 'docs' - pkg.doc_dir = File.join('orocos_kdl', 'doc', 'api', 'html') +bundle_package 'bundles/rock_ugv_nav' +cmake_package 'control/kdl' do |pkg| + pkg.depends_on 'base/cmake' + pkg.with_doc 'docs' + pkg.doc_dir = File.join('orocos_kdl', 'doc', 'api', 'html') +end +cmake_package 'drivers/ptu_directedperception' +import_package 'drivers/aria' do |pkg| + def pkg.do_build + run('build', Autobuild.tool(:make), "-j#{parallel_build_level}", "-C", srcdir) end - cmake_package 'drivers/ptu_directedperception' - import_package 'drivers/aria' do |pkg| - def pkg.do_build - run('build', Autobuild.tool(:make), "-j#{parallel_build_level}", "-C", srcdir) - end - def pkg.do_install - include_dir = File.join(prefix, 'include', 'aria') - lib_dir = File.join(prefix, 'lib') - FileUtils.rm_rf include_dir - FileUtils.mkdir_p File.dirname(include_dir) - FileUtils.mkdir_p lib_dir + def pkg.do_install + include_dir = File.join(prefix, 'include', 'aria') + lib_dir = File.join(prefix, 'lib') + FileUtils.rm_rf include_dir + FileUtils.mkdir_p File.dirname(include_dir) + FileUtils.mkdir_p lib_dir - FileUtils.cp File.join(srcdir, 'lib','libAria.so'), File.join(lib_dir, 'libAria.so') - FileUtils.cp_r File.join(srcdir, 'include'), include_dir - end - - def pkg.do_pkgconfig - pkgconfig_dir = File.join(prefix, 'lib', "pkgconfig") - FileUtils.mkdir_p pkgconfig_dir + FileUtils.cp File.join(srcdir, 'lib','libAria.so'), File.join(lib_dir, 'libAria.so') + FileUtils.cp_r File.join(srcdir, 'include'), include_dir + end - infile = File.readlines(File.join(srcdir, 'aria.pc.in')) + def pkg.do_pkgconfig + pkgconfig_dir = File.join(prefix, 'lib', "pkgconfig") + FileUtils.mkdir_p pkgconfig_dir - pkgconfig = infile.map do |line| - if !line.index("@CMAKE_INSTALL_PREFIX@").nil? - line["@CMAKE_INSTALL_PREFIX@"] = prefix - end + infile = File.readlines(File.join(srcdir, 'aria.pc.in')) - if !line.index("@TARGET_NAME@").nil? - line["@TARGET_NAME@"] = "aria" - end + pkgconfig = infile.map do |line| + if !line.index("@CMAKE_INSTALL_PREFIX@").nil? + line["@CMAKE_INSTALL_PREFIX@"] = prefix + end - if !line.index("@PROJECT_VERSION@").nil? - line["@PROJECT_VERSION@"] = "2.7.5.2" - end - line + if !line.index("@TARGET_NAME@").nil? + line["@TARGET_NAME@"] = "aria" end - File.open(File.join(pkgconfig_dir, 'aria.pc'), 'w') do |outfile| - outfile.write pkgconfig.join + if !line.index("@PROJECT_VERSION@").nil? + line["@PROJECT_VERSION@"] = "2.7.5.2" end + line end - if pkg.respond_to?(:progress_start) # newer versions of autoproj - pkg.post_install do - pkg.progress_start "building %s" do - pkg.do_build - end - pkg.progress_start "installing %s" do - pkg.do_install - end - pkg.progress_start "generating pkgconfig file for %s" do - pkg.do_pkgconfig - end - end - else - pkg.post_install do - pkg.progress "building %s" + File.open(File.join(pkgconfig_dir, 'aria.pc'), 'w') do |outfile| + outfile.write pkgconfig.join + end + end + + if pkg.respond_to?(:progress_start) # newer versions of autoproj + pkg.post_install do + pkg.progress_start "building %s" do pkg.do_build - pkg.progress "installing %s" + end + pkg.progress_start "installing %s" do pkg.do_install - pkg.progress "generating pkgconfig file for %s" + end + pkg.progress_start "generating pkgconfig file for %s" do pkg.do_pkgconfig end end + else + pkg.post_install do + pkg.progress "building %s" + pkg.do_build + pkg.progress "installing %s" + pkg.do_install + pkg.progress "generating pkgconfig file for %s" + pkg.do_pkgconfig + end end +end - ##### External libraries not available as binary packages - cmake_package 'external/yaml-cpp' do |pkg| - pkg.define("BUILD_SHARED_LIBS","ON") - pkg.disable_doc # the package has documentation generation target - end - ##### External libraries not available as binary packages - cmake_package 'external/yaml-cpp03' do |pkg| - pkg.define("BUILD_SHARED_LIBS","ON") - pkg.disable_doc # the package has documentation generation target - end - cmake_package 'external/tinyxml' do |pkg| - # tinyxml is patched to use Rock macros - pkg.depends_on 'base/cmake' - end +##### External libraries not available as binary packages +cmake_package 'external/yaml-cpp' do |pkg| + pkg.define("BUILD_SHARED_LIBS","ON") + pkg.disable_doc # the package has documentation generation target +end +##### External libraries not available as binary packages +cmake_package 'external/yaml-cpp03' do |pkg| + pkg.define("BUILD_SHARED_LIBS","ON") + pkg.disable_doc # the package has documentation generation target +end +cmake_package 'external/tinyxml' do |pkg| + # tinyxml is patched to use Rock macros + pkg.depends_on 'base/cmake' +end - ##### Control-related libraries - cmake_package 'control/motor_controller' - cmake_package 'control/trajectory_follower' - cmake_package 'control/waypoint_navigation' - - ##### Device drivers - cmake_package 'drivers/velodyne_lidar' - cmake_package 'drivers/base_schilling' - cmake_package 'drivers/canbus' - cmake_package 'drivers/mb500' - cmake_package 'drivers/hokuyo' - cmake_package 'drivers/xsens_imu' - cmake_package 'drivers/dynamixel' - cmake_package 'drivers/controldev' - cmake_package 'drivers/parport' - cmake_package 'drivers/camera_interface' - cmake_package 'drivers/camera_prosilica' do |pkg| - if pkg.respond_to?(:source_tree_excludes) - pkg.source_tree_excludes << /Ping$/ << /ListCameras$/ - end +##### Control-related libraries +cmake_package 'control/motor_controller' +cmake_package 'control/trajectory_follower' +cmake_package 'control/waypoint_navigation' + +##### Device drivers +cmake_package 'drivers/velodyne_lidar' +cmake_package 'drivers/base_schilling' +cmake_package 'drivers/canbus' +cmake_package 'drivers/mb500' +cmake_package 'drivers/hokuyo' +cmake_package 'drivers/xsens_imu' +cmake_package 'drivers/dynamixel' +cmake_package 'drivers/controldev' +cmake_package 'drivers/parport' +cmake_package 'drivers/camera_interface' +cmake_package 'drivers/camera_prosilica' do |pkg| + if pkg.respond_to?(:source_tree_excludes) + pkg.source_tree_excludes << /Ping$/ << /ListCameras$/ end +end - cmake_package 'drivers/camera_usb' - cmake_package 'drivers/dvl_teledyne' - cmake_package 'drivers/camera_firewire' - cmake_package 'drivers/fog_kvh' - cmake_package 'drivers/iCharger' - cmake_package 'drivers/vicon' - cmake_package 'drivers/qualisys' - cmake_package 'drivers/sonar_tritech' - cmake_package 'drivers/laserscanner_sick' - cmake_package 'drivers/laser_filter' - cmake_package 'drivers/camera_ids' - if !has_ueye_api? # defined in init.rb - Autoproj.manifest.add_exclusion "drivers/camera_ids", "the uEye Linux SDK needed for camera_ids is not installed!. Install it manually: http://www.ids-imaging.de/drivers.php" - end +cmake_package 'drivers/camera_usb' +cmake_package 'drivers/dvl_teledyne' +cmake_package 'drivers/camera_firewire' +cmake_package 'drivers/fog_kvh' +cmake_package 'drivers/iCharger' +cmake_package 'drivers/vicon' +cmake_package 'drivers/qualisys' +cmake_package 'drivers/sonar_tritech' +cmake_package 'drivers/laserscanner_sick' +cmake_package 'drivers/laser_filter' +cmake_package 'drivers/camera_ids' +if !has_ueye_api? # defined in init.rb + Autoproj.manifest.add_exclusion "drivers/camera_ids", "the uEye Linux SDK needed for camera_ids is not installed!. Install it manually: http://www.ids-imaging.de/drivers.php" +end - ##### Image Processing - cmake_package 'perception/stereo' - metapackage 'image_processing/stereo', 'perception/stereo' - cmake_package 'perception/libelas' do |pkg| - # Build system from libelas has been patched into a Rock/CMake-based one - pkg.depends_on 'base/cmake' - end - metapackage 'image_processing/libelas', 'perception/libelas' - - ##### Planning - cmake_package 'planning/nav_graph_search' - cmake_package 'planning/corridor_planner' - cmake_package 'planning/vfh_star' - cmake_package 'planning/corridor_navigation' - cmake_package 'planning/motion_planning_libraries' - - ##### Localisation and Mapping related packages - autotools_package 'external/libply' do |pkg| - pkg.using[:autoconf] = true - pkg.using[:automake] = true - pkg.using[:libtool] = true - pkg.using[:autoheader] = true - if pkg.respond_to?(:automake_flags) - pkg.automake_flags = "--add-missing" - end - pkg.depends_on 'boost' - pkg.configureflags << "CFLAGS=-fPIC" << "CXXFLAGS=-fPIC" - end - cmake_package 'slam/envire' do |pkg| - Autoproj.env_add_path 'RUBYLIB', File.join(pkg.srcdir, 'ruby') - end - cmake_package 'slam/pose_ekf' - cmake_package 'slam/quater_ikf' - cmake_package 'external/cminpack' do |pkg| - pkg.doc_dir = File.join(pkg.srcdir, 'doc') - pkg.doc_task {} - pkg.define("CMAKE_BUILD_TYPE","Release") - end - cmake_package 'slam/flann' do |pkg| - pkg.define("CMAKE_BUILD_TYPE","Release") - pkg.define("BUILD_C_BINDINGS", "OFF") - pkg.define("BUILD_MATLAB_BINDINGS", "OFF") - pkg.define("BUILD_PYTHON_BINDINGS", "OFF") +##### Image Processing +cmake_package 'perception/stereo' +metapackage 'image_processing/stereo', 'perception/stereo' +cmake_package 'perception/libelas' do |pkg| + # Build system from libelas has been patched into a Rock/CMake-based one + pkg.depends_on 'base/cmake' +end +metapackage 'image_processing/libelas', 'perception/libelas' + +##### Planning +cmake_package 'planning/nav_graph_search' +cmake_package 'planning/corridor_planner' +cmake_package 'planning/vfh_star' +cmake_package 'planning/corridor_navigation' +cmake_package 'planning/motion_planning_libraries' + +##### Localisation and Mapping related packages +autotools_package 'external/libply' do |pkg| + pkg.using[:autoconf] = true + pkg.using[:automake] = true + pkg.using[:libtool] = true + pkg.using[:autoheader] = true + if pkg.respond_to?(:automake_flags) + pkg.automake_flags = "--add-missing" end - Autoproj.add_osdeps_overrides 'flann', :package => 'slam/flann' - #remove_from_default 'slam/flann' # The debian package is currently broken, so we install flann everwhere on our own currently - - cmake_package 'slam/pcl' do |pkg| - pkg.define("CMAKE_BUILD_TYPE","Release") - pkg.define("BUILD_OPENNI","OFF") - env_add 'PKG_CONFIG_PATH', File.join(pkg.prefix, 'lib64', 'pkgconfig') - - # Seamlessly migrate from the SVN to the archive. We must delete the svn - # directory ! - if pkg.importer.kind_of?(Autobuild::ArchiveImporter) && File.directory?(File.join(pkg.srcdir, ".svn")) - Autoproj.config.declare "UPDATE_PCL_FROM_SVN", "boolean", - :doc => ["delete slam/pcl to update to a release tarball ?", - "Rock was previously checking out the PCL SVN but just switched to", - "using the release tarball. Updating requires the deletion of the", - "currently checked out slam/pcl directory.", - "Should I do it ? This is required to continue building"], - :default => 'yes' - - if Autoproj.config.get("UPDATE_PCL_FROM_SVN") - Autoproj.warn "deleting PCL source directory to migrate from the SVN checkout to the release tarball" - FileUtils.rm_rf pkg.srcdir - else - raise ConfigError, "user refused to delete slam/pcl, aborting the build" - end + pkg.depends_on 'boost' + pkg.configureflags << "CFLAGS=-fPIC" << "CXXFLAGS=-fPIC" +end +cmake_package 'slam/envire' do |pkg| + Autoproj.env_add_path 'RUBYLIB', File.join(pkg.srcdir, 'ruby') +end +cmake_package 'slam/pose_ekf' +cmake_package 'slam/quater_ikf' +cmake_package 'external/cminpack' do |pkg| + pkg.doc_dir = File.join(pkg.srcdir, 'doc') + pkg.doc_task {} + pkg.define("CMAKE_BUILD_TYPE","Release") +end +cmake_package 'slam/flann' do |pkg| + pkg.define("CMAKE_BUILD_TYPE","Release") + pkg.define("BUILD_C_BINDINGS", "OFF") + pkg.define("BUILD_MATLAB_BINDINGS", "OFF") + pkg.define("BUILD_PYTHON_BINDINGS", "OFF") +end +Autoproj.add_osdeps_overrides 'flann', :package => 'slam/flann' +#remove_from_default 'slam/flann' # The debian package is currently broken, so we install flann everwhere on our own currently + +cmake_package 'slam/pcl' do |pkg| + pkg.define("CMAKE_BUILD_TYPE","Release") + pkg.define("BUILD_OPENNI","OFF") + env_add 'PKG_CONFIG_PATH', File.join(pkg.prefix, 'lib64', 'pkgconfig') + + # Seamlessly migrate from the SVN to the archive. We must delete the svn + # directory ! + if pkg.importer.kind_of?(Autobuild::ArchiveImporter) && File.directory?(File.join(pkg.srcdir, ".svn")) + Autoproj.config.declare "UPDATE_PCL_FROM_SVN", "boolean", + :doc => ["delete slam/pcl to update to a release tarball ?", + "Rock was previously checking out the PCL SVN but just switched to", + "using the release tarball. Updating requires the deletion of the", + "currently checked out slam/pcl directory.", + "Should I do it ? This is required to continue building"], + :default => 'yes' + + if Autoproj.config.get("UPDATE_PCL_FROM_SVN") + Autoproj.warn "deleting PCL source directory to migrate from the SVN checkout to the release tarball" + FileUtils.rm_rf pkg.srcdir + else + raise ConfigError, "user refused to delete slam/pcl, aborting the build" end end - remove_from_default 'slam/pcl' - cmake_package 'slam/hogman' do |pkg| - pkg.source_tree_excludes << /doc/ - pkg.doc_dir = File.join(pkg.srcdir, 'doc', 'html') - pkg.doc_task do - pkg.in_dir(File.join(pkg.srcdir, 'doc')) do - pkg.progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do - Autobuild::Subprocess.run(pkg, 'doc', Autobuild.tool(:doxygen), "hogman.dox") - end +end +remove_from_default 'slam/pcl' +cmake_package 'slam/hogman' do |pkg| + pkg.source_tree_excludes << /doc/ + pkg.doc_dir = File.join(pkg.srcdir, 'doc', 'html') + pkg.doc_task do + pkg.in_dir(File.join(pkg.srcdir, 'doc')) do + pkg.progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do + Autobuild::Subprocess.run(pkg, 'doc', Autobuild.tool(:doxygen), "hogman.dox") end end end - cmake_package 'slam/quater_ukf' - cmake_package 'slam/odometry' - cmake_package 'slam/graph_slam' - cmake_package 'slam/g2o' do |pkg| - pkg.define("CMAKE_BUILD_TYPE", "RelWithDebInfo") - pkg.define("CMAKE_RELWITHDEBINFO_POSTFIX", "") - pkg.source_tree_excludes << /doc\/doxygen/ - pkg.doc_dir = File.join(pkg.srcdir, 'doc', 'doxygen', 'html') - pkg.doc_task do - pkg.in_dir(File.join(pkg.srcdir, 'doc', 'doxygen')) do - pkg.progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do - Autobuild::Subprocess.run(pkg, 'doc', Autobuild.tool(:doxygen), "doxy.config") - end +end +cmake_package 'slam/quater_ukf' +cmake_package 'slam/odometry' +cmake_package 'slam/graph_slam' +cmake_package 'slam/g2o' do |pkg| + pkg.define("CMAKE_BUILD_TYPE", "RelWithDebInfo") + pkg.define("CMAKE_RELWITHDEBINFO_POSTFIX", "") + pkg.source_tree_excludes << /doc\/doxygen/ + pkg.doc_dir = File.join(pkg.srcdir, 'doc', 'doxygen', 'html') + pkg.doc_task do + pkg.in_dir(File.join(pkg.srcdir, 'doc', 'doxygen')) do + pkg.progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do + Autobuild::Subprocess.run(pkg, 'doc', Autobuild.tool(:doxygen), "doxy.config") end end end +end - #### Multiagent related packages - cmake_package 'multiagent/fipa_acl' do |pkg| - pkg.define "RUBY_EXECUTABLE", Autoproj.config.ruby_executable - end +#### Multiagent related packages +cmake_package 'multiagent/fipa_acl' do |pkg| + pkg.define "RUBY_EXECUTABLE", Autoproj.config.ruby_executable +end - autotools_package 'external/kdtree' - remove_from_default 'external/kdtree' - Autoproj.add_osdeps_overrides 'libkdtree', :package => 'external/kdtree' +autotools_package 'external/kdtree' +remove_from_default 'external/kdtree' +Autoproj.add_osdeps_overrides 'libkdtree', :package => 'external/kdtree' - cmake_package 'external/box2d' do |pkg| - pkg.define("BOX2D_BUILD_SHARED", "ON") - pkg.define("BOX2D_BUILD_STATIC", "OFF") - pkg.define("BOX2D_BUILD_EXAMPLES", "OFF") - end - remove_from_default 'external/box2d' - Autoproj.add_osdeps_overrides 'box2d', :package => 'external/box2d' +cmake_package 'external/box2d' do |pkg| + pkg.define("BOX2D_BUILD_SHARED", "ON") + pkg.define("BOX2D_BUILD_STATIC", "OFF") + pkg.define("BOX2D_BUILD_EXAMPLES", "OFF") end +remove_from_default 'external/box2d' +Autoproj.add_osdeps_overrides 'box2d', :package => 'external/box2d' # There is a problem with GCC and fipa_acl. Three of its files are taking # something north of 3G to compile ... each diff --git a/orogen.autobuild b/orogen.autobuild index fcc3673..8dc56c5 100644 --- a/orogen.autobuild +++ b/orogen.autobuild @@ -21,132 +21,121 @@ orogen_package 'control/orogen/robot_frames' orogen_package 'control/orogen/joint_tools' orogen_package 'gui/orogen/qt_base' - in_flavor 'master' do - orogen_package 'drivers/orogen/kinect2' - orogen_package 'slam/orogen/threed_odometry' - orogen_package 'multiagent/orogen/fipa_services' - orogen_package 'slam/orogen/gmapping' - orogen_package 'perception/orogen/projection' - metapackage 'image_processing/orogen/projection', 'perception/orogen/projection' - orogen_package 'perception/orogen/virtual_view' - metapackage 'image_processing/orogen/virtual_view', 'perception/orogen/virtual_view' - orogen_package 'control/orogen/trajectory_generation' - orogen_package 'control/orogen/cart_ctrl_wdls' - orogen_package 'control/orogen/auv_raw_command_converter' - - not_on %w{ubuntu 10.04}, %w{ubuntu 10.10}, %w{ubuntu 11.04}, %w{ubuntu 11.10} do - orogen_package 'perception/orogen/video_streamer' - metapackage 'image_processing/orogen/video_streamer', 'perception/orogen/video_streamer' - end - orogen_package 'perception/orogen/viso2' - metapackage 'image_processing/orogen/viso2', 'perception/orogen/viso2' - - orogen_package 'control/orogen/torque_estimator' - - orogen_package 'slam/orogen/north_seeker' - orogen_package 'slam/orogen/terrain_estimator' - orogen_package 'slam/orogen/eslam' - orogen_package 'slam/orogen/local_mapper' - orogen_package 'slam/orogen/localization' - orogen_package 'slam/orogen/pose_estimation' - - orogen_package 'planning/orogen/pddl_planner' - orogen_package 'planning/orogen/simple_path_planner' - orogen_package 'planning/orogen/heading_calculator' - orogen_package 'planning/orogen/traversability' - - orogen_package 'drivers/orogen/phidgets' - orogen_package 'drivers/orogen/imu_stim300' - metapackage 'drivers/orogen/stim300', 'drivers/orogen/imu_stim300' - orogen_package 'drivers/orogen/imu_imar' - metapackage 'drivers/orogen/imar', 'drivers/orogen/imu_imar' - orogen_package 'drivers/orogen/alt_imagenex' - orogen_package 'drivers/orogen/ctd_seabird' - orogen_package 'drivers/orogen/mbeam_imagenex' - orogen_package 'drivers/orogen/pressure_paroscientific' - orogen_package 'drivers/orogen/ucm_schilling' - orogen_package 'drivers/orogen/act_schilling' - orogen_package 'drivers/orogen/phins_ixsea' - orogen_package 'drivers/orogen/velodyne_lidar' - orogen_package 'drivers/orogen/tofcamera_mesasr' - orogen_package 'drivers/orogen/camera_aravis' - end - - #################################################################################" - #################################################################################" - ## - ## Do not add anything below this line unless you know what you are doing - ## New packages MUST be added at the top of the file, just after the "if - ## package_enabled" line - ## - #################################################################################" - #################################################################################" - - in_flavor 'master', 'stable' do - orogen_package 'drivers/orogen/kinect' - orogen_package 'drivers/orogen/dps_desertstar_ssp1' - orogen_package 'drivers/orogen/video_streamer_vlc' - orogen_package 'simulation/orogen/imumodel' - orogen_package 'drivers/orogen/servo_dynamixel' - orogen_package 'control/orogen/motor_controller' - orogen_package 'control/orogen/joint_dispatcher' - orogen_package 'data_processing/orogen/statistics' - orogen_package 'data_processing/orogen/type_to_vector' - orogen_package 'control/orogen/auv_rel_pos_controller' - orogen_package 'control/orogen/auv_control' - orogen_package 'control/orogen/kdl' - orogen_package 'drivers/orogen/ptu_directedperception' - orogen_package 'drivers/orogen/aria' - orogen_package 'control/orogen/trajectory_follower' - orogen_package 'control/orogen/waypoint_navigation' - orogen_package 'control/orogen/skid4_control' - - orogen_package 'drivers/orogen/canbus' - orogen_package 'drivers/orogen/gps' - orogen_package 'drivers/orogen/hokuyo' - orogen_package 'drivers/orogen/xsens_imu' - orogen_package 'drivers/orogen/dynamixel' - orogen_package 'drivers/orogen/controldev' - orogen_package 'drivers/orogen/controldev_websocket' - orogen_package 'drivers/orogen/parport' - orogen_package 'drivers/orogen/wifimon' - orogen_package 'drivers/orogen/camera_base' - orogen_package 'drivers/orogen/camera_prosilica' - orogen_package 'drivers/orogen/fog_kvh' - orogen_package 'drivers/orogen/dvl_teledyne' - orogen_package 'drivers/orogen/camera_usb' - orogen_package 'drivers/orogen/camera_firewire' +orogen_package 'drivers/orogen/kinect2' +orogen_package 'slam/orogen/threed_odometry' +orogen_package 'multiagent/orogen/fipa_services' +orogen_package 'slam/orogen/gmapping' +orogen_package 'perception/orogen/projection' +metapackage 'image_processing/orogen/projection', 'perception/orogen/projection' +orogen_package 'perception/orogen/virtual_view' +metapackage 'image_processing/orogen/virtual_view', 'perception/orogen/virtual_view' +orogen_package 'control/orogen/trajectory_generation' +orogen_package 'control/orogen/cart_ctrl_wdls' +orogen_package 'control/orogen/auv_raw_command_converter' + +not_on %w{ubuntu 10.04}, %w{ubuntu 10.10}, %w{ubuntu 11.04}, %w{ubuntu 11.10} do + orogen_package 'perception/orogen/video_streamer' + metapackage 'image_processing/orogen/video_streamer', 'perception/orogen/video_streamer' +end +orogen_package 'perception/orogen/viso2' +metapackage 'image_processing/orogen/viso2', 'perception/orogen/viso2' + +orogen_package 'control/orogen/torque_estimator' + +orogen_package 'slam/orogen/north_seeker' +orogen_package 'slam/orogen/terrain_estimator' +orogen_package 'slam/orogen/eslam' +orogen_package 'slam/orogen/local_mapper' +orogen_package 'slam/orogen/localization' +orogen_package 'slam/orogen/pose_estimation' + +orogen_package 'planning/orogen/pddl_planner' +orogen_package 'planning/orogen/simple_path_planner' +orogen_package 'planning/orogen/heading_calculator' +orogen_package 'planning/orogen/traversability' + +orogen_package 'drivers/orogen/phidgets' +orogen_package 'drivers/orogen/imu_stim300' +metapackage 'drivers/orogen/stim300', 'drivers/orogen/imu_stim300' +orogen_package 'drivers/orogen/imu_imar' +metapackage 'drivers/orogen/imar', 'drivers/orogen/imu_imar' +orogen_package 'drivers/orogen/alt_imagenex' +orogen_package 'drivers/orogen/ctd_seabird' +orogen_package 'drivers/orogen/mbeam_imagenex' +orogen_package 'drivers/orogen/pressure_paroscientific' +orogen_package 'drivers/orogen/ucm_schilling' +orogen_package 'drivers/orogen/act_schilling' +orogen_package 'drivers/orogen/phins_ixsea' +orogen_package 'drivers/orogen/velodyne_lidar' +orogen_package 'drivers/orogen/tofcamera_mesasr' +orogen_package 'drivers/orogen/camera_aravis' + + + +orogen_package 'drivers/orogen/kinect' +orogen_package 'drivers/orogen/dps_desertstar_ssp1' +orogen_package 'drivers/orogen/video_streamer_vlc' +orogen_package 'simulation/orogen/imumodel' +orogen_package 'drivers/orogen/servo_dynamixel' +orogen_package 'control/orogen/motor_controller' +orogen_package 'control/orogen/joint_dispatcher' +orogen_package 'data_processing/orogen/statistics' +orogen_package 'data_processing/orogen/type_to_vector' +orogen_package 'control/orogen/auv_rel_pos_controller' +orogen_package 'control/orogen/auv_control' +orogen_package 'control/orogen/kdl' +orogen_package 'drivers/orogen/ptu_directedperception' +orogen_package 'drivers/orogen/aria' +orogen_package 'control/orogen/trajectory_follower' +orogen_package 'control/orogen/waypoint_navigation' +orogen_package 'control/orogen/skid4_control' + +orogen_package 'drivers/orogen/canbus' +orogen_package 'drivers/orogen/gps' +orogen_package 'drivers/orogen/hokuyo' +orogen_package 'drivers/orogen/xsens_imu' +orogen_package 'drivers/orogen/dynamixel' +orogen_package 'drivers/orogen/controldev' +orogen_package 'drivers/orogen/controldev_websocket' +orogen_package 'drivers/orogen/parport' +orogen_package 'drivers/orogen/wifimon' +orogen_package 'drivers/orogen/camera_base' +orogen_package 'drivers/orogen/camera_prosilica' +orogen_package 'drivers/orogen/fog_kvh' +orogen_package 'drivers/orogen/dvl_teledyne' +orogen_package 'drivers/orogen/camera_usb' +orogen_package 'drivers/orogen/camera_firewire' # orogen_package 'drivers/orogen/gpsd_client' #same functionallity like gps, but planned to put gps funcionallity in this, and create generic gps command - orogen_package 'drivers/orogen/vicon' - orogen_package 'drivers/orogen/camera_v4l' - orogen_package 'drivers/orogen/sonar_tritech' - orogen_package 'drivers/orogen/laserscanner_sick' - orogen_package 'drivers/orogen/qualisys' - orogen_package 'drivers/orogen/laser_filter' - orogen_package 'drivers/orogen/camera_ids' - if !has_ueye_api? - Autoproj.manifest.add_exclusion "drivers/orogen/camera_ids", "the uEye Linux SDK needed for camera_ids is not installed!. Install it manually: http://www.ids-imaging.de/drivers.php" - end - - orogen_package 'drivers/orogen/taskmon' - - orogen_package 'slam/orogen/orientation_estimator' - orogen_package 'slam/orogen/envire' - orogen_package 'slam/orogen/graph_slam' - orogen_package 'slam/orogen/odometry' - orogen_package 'slam/orogen/tilt_scan' - - orogen_package 'perception/orogen/image_preprocessing' - metapackage 'image_processing/orogen/image_preprocessing', 'perception/orogen/image_preprocessing' - orogen_package 'perception/orogen/stereo' - metapackage 'image_processing/orogen/stereo', 'perception/orogen/stereo' - - orogen_package 'planning/orogen/corridor_navigation' - orogen_package 'planning/orogen/corridor_planner' do |pkg| - pkg.remove_obsolete_installed_file "share", "typelib", "ruby", "corridor_planner.rb" - end - - orogen_package 'planning/orogen/motion_planning_libraries' - end +orogen_package 'drivers/orogen/vicon' +orogen_package 'drivers/orogen/camera_v4l' +orogen_package 'drivers/orogen/sonar_tritech' +orogen_package 'drivers/orogen/laserscanner_sick' +orogen_package 'drivers/orogen/qualisys' +orogen_package 'drivers/orogen/laser_filter' +orogen_package 'drivers/orogen/camera_ids' +if !has_ueye_api? + Autoproj.manifest.add_exclusion "drivers/orogen/camera_ids", "the uEye Linux SDK needed for camera_ids is not installed!. Install it manually: http://www.ids-imaging.de/drivers.php" +end + +orogen_package 'drivers/orogen/taskmon' + +orogen_package 'slam/orogen/orientation_estimator' +orogen_package 'slam/orogen/envire' +orogen_package 'slam/orogen/graph_slam' +orogen_package 'slam/orogen/odometry' +orogen_package 'slam/orogen/tilt_scan' + +orogen_package 'perception/orogen/image_preprocessing' +metapackage 'image_processing/orogen/image_preprocessing', 'perception/orogen/image_preprocessing' +orogen_package 'perception/orogen/stereo' +metapackage 'image_processing/orogen/stereo', 'perception/orogen/stereo' + +orogen_package 'planning/orogen/corridor_navigation' +orogen_package 'planning/orogen/corridor_planner' do |pkg| + pkg.remove_obsolete_installed_file "share", "typelib", "ruby", "corridor_planner.rb" +end + +orogen_package 'planning/orogen/motion_planning_libraries' + create_metapackages From 1b4258bc6ad062eb8aa475df7859fc5940fb3c9a Mon Sep 17 00:00:00 2001 From: Steffen Planthaber Date: Thu, 14 Nov 2024 10:40:52 +0100 Subject: [PATCH 2/3] remove $ROCK_BRANCH from source.yml --- source-stable.yml | 25 --------------------- source.yml | 56 ----------------------------------------------- 2 files changed, 81 deletions(-) delete mode 100644 source-stable.yml diff --git a/source-stable.yml b/source-stable.yml deleted file mode 100644 index 375863f..0000000 --- a/source-stable.yml +++ /dev/null @@ -1,25 +0,0 @@ -version_control: - - control/kdl: - commit: 264ef3f7c4ad553e7a391e0f104fda1ec5051925 - - control/urdfdom: - tag: '0.3.0' - - control/urdfdom_headers: - tag: '0.3.0' - - data_processing/openann: - commit: a63e14383918aebb728b298b659cf9f3c5f6db3a - - external/freenect: - tag: 'v0.5.0' - - planning/openrave: - commit: 5cfc744410adfee464a35d19964f525efb819552 - - slam/gmapping: - revision: 53 - - slam/g2o: - revision: 54 - - slam/hogman: - revision: 21 - - slam/octomap: - tag: 'v1.6.6' - - external/sbpl: - commit: 5fd7dc8a387cc996ee35678670ac5936ffb333b7 - - drivers/aravis: - tag: 'ARAVIS_0_3_6' diff --git a/source.yml b/source.yml index fa438f7..0de89d3 100644 --- a/source.yml +++ b/source.yml @@ -7,75 +7,57 @@ imports: version_control: - control/.*: github: rock-control/control-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - control/orogen/.*: github: rock-control/control-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - drivers/.*: github: rock-drivers/drivers-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - drivers/orogen/.*: github: rock-drivers/drivers-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - knowledge_reasoning/.*: github: rock-knowledge-reasoning/knowledge-reasoning-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - knowledge_reasoning/orogen/.*: github: rock-knowledge-reasoning/knowledge-reasoning-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - planning/.*: github: rock-planning/planning-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - planning/orogen/.*: github: rock-planning/planning-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - slam/.*: github: rock-slam/slam-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - slam/orogen/.*: github: rock-slam/slam-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - gui/.*: github: rock-gui/gui-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - gui/orogen/.*: github: rock-gui/gui-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - multiagent/.*: github: rock-multiagent/multiagent-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - multiagent/orogen/.*: github: rock-multiagent/multiagent-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - perception/.*: github: rock-perception/perception-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - perception/orogen/.*: github: rock-perception/perception-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - tools/.*: github: rock-tools/tools-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - tools/orogen/.*: github: rock-tools/tools-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - control/urdfdom_headers: github: ros/urdfdom_headers @@ -104,23 +86,18 @@ version_control: - simulation/imumodel: github: rock-simulation/$PACKAGE_BASENAME - branch: $ROCK_BRANCH - simulation/orogen/imumodel: github: rock-simulation/orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - external/libply: github: rock-slam/external-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - bundles/rock_ugv_nav: github: rock-bundles/bundles-rock_ugv_nav.git - branch: $ROCK_BRANCH - bundles/rock_auv: github: rock-bundles/bundles-rock_auv.git - branch: $ROCK_BRANCH - gui/vizkit3d_debug_drawings: github: rock-gui/gui-$PACKAGE_BASENAME @@ -244,11 +221,9 @@ version_control: - data_processing/*: github: rock-data-processing/data_processing-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - data_processing/orogen/.*: github: rock-data-processing/data_processing-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - database/redis/hiredis: github: redis/hiredis @@ -256,18 +231,6 @@ version_control: - drivers/aria: type: archive url: http://robots.mobilerobots.com/ARIA/download/archives/ARIA-2.7.5+gcc4.3.tgz - update_cached_file: false - patches: $AUTOPROJ_SOURCE_DIR/patches/aria_pc.patch - - - drivers/phidgets: - type: archive - url: http://www.phidgets.com/downloads/libraries/libphidget_2.1.8.20130320.tar.gz - update_cached_file: false - patches: $AUTOPROJ_SOURCE_DIR/patches/phidgets.patch - - - tools/rbind: - type: git - url: https://github.com/D-Alex/rbind.git push_to: git@github.com:D-Alex/rbind.git - drivers/libusb: @@ -400,59 +363,41 @@ version_control: # Packages that have been migrated to github - drivers/sonar_tritech: github: rock-drivers/drivers-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - drivers/dps_desertstar_ssp1: github: rock-drivers/drivers-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - drivers/orogen/sonar_tritech: github: rock-drivers/drivers-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - drivers/orogen/dps_desertstar_ssp1: github: rock-drivers/drivers-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - drivers/imu_imar: github: rock-drivers/drivers-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - drivers/orogen/imu_imar: github: rock-drivers/drivers-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - drivers/imu_stim300: github: rock-drivers/drivers-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - drivers/orogen/imu_stim300: github: rock-drivers/drivers-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - drivers/orogen/kinect: github: rock-drivers/drivers-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH # rock-planning packages that have been migrated - planning/lama: github: rock-planning/planning-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - planning/arvand_herd: github: rock-planning/planning-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - planning/bfsf: github: rock-planning/planning-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - planning/fd_cedalion: github: rock-planning/planning-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - planning/fd_uniform: github: rock-planning/planning-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - planning/pddl_planner: github: rock-planning/planning-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - planning/orogen/pddl_planner: github: rock-planning/planning-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - planning/motion_planning_libraries: github: rock-planning/planning-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - planning/orogen/motion_planning_libraries: github: rock-planning/planning-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - tools/gecode: github: Gecode/gecode @@ -462,7 +407,6 @@ version_control: - tools/graph_analysis: github: rock-core/tools-graph_analysis - branch: $ROCK_BRANCH - tools/udt: type: git From 9dd835054e871f983363ad8923e9c4f1d6ab26a0 Mon Sep 17 00:00:00 2001 From: Steffen Planthaber Date: Fri, 15 Nov 2024 11:31:13 +0100 Subject: [PATCH 3/3] Update source.yml - re-add flasely removed code --- source.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/source.yml b/source.yml index 0de89d3..4d2cf82 100644 --- a/source.yml +++ b/source.yml @@ -231,6 +231,18 @@ version_control: - drivers/aria: type: archive url: http://robots.mobilerobots.com/ARIA/download/archives/ARIA-2.7.5+gcc4.3.tgz + update_cached_file: false + patches: $AUTOPROJ_SOURCE_DIR/patches/aria_pc.patch + + - drivers/phidgets: + type: archive + url: http://www.phidgets.com/downloads/libraries/libphidget_2.1.8.20130320.tar.gz + update_cached_file: false + patches: $AUTOPROJ_SOURCE_DIR/patches/phidgets.patch + + - tools/rbind: + type: git + url: https://github.com/D-Alex/rbind.git push_to: git@github.com:D-Alex/rbind.git - drivers/libusb: