From b803f49d446e6306fc6bcfb529b373ea371a82c1 Mon Sep 17 00:00:00 2001 From: Steffen Planthaber Date: Tue, 12 Nov 2024 15:52:18 +0100 Subject: [PATCH 1/3] remove flavors --- 02master.autobuild | 53 +++-- 04stable.autobuild | 360 ++++++++++++++++----------------- 05deprecated.autobuild | 4 - 06osdeps_from_source.autobuild | 36 ++-- init.rb | 78 +------ overrides.rb | 10 +- rock/flavor_definition.rb | 30 --- rock/flavor_manager.rb | 287 -------------------------- rock/in_flavor_context.rb | 74 ------- source-stable.yml | 34 ++-- 10 files changed, 247 insertions(+), 719 deletions(-) delete mode 100644 05deprecated.autobuild delete mode 100644 rock/flavor_definition.rb delete mode 100644 rock/flavor_manager.rb delete mode 100644 rock/in_flavor_context.rb diff --git a/02master.autobuild b/02master.autobuild index 8e6b27f7..6e5e776d 100644 --- a/02master.autobuild +++ b/02master.autobuild @@ -1,36 +1,33 @@ -in_flavor 'master' do - bundle_package 'bundles/common_models' - ruby_package 'tools/telemetry' - cmake_package 'tools/orogen_metadata' do |pkg| - pkg.env_add_path 'OROGEN_PLUGIN_PATH', File.join(pkg.prefix, 'share', 'orogen', 'plugins') - pkg.remove_obsolete_installed_file('share', 'orogen', 'plugins', 'metadata_plugin.rb') - pkg.remove_obsolete_installed_file('share', 'typelib', 'ruby', 'metadata_typelib.rb') - end - - ruby_package 'tools/oropy_bridge' do |pkg| - def pkg.update_environment - super - env_add_path 'PYTHONPATH', File.join(srcdir, 'python') - env_add_path 'RUBYLIB', File.join(srcdir, 'ruby', 'lib') - env_add_path 'PATH', File.join(srcdir, 'bin') - end +bundle_package 'bundles/common_models' - pkg.post_import do - if !system('python -c "import msgpack" 2> /dev/null') - puts "\x1b[31mmsgpack-python is needed for the oropy_bridge - install manually\x1b[0m" - puts " [apt-get install python-pip]" - puts " pip install --user msgpack-python" - end - end +ruby_package 'tools/telemetry' +cmake_package 'tools/orogen_metadata' do |pkg| + pkg.env_add_path 'OROGEN_PLUGIN_PATH', File.join(pkg.prefix, 'share', 'orogen', 'plugins') + pkg.remove_obsolete_installed_file('share', 'orogen', 'plugins', 'metadata_plugin.rb') + pkg.remove_obsolete_installed_file('share', 'typelib', 'ruby', 'metadata_typelib.rb') +end +ruby_package 'tools/oropy_bridge' do |pkg| + def pkg.update_environment + super + env_add_path 'PYTHONPATH', File.join(srcdir, 'python') + env_add_path 'RUBYLIB', File.join(srcdir, 'ruby', 'lib') + env_add_path 'PATH', File.join(srcdir, 'bin') end - remove_from_default 'tools/oropy_bridge' - cmake_package 'tools/orogen_opaque_autogen' do |pkg| - pkg.env_add_path 'OROGEN_PLUGIN_PATH', File.join(pkg.prefix, "share", "orogen", "plugins" ) + pkg.post_import do + if !system('python -c "import msgpack" 2> /dev/null') + puts "\x1b[31mmsgpack-python is needed for the oropy_bridge - install manually\x1b[0m" + puts " [apt-get install python-pip]" + puts " pip install --user msgpack-python" + end end - remove_from_default 'tools/orogen_opaque_autogen' + end +remove_from_default 'tools/oropy_bridge' -add_packages_to_flavors 'master' => ['orogen', 'rtt', 'utilmm', 'utilrb', 'typelib', 'rtt_typelib', 'tools/metaruby', 'ocl', 'log4cpp'] +cmake_package 'tools/orogen_opaque_autogen' do |pkg| + pkg.env_add_path 'OROGEN_PLUGIN_PATH', File.join(pkg.prefix, "share", "orogen", "plugins" ) +end +remove_from_default 'tools/orogen_opaque_autogen' diff --git a/04stable.autobuild b/04stable.autobuild index b6fb347f..09a094a9 100644 --- a/04stable.autobuild +++ b/04stable.autobuild @@ -3,225 +3,223 @@ manifest = if Autoproj.respond_to?(:workspace) else Autoproj.manifest end -add_packages_to_flavors 'stable' => ['orogen', 'rtt', 'utilmm', 'utilrb', 'typelib', 'rtt_typelib', 'tools/metaruby', 'ocl', 'log4cpp'] -in_flavor 'master', 'stable' do - ruby_package 'gui/vizkit' +ruby_package 'gui/vizkit' - cmake_package 'gui/vizkit3d' do |pkg| - if manifest.package_enabled?('rtt', false) # the toolchain is built, add it to the rtt_target - pkg.define "OROCOS_TARGET", Autoproj.config.get('rtt_target') - end - pkg.env_add_path 'OSG_FILE_PATH', File.join(pkg.prefix, "share", "vizkit" ) - - # Add our prefix to the VIZKIT_PLUGIN_RUBY_PATH. Relevant packages will have - # to list the place where they install themselves - # TODO the path should be renamed to VIZKIT3D_PLUGIN_PATH - pkg.env_add_path 'VIZKIT_PLUGIN_RUBY_PATH', File.join(pkg.prefix, 'lib') - pkg.env_add_path 'VIZKIT_PLUGIN_RUBY_PATH', File.join(pkg.prefix, 'lib', 'vizkit') +cmake_package 'gui/vizkit3d' do |pkg| + if manifest.package_enabled?('rtt', false) # the toolchain is built, add it to the rtt_target + pkg.define "OROCOS_TARGET", Autoproj.config.get('rtt_target') end + pkg.env_add_path 'OSG_FILE_PATH', File.join(pkg.prefix, "share", "vizkit" ) - cmake_package 'base/console_bridge' - ruby_package 'tools/rubigen' do |pkg| - pkg.depends_on 'activesupport' - pkg.depends_on 'bundler' - pkg.depends_on 'cucumber' - pkg.rake_setup_task = nil - end - remove_from_default 'tools/rubigen' + # Add our prefix to the VIZKIT_PLUGIN_RUBY_PATH. Relevant packages will have + # to list the place where they install themselves + # TODO the path should be renamed to VIZKIT3D_PLUGIN_PATH + pkg.env_add_path 'VIZKIT_PLUGIN_RUBY_PATH', File.join(pkg.prefix, 'lib') + pkg.env_add_path 'VIZKIT_PLUGIN_RUBY_PATH', File.join(pkg.prefix, 'lib', 'vizkit') +end - bundle_package 'bundles/rock' - cmake_package 'tools/pocolog_cpp' - cmake_package 'tools/service_discovery' do |pkg| - pkg.define "RUBY_EXECUTABLE", Autoproj.config.ruby_executable - end +cmake_package 'base/console_bridge' +ruby_package 'tools/rubigen' do |pkg| + pkg.depends_on 'activesupport' + pkg.depends_on 'bundler' + pkg.depends_on 'cucumber' + pkg.rake_setup_task = nil +end +remove_from_default 'tools/rubigen' + +bundle_package 'bundles/rock' +cmake_package 'tools/pocolog_cpp' +cmake_package 'tools/service_discovery' do |pkg| + pkg.define "RUBY_EXECUTABLE", Autoproj.config.ruby_executable +end - ruby_package 'tools/autoproj' - remove_from_default 'tools/autoproj' - ruby_package 'tools/autobuild' - remove_from_default 'tools/autobuild' +ruby_package 'tools/autoproj' +remove_from_default 'tools/autoproj' +ruby_package 'tools/autobuild' +remove_from_default 'tools/autobuild' - cmake_package 'base/types' do |pkg| - if package_enabled?('external/sisl') - pkg.define 'SISL_PREFIX', package('external/sisl').prefix - end - pkg.define "RUBY_EXECUTABLE", Autoproj.config.ruby_executable +cmake_package 'base/types' do |pkg| + if package_enabled?('external/sisl') + pkg.define 'SISL_PREFIX', package('external/sisl').prefix end - cmake_package 'base/cmake' do |pkg| - pkg.env_add_path 'CMAKE_PREFIX_PATH', pkg.prefix - end - import_package 'base/templates/ruby_lib' - ruby_package 'base/admin_scripts' - remove_from_default 'base/admin_scripts' +pkg.define "RUBY_EXECUTABLE", Autoproj.config.ruby_executable +end +cmake_package 'base/cmake' do |pkg| + pkg.env_add_path 'CMAKE_PREFIX_PATH', pkg.prefix +end +import_package 'base/templates/ruby_lib' +ruby_package 'base/admin_scripts' +remove_from_default 'base/admin_scripts' - import_package 'base/doc' - remove_from_default 'base/doc' +import_package 'base/doc' +remove_from_default 'base/doc' - cmake_package 'base/numeric' +cmake_package 'base/numeric' - ruby_package 'base/scripts' do |pkg| - if Autoproj.config.get('syskit_use_bundles') - Autoproj.env_add_path( - 'ROBY_PLUGIN_PATH', - File.join(pkg.srcdir, 'lib', 'rock', 'roby_plugin.rb') - ) - end +ruby_package 'base/scripts' do |pkg| + if Autoproj.config.get('syskit_use_bundles') + Autoproj.env_add_path( + 'ROBY_PLUGIN_PATH', + File.join(pkg.srcdir, 'lib', 'rock', 'roby_plugin.rb') + ) end +end - import_package 'base/templates/cmake_lib' do |pkg| - pkg.env_set "ROCK_TEMPLATE_PREFIX", File.join(File.expand_path('..', pkg.srcdir), '') - pkg.env_set "ROCK_TEMPLATE_SUFFIX", "" - end +import_package 'base/templates/cmake_lib' do |pkg| + pkg.env_set "ROCK_TEMPLATE_PREFIX", File.join(File.expand_path('..', pkg.srcdir), '') + pkg.env_set "ROCK_TEMPLATE_SUFFIX", "" +end - import_package 'base/templates/cmake_vizkit_widget' - import_package 'base/templates/vizkit3d_plugin' - import_package 'base/templates/bundle' - import_package 'base/templates/doc' - - # Setup bundle support only if base/scripts is enabled - if package_enabled?('base/scripts') - setup_package 'base/scripts' do |pkg| - bundle_envsh = File.join(Autoproj.root_dir, '.bundle_env.sh') - if !File.file?(bundle_envsh) - File.open(bundle_envsh, "w") do |io| - io.puts "# File generated by the bundle-default command" - io.puts "# Do not change ! Your changes would be overriden !" - io.puts "unset ROCK_BUNDLE" - end +import_package 'base/templates/cmake_vizkit_widget' +import_package 'base/templates/vizkit3d_plugin' +import_package 'base/templates/bundle' +import_package 'base/templates/doc' + +# Setup bundle support only if base/scripts is enabled +if package_enabled?('base/scripts') + setup_package 'base/scripts' do |pkg| + bundle_envsh = File.join(Autoproj.root_dir, '.bundle_env.sh') + if !File.file?(bundle_envsh) + File.open(bundle_envsh, "w") do |io| + io.puts "# File generated by the bundle-default command" + io.puts "# Do not change ! Your changes would be overriden !" + io.puts "unset ROCK_BUNDLE" end - Autoproj.env_source_file bundle_envsh + end + Autoproj.env_source_file bundle_envsh - - shell_helpers = - if Autoproj.config.respond_to?(:shell_helpers?) - Autoproj.config.shell_helpers? # Autoproj 2.x - else Autoproj.shell_helpers? - end + + shell_helpers = + if Autoproj.config.respond_to?(:shell_helpers?) + Autoproj.config.shell_helpers? # Autoproj 2.x + else Autoproj.shell_helpers? + end - if shell_helpers && (shell = ENV['SHELL']) - shell_kind = File.basename(shell) - if shell_kind =~ /^\w+$/ - shell_file = File.join(pkg.srcdir, "shell", shell_kind) - - if File.file?(shell_file) - Autoproj.env_source_file shell_file - else - # Wait for having imported the package before we add the - # file - pkg.post_import do - if File.exist?(shell_file) - Autoproj.env_source_file shell_file - end + if shell_helpers && (shell = ENV['SHELL']) + shell_kind = File.basename(shell) + if shell_kind =~ /^\w+$/ + shell_file = File.join(pkg.srcdir, "shell", shell_kind) + + if File.file?(shell_file) + Autoproj.env_source_file shell_file + else + # Wait for having imported the package before we add the + # file + pkg.post_import do + if File.exist?(shell_file) + Autoproj.env_source_file shell_file end end end - elsif shell.nil? - Autoproj.error("Unable to detect shell type. Please set the SHELL environment variable or disable \nshell helpers altogether by setting the shell_helpers configuration variable to false.") end + elsif shell.nil? + Autoproj.error("Unable to detect shell type. Please set the SHELL environment variable or disable \nshell helpers altogether by setting the shell_helpers configuration variable to false.") end end +end - cmake_package 'external/sisl' do |pkg| - pkg.define "BUILD_SHARED_LIBS","ON" - pkg.doc_task do - pkg.message "copying HTML documentation from %s" - end # Nothing to do, SISL ships with the generated documentation - pkg.doc_dir = File.join(pkg.srcdir, 'doc', 'html') - end - - orogen_package 'base/orogen/std' - - ruby_package 'tools/syskit' do |pkg| - # the grpc-tools gem is only available on x86(-64). This disables - # telemetry support in syskit on non-x86 platforms - pkg.env_set 'SYSKIT_HAS_GRPC', - (RUBY_PLATFORM.match?(/x86/) ? "1" : "0") - pkg.env_set 'SYSKIT_USE_ROCK_BUNDLES', - (Autoproj.config.get('syskit_use_bundles') ? '1' : '0') - pkg.env_add_path( - 'ROBY_PLUGIN_PATH', - File.join(pkg.srcdir, 'lib', 'syskit', 'roby_app', 'register_plugin.rb') - ) - pkg.env_set 'Syskit_DIR', File.join(pkg.srcdir, 'cmake') - end +cmake_package 'external/sisl' do |pkg| + pkg.define "BUILD_SHARED_LIBS","ON" + pkg.doc_task do + pkg.message "copying HTML documentation from %s" + end # Nothing to do, SISL ships with the generated documentation + pkg.doc_dir = File.join(pkg.srcdir, 'doc', 'html') +end - ruby_package 'tools/orocos.rb' do |pkg| - pkg.env_set 'ORBInitRef',"NameService=corbaname::127.0.0.1" - pkg.rake_test_task = Autoproj.config.get("orocosrb_test_target", "test") - if pkg.test_utility.enabled? && Autobuild::Orogen.transports.include?('mqueue') - pkg.env_set 'OROCOSRB_TEST_USE_MQUEUE', '1' - end +orogen_package 'base/orogen/std' + +ruby_package 'tools/syskit' do |pkg| + # the grpc-tools gem is only available on x86(-64). This disables + # telemetry support in syskit on non-x86 platforms + pkg.env_set 'SYSKIT_HAS_GRPC', + (RUBY_PLATFORM.match?(/x86/) ? "1" : "0") + pkg.env_set 'SYSKIT_USE_ROCK_BUNDLES', + (Autoproj.config.get('syskit_use_bundles') ? '1' : '0') + pkg.env_add_path( + 'ROBY_PLUGIN_PATH', + File.join(pkg.srcdir, 'lib', 'syskit', 'roby_app', 'register_plugin.rb') + ) + pkg.env_set 'Syskit_DIR', File.join(pkg.srcdir, 'cmake') +end - def pkg.invoke_rake(target_name = rake_setup_task) - super - if test_utility.enabled? - Autobuild.invoke_make_parallel(self) do |*make_options| - make_options = make_options. - map { |opt| opt.gsub(',', ';') } - test_target = "setup:orogen_all[1,#{Autobuild::Orogen.transports.join(" ")},'#{make_options.join("' '")}']" - super(test_target) - end +ruby_package 'tools/orocos.rb' do |pkg| + pkg.env_set 'ORBInitRef',"NameService=corbaname::127.0.0.1" + pkg.rake_test_task = Autoproj.config.get("orocosrb_test_target", "test") + if pkg.test_utility.enabled? && Autobuild::Orogen.transports.include?('mqueue') + pkg.env_set 'OROCOSRB_TEST_USE_MQUEUE', '1' + end + + def pkg.invoke_rake(target_name = rake_setup_task) + super + if test_utility.enabled? + Autobuild.invoke_make_parallel(self) do |*make_options| + make_options = make_options. + map { |opt| opt.gsub(',', ';') } + test_target = "setup:orogen_all[1,#{Autobuild::Orogen.transports.join(" ")},'#{make_options.join("' '")}']" + super(test_target) end end end +end - ruby_package 'tools/pocolog' - orogen_package 'tools/logger' - orogen_package 'base/orogen/types' do |pkg| - pkg.orogen_file = "base.orogen" - if package_selected?('external/sisl') - pkg.define "SISL_PREFIX", package('external/sisl').prefix - end - pkg.env_set 'ROCK_PREFIX', File.join(pkg.prefix,'share','rock') - - pkg.remove_obsolete_installed_file "share", "typelib", "ruby", "base.rb" +ruby_package 'tools/pocolog' +orogen_package 'tools/logger' +orogen_package 'base/orogen/types' do |pkg| + pkg.orogen_file = "base.orogen" + if package_selected?('external/sisl') + pkg.define "SISL_PREFIX", package('external/sisl').prefix end + pkg.env_set 'ROCK_PREFIX', File.join(pkg.prefix,'share','rock') - ruby_package 'tools/roby' do |pkg| - pkg.doc_dir = File.join('doc', 'html') - end + pkg.remove_obsolete_installed_file "share", "typelib", "ruby", "base.rb" +end - ruby_package 'tools/log_tools' +ruby_package 'tools/roby' do |pkg| + pkg.doc_dir = File.join('doc', 'html') +end - cmake_package 'drivers/aggregator' do |pkg| - pkg.env_add_path 'OROGEN_PLUGIN_PATH', File.join(pkg.prefix, "share", "orogen", "plugins" ) - end - cmake_package 'drivers/transformer' do |pkg| - ## Keep this around as long as the refactored transformer is not in - ## stable - pkg.env_add_path 'OROGEN_PLUGIN_PATH', File.join(pkg.prefix, "share", "orogen", "plugins" ) - pkg.env_add_path 'RUBYLIB', File.join(pkg.srcdir, "ruby", "lib") - end - orogen_package 'drivers/orogen/aggregator' do |pkg| - pkg.env_add_path 'OROGEN_PLUGIN_PATH', File.join(pkg.prefix, "share", "orogen", "plugins" ) - pkg.env_add_path 'RUBYLIB', File.join(pkg.prefix, "share", "aggregator", "lib") - end - orogen_package 'drivers/orogen/transformer' do |pkg| - pkg.env_add_path 'OROGEN_PLUGIN_PATH', File.join(pkg.prefix, "share", "orogen", "plugins" ) - end +ruby_package 'tools/log_tools' - cmake_package 'perception/jpeg_conversion' do |pkg| - pkg.define "RUBY_EXECUTABLE", Autoproj.config.ruby_executable - end - metapackage 'image_processing/jpeg_conversion', 'perception/jpeg_conversion' +cmake_package 'drivers/aggregator' do |pkg| + pkg.env_add_path 'OROGEN_PLUGIN_PATH', File.join(pkg.prefix, "share", "orogen", "plugins" ) +end +cmake_package 'drivers/transformer' do |pkg| + ## Keep this around as long as the refactored transformer is not in + ## stable + pkg.env_add_path 'OROGEN_PLUGIN_PATH', File.join(pkg.prefix, "share", "orogen", "plugins" ) + pkg.env_add_path 'RUBYLIB', File.join(pkg.srcdir, "ruby", "lib") +end +orogen_package 'drivers/orogen/aggregator' do |pkg| + pkg.env_add_path 'OROGEN_PLUGIN_PATH', File.join(pkg.prefix, "share", "orogen", "plugins" ) + pkg.env_add_path 'RUBYLIB', File.join(pkg.prefix, "share", "aggregator", "lib") +end +orogen_package 'drivers/orogen/transformer' do |pkg| + pkg.env_add_path 'OROGEN_PLUGIN_PATH', File.join(pkg.prefix, "share", "orogen", "plugins" ) +end - cmake_package 'perception/frame_helper' do |pkg| - if manifest.package_enabled?('rtt', false) # the toolchain is built, add it to the rtt_target - pkg.define "OROCOS_TARGET", Autoproj.config.get('rtt_target') - end - pkg.define "RUBY_EXECUTABLE", Autoproj.config.ruby_executable - end - metapackage 'image_processing/frame_helper', 'perception/frame_helper' +cmake_package 'perception/jpeg_conversion' do |pkg| + pkg.define "RUBY_EXECUTABLE", Autoproj.config.ruby_executable +end +metapackage 'image_processing/jpeg_conversion', 'perception/jpeg_conversion' - ##### Graphical User Interface related packages - cmake_package 'gui/rock_widget_collection' do |pkg| - pkg.env_add_path 'QT_PLUGIN_PATH', File.join(pkg.prefix, "lib", "qt") +cmake_package 'perception/frame_helper' do |pkg| + if manifest.package_enabled?('rtt', false) # the toolchain is built, add it to the rtt_target + pkg.define "OROCOS_TARGET", Autoproj.config.get('rtt_target') end + pkg.define "RUBY_EXECUTABLE", Autoproj.config.ruby_executable +end +metapackage 'image_processing/frame_helper', 'perception/frame_helper' - cmake_package 'gui/qtpropertybrowser' - - ##### Base implementation for data acquisition - cmake_package 'drivers/iodrivers_base' - orogen_package 'drivers/orogen/iodrivers_base' +##### Graphical User Interface related packages +cmake_package 'gui/rock_widget_collection' do |pkg| + pkg.env_add_path 'QT_PLUGIN_PATH', File.join(pkg.prefix, "lib", "qt") end +cmake_package 'gui/qtpropertybrowser' + +##### Base implementation for data acquisition +cmake_package 'drivers/iodrivers_base' +orogen_package 'drivers/orogen/iodrivers_base' + + diff --git a/05deprecated.autobuild b/05deprecated.autobuild deleted file mode 100644 index e95ed592..00000000 --- a/05deprecated.autobuild +++ /dev/null @@ -1,4 +0,0 @@ -#This package should removed during rock-1510 release -if Rock.flavors.current_flavor.name == "stable" -end - diff --git a/06osdeps_from_source.autobuild b/06osdeps_from_source.autobuild index 0fc31d77..2da54bbf 100644 --- a/06osdeps_from_source.autobuild +++ b/06osdeps_from_source.autobuild @@ -1,22 +1,20 @@ -in_flavor 'master', 'stable' do - cmake_package 'external/opencv' do |pkg| - pkg.define("CMAKE_BUILD_TYPE","Release") - if not RUBY_PLATFORM.downcase.include?("arm") - pkg.define("ENABLE_SSE3","ON") - pkg.define("ENABLE_SSE41","OFF") - pkg.define("ENABLE_SSE42","OFF") - pkg.define("ENABLE_SSSE3","OFF") - end - pkg.define("BUILD_EXAMPLES","OFF") - pkg.define("BUILD_NEW_PYTHON_SUPPORT","OFF") - pkg.define("WITH_FFMPEG","OFF") - pkg.define("BUILD_TESTS","OFF") +cmake_package 'external/opencv' do |pkg| + pkg.define("CMAKE_BUILD_TYPE","Release") + if not RUBY_PLATFORM.downcase.include?("arm") + pkg.define("ENABLE_SSE3","ON") + pkg.define("ENABLE_SSE41","OFF") + pkg.define("ENABLE_SSE42","OFF") + pkg.define("ENABLE_SSSE3","OFF") end - Autoproj.add_osdeps_overrides 'opencv', :package => 'external/opencv' - remove_from_default 'external/opencv' - - cmake_package 'tools/poco' - Autoproj.add_osdeps_overrides 'poco', :package => 'tools/poco' - remove_from_default 'tools/poco' + pkg.define("BUILD_EXAMPLES","OFF") + pkg.define("BUILD_NEW_PYTHON_SUPPORT","OFF") + pkg.define("WITH_FFMPEG","OFF") + pkg.define("BUILD_TESTS","OFF") end +Autoproj.add_osdeps_overrides 'opencv', :package => 'external/opencv' +remove_from_default 'external/opencv' + +cmake_package 'tools/poco' +Autoproj.add_osdeps_overrides 'poco', :package => 'tools/poco' +remove_from_default 'tools/poco' diff --git a/init.rb b/init.rb index 2452f396..9921d427 100644 --- a/init.rb +++ b/init.rb @@ -52,59 +52,14 @@ Autoproj.gitorious_server_configuration('GITHUB', 'github.com', :http_url => 'https://github.com') end -require File.join(__dir__, 'rock/flavor_definition') -require File.join(__dir__, 'rock/flavor_manager') -require File.join(__dir__, 'rock/in_flavor_context') require File.join(__dir__, 'rock/current_release') require File.join(__dir__, 'rock/python') -Rock.flavors.define 'stable' -Rock.flavors.alias 'stable', 'next' -Rock.flavors.define 'master', :implicit => true - -configuration_option('ROCK_SELECTED_FLAVOR', 'string', - :default => 'master', - :possible_values => ['stable', 'master'], - :doc => [ - "Which flavor of Rock do you want to use ?", - "Stay with the default ('master') if you want to use Rock on the most recent", - "distributions (Ubuntu 16.04 and later). Use 'stable' only for ", - "now officially unsupported distributions (Ubuntu 14.04)"]) - -if Rock.in_release? && !Autoproj.config.has_value_for?('ROCK_SELECTED_FLAVOR') - Autoproj.config.set 'ROCK_SELECTED_FLAVOR', 'stable', true -end -Rock.flavors.select_current_flavor_by_name( - ENV['ROCK_FORCE_FLAVOR'] || Autoproj.config.get('ROCK_SELECTED_FLAVOR')) - -current_flavor = Rock.flavors.current_flavor - -#This check is needed because the overrides file will override the FLAVOR selection. -#Furthermore a selection != stable can cause a inconsistent layout (cause by in_flavor system in the package_sets) -if Rock.in_release? && current_flavor.branch != "stable" - if ENV['ROCK_RC'] == '1' - Autoproj.warn "" - Autoproj.warn "Found a release file and the flavor is not master" - Autoproj.warn "This would usually be an error, but since ROCK_RC is set to 1," - Autoproj.warn "it is assumed that you're preparing a release candidate" - Autoproj.warn "" - else - Autoproj.error "" - Autoproj.error "You selected the flavor '#{current_flavor.branch}' but '#{File.join(Autoproj.root_dir,"autoproj", "overrides.d", "25-release.yml")}' exists." - Autoproj.error "This means you are on a release; either unselect the release by calling 'rock-release switch master'" - Autoproj.error "or call 'autoproj reconfigure' and select the FLAVOR 'stable'" - exit 1 - end -end -Autoproj.config.set('ROCK_SELECTED_FLAVOR', current_flavor.name, true) -Autoproj.config.set('ROCK_FLAVOR', current_flavor.branch, true) -Autoproj.config.set('ROCK_BRANCH', current_flavor.branch, true) - -if current_flavor.name != 'master' && Autoproj::PackageSet.respond_to?(:add_source_file) - Autoproj::PackageSet.add_source_file "source-stable.yml" -end +# if current_flavor.name != 'master' && Autoproj::PackageSet.respond_to?(:add_source_file) +# Autoproj::PackageSet.add_source_file "source-stable.yml" +# end require File.join(__dir__, 'rock', 'cxx') if Autoproj.respond_to?(:workspace) # autoproj 2.0 @@ -114,31 +69,8 @@ end def enabled_flavor_system - Rock.flavors.register_flavored_package_set(Autoproj.current_package_set) -end - -def in_flavor(*flavors, &block) - Rock.flavors.in_flavor(*flavors, &block) -end - -def only_in_flavor(*flavors, &block) - Rock.flavors.only_in_flavor(*flavors, &block) -end - -def flavor_defined?(flavor_name) - Rock.flavors.has_flavor?(flavor_name) -end - -def package_in_flavor?(pkg, flavor_name) - Rock.flavors.package_in_flavor?(pkg, flavor_name) -end - -def add_packages_to_flavors(mappings) - Rock.flavors.add_packages_to_flavors(Autoproj.current_package_set, mappings) -end - -def remove_packages_from_flavors(mappings) - Rock.flavors.remove_packages_from_flavors(Autoproj.current_package_set, mappings) + Autoproj.warn "Flavors are deprecated" + # Rock.flavors.register_flavored_package_set(Autoproj.current_package_set) end # Defines a bundle package in the installation diff --git a/overrides.rb b/overrides.rb index 9f12e50f..089a2ca1 100644 --- a/overrides.rb +++ b/overrides.rb @@ -1,5 +1,3 @@ -Rock.flavors.finalize - Autoproj.env_add_path 'ROCK_BUNDLE_PATH', File.join(Autobuild.prefix, 'share', 'rock') Autoproj.env_add_path 'ROCK_BUNDLE_PATH', File.join(Autoproj.root_dir, 'bundles') @@ -14,10 +12,10 @@ if !%w{tools/logger base/orogen/types base/orogen/std}.include?(pkg.name) pkg.optional_dependency 'tools/logger' end - if Rock.flavors.current_flavor.name == 'master' - pkg.orogen_options << '--extensions=metadata_support' - pkg.depends_on 'tools/orogen_metadata' - end + + pkg.orogen_options << '--extensions=metadata_support' + pkg.depends_on 'tools/orogen_metadata' + if pkg.name != 'base/orogen/std' pkg.optional_dependency 'base/orogen/std' pkg.orogen_options << '--import=std' diff --git a/rock/flavor_definition.rb b/rock/flavor_definition.rb deleted file mode 100644 index 92572830..00000000 --- a/rock/flavor_definition.rb +++ /dev/null @@ -1,30 +0,0 @@ -module Rock - class FlavorDefinition - attr_reader :name - attr_reader :branch - attr_predicate :implicit?, true - attr_accessor :default_packages - attr_accessor :removed_packages - - def initialize(name, branch = name) - @name = name - @branch = branch - @implicit = false - @default_packages = Hash.new { |h, k| h[k] = Set.new } - @removed_packages = Set.new - end - - def include?(package_name) - package_name = package_name.to_str - return false if removed?(package_name) - @default_packages.any? do |pkg_set, packages| - packages.include?(package_name) - end - end - - def removed?(package_name) - removed_packages.include?(package_name.to_str) - end - end -end - diff --git a/rock/flavor_manager.rb b/rock/flavor_manager.rb deleted file mode 100644 index 9a5ef867..00000000 --- a/rock/flavor_manager.rb +++ /dev/null @@ -1,287 +0,0 @@ -module Rock - class FlavorManager - # The set of defined flavors - # - # @return [Hash] - attr_reader :flavors - # The package sets that are managed through flavors - # - # @return [Array] - attr_reader :package_sets - # The current flavor - # - # @return [FlavorDefinition] - attr_reader :current_flavor - - def initialize - @flavors = Hash.new - @package_sets = Set.new - end - - # Test if a given flavor exists - # - # @param [String] flavor_name the flavor name - def has_flavor?(flavor_name) - flavors.has_key?(flavor_name) - end - - # Resolves a flavor by its name - # @param [String] flavor_name the flavor name - # @return [FlavorDefinition] the flavor - # @raise ArgumentError if the provided name is not the name of a - # registered flavor - def flavor_by_name(flavor_name) - if flavor_def = flavors[flavor_name] - flavor_def - else - raise ArgumentError, "#{flavor_name} is not a known flavor name" - end - end - - # Tests if a given package is included in the specified flavor - # - # @param [#name,#to_str] pkg the package or its name - # @param [String] flavor_name the name of the flavor - def package_in_flavor?(pkg, flavor_name) - flavor_def = flavor_by_name(flavor_name) - if pkg.respond_to?(:name) - pkg = pkg.name - end - - if flavor_def.implicit? - pkg_set = Autoproj.manifest.find_package_definition(pkg).package_set - if package_sets.include?(pkg_set) - !flavor_def.removed?(pkg) - else - flavor_def.include?(pkg) - end - else - return flavor_def.include?(pkg) - end - end - - # Selects {current_flavor} by its name in {flavors} - def select_current_flavor_by_name(flavor_name) - if flv = flavors[flavor_name] - @current_flavor = flv - else raise ArgumentError, "#{flavor_name} is not the name of a known flavor" - end - end - - def find_all_flavors_by_branch(branch) - flavors.values.find_all { |flv| flv.branch == branch } - end - - def alias(old_name, new_name) - flavors[new_name.to_str] = flavor_by_name(old_name) - end - - # Create a new flavor in the set of known flavors, and register it on - # {flavors} - # - # @param [String] flavor_name the name of the new flavor - # @option options [Boolean] :implicit (nil) sets the new flavor's - # {FlavorDefinition#implicit?} flag - # @return [FlavorDefinition] - def define(flavor_name, options = Hash.new) - options = Kernel.validate_options(options, :implicit => nil, :branch => flavor_name) - - flavor = (flavors[flavor_name] ||= FlavorDefinition.new(flavor_name, options[:branch])) - if !options[:implicit].nil? - flavor.implicit = options[:implicit] - end - flavor - end - - # Declares that the package definitions created by the given block are - # part of the listed flavors - def in_flavor(*flavors, &block) - if flavors.last.kind_of?(Hash) - options = flavors.pop - options = Kernel.validate_options options, :strict => false - else - options = Hash.new - end - - flavor = current_flavor - - current_packages = Autoproj.manifest.each_package_definition.to_set - InFlavorContext.new(flavor.name, flavors, options[:strict]). - instance_eval(&block) - - new_packages = Autoproj.manifest.each_package_definition. - find_all { |pkg| !current_packages.include?(pkg) }. - map(&:name) - add_packages_to_flavors Autoproj.current_package_set, flavors => new_packages - end - - # Registers the given package set as being flavored - def register_flavored_package_set(package_set) - package_sets << package_set - end - - # Declares that the package definitions created by the provided block - # should be registered only if the current flavor is one of the listed - # flavors - def only_in_flavor(*flavors, &block) - if flavors.last.kind_of?(Hash) - options = flavors.pop - options, other_options = Kernel.filter_options options, :strict => true - options = options.merge(other_options) - else - options = { :strict => true } - end - flavors << options - in_flavor(*flavors, &block) - end - - def add_packages_to_flavors(package_set, mappings) - register_flavored_package_set(package_set) - mappings.each do |flavors, packages| - if !flavors.respond_to?(:to_ary) - flavors = [flavors] - end - if !packages.respond_to?(:to_ary) - packages = [packages] - end - flavors.each do |flavor_name| - flavor = flavor_by_name(flavor_name) - flavor.removed_packages -= packages.to_set - flavor.default_packages[package_set.name] |= packages.to_set - end - end - end - - def remove_packages_from_flavors(package_set, mappings) - register_flavored_package_set(package_set) - mappings.each do |flavors, packages| - if !flavors.respond_to?(:to_ary) - flavors = [flavors] - end - if !packages.respond_to?(:to_ary) - packages = [packages] - end - flavors.each do |flavor_name| - flavor = flavor_by_name(flavor_name) - flavor.removed_packages |= packages.to_set - end - end - end - - # Finalize the setup by applying the selected / removed packages to - # Autoproj's metapackages as well as by updating the current flavor's - # set of default packages (mainly if it is implicit) - def finalize - package_sets.each do |pkg_set| - meta = Autoproj.manifest.metapackages[pkg_set.name] - meta_package_names = meta.each_package.inject(Set.new) { |s, p| s << p.name } - - if current_flavor.implicit? - in_a_flavor = flavors.values.inject(Set.new) do |pkgs, other_flavor| - pkgs | other_flavor.default_packages[pkg_set.name] - end - default_packages = (meta_package_names - in_a_flavor) | - current_flavor.default_packages[pkg_set.name] - else - default_packages = current_flavor.default_packages[pkg_set.name] - end - default_packages -= current_flavor.removed_packages - default_packages = default_packages.to_set - current_flavor.default_packages[pkg_set.name] = default_packages - - (meta_package_names - default_packages).each do |pkg_name| - meta.remove(pkg_name) - end - end - end - - # Verifies that the package's branch is not a flavor that they are not - # included in (i.e. a package cannot be on the 'next' branch if it is - # not included in the 'next' flavor). Resets the branch of these - # packages to the given default branch - def reset_invalid_branches_to(default_branch = 'master') - switched_packages = Array.new - Autoproj.manifest.each_package_definition do |pkg_def| - pkg = pkg_def.autobuild - next if !pkg.importer.kind_of?(Autobuild::Git) - next if pkg.importer.branch == default_branch - - flavors = find_all_flavors_by_branch(pkg.importer.branch) - if !flavors.empty? && !flavors.any? { |flv| flv.include?(pkg.name) } - vcs_raw = pkg_def.vcs.raw.reverse. - map do |entry| - if entry.kind_of?(Array) - entry[1] - else - entry.vcs - end - end. - find { |vcs_options| vcs_options['branch'] } - if !vcs_raw || vcs_raw['branch'] !~ /ROCK_FLAVOR|ROCK_BRANCH/ - switched_packages << [pkg, pkg.importer.branch] - end - pkg.importer.branch = default_branch - end - end - switched_packages - end - - # Finds all packages which should have been on a branch that is the - # flavor's branch, but are actually on a different one - def find_all_overriden_flavored_branches - wrong_branch = Array.new - Autoproj.manifest.each_package_definition do |pkg_def| - pkg = pkg_def.autobuild - next if !pkg.importer.kind_of?(Autobuild::Git) - - if package_in_flavor?(pkg, current_flavor.name) && - pkg.importer.branch != current_flavor.branch - - # We have to check whether it is expected to be using the flavor name as - # its branch. Some packages are not ... - # - # To do so, we find the first package set that sets the branch to - # ROCK_FLAVOR *and* verify that the same package set is not overriding - # it to something else (to avoid false positives in case catch-all - # entries apply) - vcs = pkg_def.vcs.raw.group_by(&:first) - branch_should_be_flavor_name = vcs.any? do |_, info| - if !info.empty? - info.all? do |entry| - if entry.kind_of?(Array) - vcs_options = entry[1] - else - vcs_options = entry.vcs - end - vcs_options['branch'] && vcs_options['branch'] =~ /ROCK_FLAVOR|ROCK_BRANCH/ - end - end - end - if branch_should_be_flavor_name - wrong_branch << pkg - end - end - end - wrong_branch - end - - def verify_cross_flavor_dependencies(pkg) - if (flv = flavors[pkg.importer.branch]) && flv.include?(pkg.name) - #Skip packages that are only on master, because packages for 'master' - #are not automaticly added to the master flavor. So the check would fail - return if flv.name == 'master' - - pkg.dependencies.each do |dep_name| - if !flv.include?(dep_name) - raise Autoproj::ConfigError, "#{pkg.name}, in flavor #{flv.name}, depends on #{dep_name} which is not included in this flavor" - end - end - end - end - end - - def self.flavors - @flavors ||= FlavorManager.new - end -end - diff --git a/rock/in_flavor_context.rb b/rock/in_flavor_context.rb deleted file mode 100644 index 7a475e65..00000000 --- a/rock/in_flavor_context.rb +++ /dev/null @@ -1,74 +0,0 @@ -module Rock - # Context object used to evaluate the blocks given to in_flavor and only_in_flavor - class InFlavorContext < BasicObject - # @return [String] the name of the currently selected flavor - attr_reader :current_flavor_name - # @return [Array] the set of flavors the context is made of - # (e.g. the flavors given to the in_flavor method) - attr_reader :flavors - # @return [Boolean] whether the package definitions present in the block - # should always be processed (false), or if they should be processed - # only if the current flavor is included in {flavors} (true) - attr_reader :strict - - def initialize(current_flavor_name, flavors, strict) - @current_flavor_name, @flavors, @strict = - current_flavor_name, flavors, strict - end - - def method_missing(m, *args, &block) - # We only pass the *_package method calls - if m.to_s =~ /^\w+_package$/ - package_name = args.first - - manifest = ::Autoproj.manifest - if existing_package = manifest.find_package_definition(package_name) - package_set = existing_package.package_set - else - package_set = ::Autoproj.current_package_set - end - if ::Autoproj.respond_to?(:workspace) # autoproj v2 - vcs = manifest.importer_definition_for(package_name, package_set: package_set, require_existing: false) - else - vcs = manifest.importer_definition_for(package_name, package_set) - end - - if !vcs - ::Kernel.raise ::ArgumentError, "#{package_name} has no version control definition in #{::File.join(package_set.local_dir, 'source.yml')}" - end - - branch_is_flavor = ::TOPLEVEL_BINDING.instance_eval do - vcs.options[:branch] && flavor_defined?(vcs.options[:branch]) - end - - if branch_is_flavor - flavor_name = vcs.options[:branch] - else flavor_name = current_flavor_name - end - - if !strict || flavors.include?(flavor_name) - if block - ::TOPLEVEL_BINDING.instance_eval do - send(m, *args) do |pkg| - # We need to rebind the block into the toplevel binding so - # that toplevel methods used there get defined (again) - ::TOPLEVEL_BINDING.instance_exec(pkg, &block) - end - end - else - ::TOPLEVEL_BINDING.instance_eval do - send(m, *args) - end - end - end - elsif strict - ::Kernel.raise ::ArgumentError, "only calls to the package definition methods are allows in only_in_flavor (found #{m})" - else - ::TOPLEVEL_BINDING.instance_eval do - send(m, *args, &block) - end - end - end - end -end - diff --git a/source-stable.yml b/source-stable.yml index 85f1dde9..18d80ab1 100644 --- a/source-stable.yml +++ b/source-stable.yml @@ -1,18 +1,18 @@ -version_control: - - tools/rubigen: - commit: 7b3ccf69d2463a2741b18ef9fca90abef2116496 - - eigen3: - type: archive - url: https://bitbucket.org/eigen/eigen/get/3.2.1.tar.gz - update_cached_file: false - - external/sisl: - github: SINTEF-Geometry/SISL - tag: SISL_4_5_0 - - external/opencv: - type: archive - url: http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.3.1/OpenCV-2.3.1a.tar.bz2 - update_cached_file: false -overrides: - - (ocl|log4cpp): - branch: toolchain-2.6 +# version_control: +# - tools/rubigen: +# commit: 7b3ccf69d2463a2741b18ef9fca90abef2116496 +# - eigen3: +# type: archive +# url: https://bitbucket.org/eigen/eigen/get/3.2.1.tar.gz +# update_cached_file: false +# - external/sisl: +# github: SINTEF-Geometry/SISL +# tag: SISL_4_5_0 +# - external/opencv: +# type: archive +# url: http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.3.1/OpenCV-2.3.1a.tar.bz2 +# update_cached_file: false +# overrides: +# - (ocl|log4cpp): +# branch: toolchain-2.6 From cafe81d01ecac4b684118d6d882abd276ecf45dd Mon Sep 17 00:00:00 2001 From: Steffen Planthaber Date: Thu, 14 Nov 2024 09:55:31 +0100 Subject: [PATCH 2/3] re-add flavor functions ass noop with warning --- init.rb | 43 +++++++++++++++++++++++++++++++++++-------- source-stable.yml | 18 ------------------ 2 files changed, 35 insertions(+), 26 deletions(-) delete mode 100644 source-stable.yml diff --git a/init.rb b/init.rb index 9921d427..6a5361fd 100644 --- a/init.rb +++ b/init.rb @@ -56,10 +56,42 @@ require File.join(__dir__, 'rock/python') +# backward compatibility for the deprecated flavor system +Autoproj.config.set('ROCK_SELECTED_FLAVOR', "master") +Autoproj.config.set('ROCK_FLAVOR', "master") +Autoproj.config.set('ROCK_BRANCH', "master") -# if current_flavor.name != 'master' && Autoproj::PackageSet.respond_to?(:add_source_file) -# Autoproj::PackageSet.add_source_file "source-stable.yml" -# end + +def enabled_flavor_system + Autoproj.warn "Flavors system was removed, please remove flavor-related code from your package_sets" +end + +def in_flavor(*flavors, &block) + Autoproj.warn "Flavors system was removed, please remove flavor-related code from your package_sets" + return false +end + +def only_in_flavor(*flavors, &block) + Autoproj.warn "Flavors system was removed, please remove flavor-related code from your package_sets" +end + +def flavor_defined?(flavor_name) + Autoproj.warn "Flavors system was removed, please remove flavor-related code from your package_sets" + return false +end + +def package_in_flavor?(pkg, flavor_name) + Autoproj.warn "Flavors system was removed, please remove flavor-related code from your package_sets" + return false +end + +def add_packages_to_flavors(mappings) + Autoproj.warn "Flavors system was removed, please remove flavor-related code from your package_sets" +end + +def remove_packages_from_flavors(mappings) + Autoproj.warn "Flavors system was removed, please remove flavor-related code from your package_sets" +end require File.join(__dir__, 'rock', 'cxx') if Autoproj.respond_to?(:workspace) # autoproj 2.0 @@ -68,11 +100,6 @@ Rock.setup_cxx_support(Autoproj.osdeps, Autoproj.config) end -def enabled_flavor_system - Autoproj.warn "Flavors are deprecated" - # Rock.flavors.register_flavored_package_set(Autoproj.current_package_set) -end - # Defines a bundle package in the installation # # So far, bundles are mostly Ruby packages diff --git a/source-stable.yml b/source-stable.yml deleted file mode 100644 index 18d80ab1..00000000 --- a/source-stable.yml +++ /dev/null @@ -1,18 +0,0 @@ -# version_control: -# - tools/rubigen: -# commit: 7b3ccf69d2463a2741b18ef9fca90abef2116496 -# - eigen3: -# type: archive -# url: https://bitbucket.org/eigen/eigen/get/3.2.1.tar.gz -# update_cached_file: false -# - external/sisl: -# github: SINTEF-Geometry/SISL -# tag: SISL_4_5_0 -# - external/opencv: -# type: archive -# url: http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.3.1/OpenCV-2.3.1a.tar.bz2 -# update_cached_file: false -# overrides: -# - (ocl|log4cpp): -# branch: toolchain-2.6 - From cbc644d276a5ff03f41c0defdde9857cec930301 Mon Sep 17 00:00:00 2001 From: Steffen Planthaber Date: Thu, 14 Nov 2024 10:30:19 +0100 Subject: [PATCH 3/3] remove $ROCK_BRANCH from source.yml, but still add it to the config.yml --- init.rb | 12 +++++++++--- source.yml | 18 ------------------ 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/init.rb b/init.rb index 6a5361fd..33509414 100644 --- a/init.rb +++ b/init.rb @@ -57,9 +57,15 @@ # backward compatibility for the deprecated flavor system -Autoproj.config.set('ROCK_SELECTED_FLAVOR', "master") -Autoproj.config.set('ROCK_FLAVOR', "master") -Autoproj.config.set('ROCK_BRANCH', "master") +if !Autoproj.config.has_value_for?('ROCK_SELECTED_FLAVOR') then + Autoproj.config.set('ROCK_SELECTED_FLAVOR', "master") +end +if !Autoproj.config.has_value_for?('ROCK_FLAVOR') then + Autoproj.config.set('ROCK_FLAVOR', "master") +end +if !Autoproj.config.has_value_for?('ROCK_BRANCH') then + Autoproj.config.set('ROCK_BRANCH', "master") +end def enabled_flavor_system diff --git a/source.yml b/source.yml index 0d76aab5..78836abb 100644 --- a/source.yml +++ b/source.yml @@ -6,53 +6,39 @@ imports: version_control: - base/.*: github: rock-core/base-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - base/orogen/.*: github: rock-core/base-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - base/templates/.*: github: rock-core/base-templates-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - base/templates/doc: github: rock-core/base-templates-doc_preview - branch: $ROCK_BRANCH - base/templates/cmake_vizkit_widget: github: rock-core/base-templates-vizkit_widget - branch: $ROCK_BRANCH - base/templates/vizkit3d_plugin: github: rock-core/base-templates-vizkit3d_plugin - branch: $ROCK_BRANCH - base/doc: github: rock-core/base-doc - branch: $ROCK_BRANCH - tools/[^/]*: github: rock-core/tools-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - tools/orogen/.*: github: rock-core/tools-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - tools/orocos.rb: github: rock-core/tools-orocosrb - branch: $ROCK_BRANCH - drivers/.*: github: rock-core/drivers-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - gui/.*: github: rock-core/gui-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - gui/qtpropertybrowser: github: rock-core/gui-QtPropertyBrowser - drivers/orogen/.*: github: rock-core/drivers-orogen-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - perception/.*: github: rock-core/perception-$PACKAGE_BASENAME - branch: $ROCK_BRANCH - tools/autoproj: github: rock-core/autoproj @@ -67,7 +53,6 @@ version_control: - bundles/.*: github: rock-core/bundles-$PACKAGE_BASENAME.git - branch: $ROCK_BRANCH - external/sisl: github: SINTEF-Geometry/SISL @@ -95,9 +80,6 @@ version_control: tag: cpp-3.1.1 overrides: - - ^(orogen|typelib|rtt|utilrb|utilmm|rtt_typelib|tools/metaruby)$: - branch: $ROCK_BRANCH - - rtt: github: rock-core/rtt - orogen: