Skip to content
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

Jump to bottom

added configuration option for xml importer #85

Closed
wants to merge 1 commit into from
Closed

added configuration option for xml importer #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions init.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@

current_flavor = Rock.flavors.current_flavor

#The following option is used to determine which xml importer should be used.
#Currently castxml is working

configuration_option('TYPELIB_CXX_LOADER', 'string',
:default => 'castxml',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keyword argument syntax is key: value. :key => value only works as a backward compatibility feature.

:possible_values => ['gccxml', 'castxml'],
:doc => [
"Which xml importer should be used?",
"Currently only castxml is working when using master flavor"])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not true. It is only required on gcc5 machines. One way could be to try and detect whether gcc is gcc5 and select gccxml/castxml on this basis.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually it is required, as soon as you use C++11 features in transport types, or if you use gcc5

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well ... then I'm missing the point of letting it be a configuration option. If we require C++11 in the next release and in master, then starting with master and the next release, C++11 should be enabled unconditionally. Let's not burden the whole thing with optional behaviours ....

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then we need to drop 14.04. CastXML is missing a patch in the osdep version on 14.04

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well. The next release should definitely not support 14.04 IMO.

Can castxml be built on 14.04 ? It does not exist as ubuntu package there, and the llvm version is too old.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, I thought the 14.04 support requirement came from you. Who brought it up then ? Do we have a rule about this or something ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are supposed to keep support for the old LTS until LTS+1 is out (i.e. 16.10)

Given the timeline, I would either (1) decide to drop that rule or (2) release master as-is RIGHT NOW and re-release with C++11 support at the end of the year.


Autoproj.env_set 'TYPELIB_CXX_LOADER', Autoproj.config.get('TYPELIB_CXX_LOADER')

#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 File.exists?(File.join(Autoproj.root_dir, "autoproj", "overrides.d", "25-release.yml")) && current_flavor.branch != "stable"
Expand Down