gen: cleanup the installation of local headers

The old code was full of weird assumptions that have been made
at least partially obsolete by the latest changes. Update the codegen.

Author: doudou

lib/orogen/gen/typekit.rb

@@ -1125,8 +1125,8 @@ def has_opaques_with_templates?
             attr_reader :local_loads_symlinks
 
             # Handle a load that points to a file in this typekit's source tree
-            def handle_local_load(file)
-                rel = Pathname.new(file).relative_path_from(Pathname.new(base_dir))
+            def handle_local_load(file, relative_path_from: base_dir)
+                rel = Pathname.new(file).relative_path_from(Pathname.new(relative_path_from))
                 return file if rel.each_filename.first == ".."
 
                 # If the type is within a subdirectory called as the
@@ -1166,11 +1166,7 @@ def handle_local_load(file)
             # the exact offsets for all the fields in the structures).
             #
             # @raises LoadError if the file does not exist
-	    def load(file, add = true, user_options = Hash.new)
-                if !user_options.respond_to?(:to_hash) 
-                    raise ArgumentError, "expected an option has as third argument, got #{user_options.inspect}"
-                end
-
+	    def load(file, add = true, relative_path_from: base_dir, **user_options)
                 if match = /(\w+)\/Types\.hpp$/.match(file)
                     project_name = match[1]
                     if project.has_typekit?(project_name) || project.name == project_name
@@ -1184,7 +1180,7 @@ def load(file, add = true, user_options = Hash.new)
                 # Get the full path for +file+
                 if File.file?(file) # Local file
                     file = File.expand_path(file)
-                    include_statement = handle_local_load(file)
+                    include_statement = handle_local_load(file, relative_path_from: relative_path_from)
                 else # File from used libraries/task libraries
                     dir = include_dirs.find { |dir| File.file?(File.join(dir, file)) }
                     if !dir
@@ -1808,7 +1804,7 @@ def handle_opaques_generation(generated_types)
                         render_template 'typekit', 'marshalling_types.hpp', binding
 
                     path = save_automatic_public_header "m_types", "#{type.method_name(true)}.hpp", marshalling_code
-                    self.load(path, true, options)
+                    self.load(path, true, relative_path_from: automatic_public_header_dir, **options)
 
                     m_type = intermediate_type_for(type)
                     copy_metadata_to_intermediate_type(type.metadata, m_type.metadata)

lib/orogen/templates/typekit/CMakeLists.txt

@@ -155,14 +155,23 @@ install(FILES
 	relatives.sort.join("\n    ") %>
     DESTINATION include/orocos/<%= typekit.name %>/typekit)
 
-<% (public_header_files + typekit.included_files).each do |inc|
-    full_path = Pathname.new(typekit.automatic_dir).join('types', inc)
-    next if !full_path.exist?
-    target_dir = File.dirname(inc)
-    if full_path.symlink?
-       full_path = full_path.readlink
-    end
-    source_file = full_path.relative_path_from(Pathname.new(typekit.automatic_dir)) %>
+<% automatic_public_header_dir = Pathname.new(typekit.automatic_public_header_dir)
+   automatic_dir = Pathname.new(typekit.automatic_dir) %>
+
+<% public_header_files.each do |full_path|
+      full_path  = Pathname.new(full_path)
+      target_dir = full_path.dirname.relative_path_from(automatic_public_header_dir)
+      if full_path.symlink?
+         full_path = full_path.readlink
+      end
+      source_file = full_path.relative_path_from(automatic_dir) %>
+install(FILES <%= source_file.to_path %>
+    DESTINATION include/orocos/<%= target_dir.to_path %>)
+<% end %>
+
+<% typekit.local_loads_symlinks.each do |full_path, include_statement|
+    source_file = Pathname.new(full_path).relative_path_from(automatic_dir)
+    target_dir = File.dirname(include_statement) %>
 install(FILES <%= source_file.to_path %>
     DESTINATION include/orocos/<%= target_dir %>)
 <% end %>