From ae6dea798f4efdd6394ddd8a550852241ee7309a Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes@intermodalics.eu>
Date: Mon, 18 May 2020 16:08:36 +0200
Subject: [PATCH 1/2] cmake: add CMake option BUILD_OROGEN (defaults to OFF)

orogen dependency utilrb depends on metaruby (https://github.com/rock-core/tools-metaruby),
a package that is not available from default package repostories of common Linux
distributions. It needs to be installed as a Ruby gem or from source.

Until a unified way of bootstrapping the toolchain with or without Ruby and optional
packages I therefore suggest to disable orogen for CMake-based builds by default.
---
 CMakeLists.txt | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f441413..4a46f69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,6 +80,11 @@ else()
   set(CORBA_IMPLEMENTATION ${CORBA_IMPLEMENTATION} CACHE STRING "The implementation of CORBA to use (allowed values: TAO or OMNIORB )" )
 endif()
 
+#
+# Enable/disable orogen and dependencies
+#
+option(BUILD_OROGEN "Build orogen and its dependencies" OFF)
+
 #############
 # Git magic #
 #############
@@ -171,16 +176,18 @@ build_external_project(ocl
   DEPENDS log4cpp rtt
 )
 
-build_external_project(utilrb)
-build_external_project(typelib
-  DEPENDS utilrb
-)
-build_external_project(rtt_typelib
-  DEPENDS rtt typelib
-)
-build_external_project(orogen
-  DEPENDS rtt rtt_typelib utilrb
-)
+if(BUILD_OROGEN)
+  build_external_project(utilrb)
+  build_external_project(typelib
+    DEPENDS utilrb
+  )
+  build_external_project(rtt_typelib
+    DEPENDS rtt typelib
+  )
+  build_external_project(orogen
+    DEPENDS rtt rtt_typelib utilrb
+  )
+endif()
 
 #######################################
 # Build orocos_toolchain meta package #

From b8b7b2f7965886c6ba6dad9ac4e11bc06b6c7c6d Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes@intermodalics.eu>
Date: Mon, 18 May 2020 16:30:05 +0200
Subject: [PATCH 2/2] orocos_toolchain: update metapackage package.xml to
 version 3 and update maintainer email

---
 orocos_toolchain/package.xml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/orocos_toolchain/package.xml b/orocos_toolchain/package.xml
index 6622af6..65a0eca 100644
--- a/orocos_toolchain/package.xml
+++ b/orocos_toolchain/package.xml
@@ -1,26 +1,23 @@
-<package>
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
   <name>orocos_toolchain</name>
   <version>2.9.0</version>
   <description>
-    This package provides the entire orocos_toolchain
+    This metapackage provides Orocos RTT and OCL and dependencies.
   </description>
-  <maintainer email="orocos-dev@lists.mech.kuleuven.be">Orocos Developers</maintainer>
-  <license>GPL v2 + linking exception, LGPL v2, CeCILL-B, GPL v2 or later, </license>
+  <license>GPL v2 + linking exception<license>
+  <licence>LGPL-2.1</license>
+  <maintainer email="orocos-dev@orocos.org">Orocos Developers</maintainer>
 
-  <buildtool_depend>catkin</buildtool_depend>
-  <run_depend>catkin</run_depend>
+  <buildtool_depend>catkin</buildtool_depend> <!-- optional -->
 
-  <run_depend>rtt</run_depend>
-  <run_depend>ocl</run_depend>
-  <run_depend>log4cpp</run_depend>
-  <run_depend>rtt_typelib</run_depend>
-  <run_depend>typelib</run_depend>
-  <run_depend>utilrb</run_depend>
-  <run_depend>orogen</run_depend>
+  <depend>log4cpp</depend>
+  <depend>ocl</depend>
+  <depend>rtt</depend>
 
   <export>
     <metapackage/>
   </export>
 
 </package>
-