Skip to content

remove flavors #246

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
planthaber wants to merge 3 commits into
base: master
Choose a base branch
from
Open

remove flavors #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b803f49
remove flavors
planthaber Nov 12, 2024
cafe81d
re-add flavor functions ass noop with warning
planthaber Nov 14, 2024
cbc644d
remove $ROCK_BRANCH from source.yml, but still add it to the config.yml
planthaber Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 25 additions & 28 deletions 02master.autobuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Loading