diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 1fd8ea1..117b337 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -86,7 +86,7 @@ jobs: - script: | call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/recipe/19.patch b/recipe/19.patch deleted file mode 100644 index 23a3229..0000000 --- a/recipe/19.patch +++ /dev/null @@ -1,461 +0,0 @@ -From 33a04fc7db005bbbdacb9f5c91d13effb9b326cc Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Wed, 31 Mar 2021 18:32:40 +0200 -Subject: [PATCH] Add IGN_UTILS_VENDOR_CLI11 to optionally use external CLI11 - -Signed-off-by: Silvio Traversaro ---- - CMakeLists.txt | 16 +++++++++++++--- - .../include/ignition/utils/CMakeLists.txt | 1 + - .../include/ignition/utils/cli/App.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/CLI.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/Config.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/ConfigFwd.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/Error.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/Formatter.hpp | 18 ++++++++++++++++++ - .../ignition/utils/cli/FormatterFwd.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/Macros.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/Option.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/Split.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/StringTools.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/Timer.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/TypeTools.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/Validators.hpp | 18 ++++++++++++++++++ - .../include/ignition/utils/cli/Version.hpp | 18 ++++++++++++++++++ - external-cli/src/CMakeLists.txt | 7 +++++++ - 18 files changed, 291 insertions(+), 3 deletions(-) - create mode 100644 external-cli/include/ignition/utils/CMakeLists.txt - create mode 100644 external-cli/include/ignition/utils/cli/App.hpp - create mode 100644 external-cli/include/ignition/utils/cli/CLI.hpp - create mode 100644 external-cli/include/ignition/utils/cli/Config.hpp - create mode 100644 external-cli/include/ignition/utils/cli/ConfigFwd.hpp - create mode 100644 external-cli/include/ignition/utils/cli/Error.hpp - create mode 100644 external-cli/include/ignition/utils/cli/Formatter.hpp - create mode 100644 external-cli/include/ignition/utils/cli/FormatterFwd.hpp - create mode 100644 external-cli/include/ignition/utils/cli/Macros.hpp - create mode 100644 external-cli/include/ignition/utils/cli/Option.hpp - create mode 100644 external-cli/include/ignition/utils/cli/Split.hpp - create mode 100644 external-cli/include/ignition/utils/cli/StringTools.hpp - create mode 100644 external-cli/include/ignition/utils/cli/Timer.hpp - create mode 100644 external-cli/include/ignition/utils/cli/TypeTools.hpp - create mode 100644 external-cli/include/ignition/utils/cli/Validators.hpp - create mode 100644 external-cli/include/ignition/utils/cli/Version.hpp - create mode 100644 external-cli/src/CMakeLists.txt - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 67958a7..b5ab0ae 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -21,19 +21,29 @@ ign_configure_project(VERSION_SUFFIX) - # Set project-specific options - #============================================================================ - --# ignition-utils currently has no options that are unique to it -+option( -+ IGN_UTILS_VENDOR_CLI11 -+ "If true, use the vendored version of CLI11, otherwise use an external one" -+ true) - - #============================================================================ - # Search for project-specific dependencies - #============================================================================ - --# ignition-utils shouldn't have any dependencies besides ign-cmake -+if(IGN_UTILS_VENDOR_CLI11) -+ set(IGN_UTILS_COMPONENTS "cli") -+else() -+ # PKGCONFIG_IGNORE can be removed once pkg-config support in CLI11 (see -+ # https://github.com/CLIUtils/CLI11/pull/523) is released -+ ign_find_package(CLI11 REQUIRED_BY cli PKGCONFIG_IGNORE) -+ set(IGN_UTILS_COMPONENTS "external-cli") -+endif() - - #============================================================================ - # Configure the build - #============================================================================ - ign_configure_build(QUIT_IF_BUILD_ERRORS -- COMPONENTS cli) -+ COMPONENTS ${IGN_UTILS_COMPONENTS}) - - #============================================================================ - # Create package information -diff --git a/external-cli/include/ignition/utils/CMakeLists.txt b/external-cli/include/ignition/utils/CMakeLists.txt -new file mode 100644 -index 0000000..12c13b8 ---- /dev/null -+++ b/external-cli/include/ignition/utils/CMakeLists.txt -@@ -0,0 +1 @@ -+ign_install_all_headers(COMPONENT cli) -diff --git a/external-cli/include/ignition/utils/cli/App.hpp b/external-cli/include/ignition/utils/cli/App.hpp -new file mode 100644 -index 0000000..dce0aa8 ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/App.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/CLI.hpp b/external-cli/include/ignition/utils/cli/CLI.hpp -new file mode 100644 -index 0000000..03d4cde ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/CLI.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/Config.hpp b/external-cli/include/ignition/utils/cli/Config.hpp -new file mode 100644 -index 0000000..41133fa ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/Config.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/ConfigFwd.hpp b/external-cli/include/ignition/utils/cli/ConfigFwd.hpp -new file mode 100644 -index 0000000..a97570e ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/ConfigFwd.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/Error.hpp b/external-cli/include/ignition/utils/cli/Error.hpp -new file mode 100644 -index 0000000..4f5bebf ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/Error.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/Formatter.hpp b/external-cli/include/ignition/utils/cli/Formatter.hpp -new file mode 100644 -index 0000000..2cabea5 ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/Formatter.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/FormatterFwd.hpp b/external-cli/include/ignition/utils/cli/FormatterFwd.hpp -new file mode 100644 -index 0000000..ec407b3 ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/FormatterFwd.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/Macros.hpp b/external-cli/include/ignition/utils/cli/Macros.hpp -new file mode 100644 -index 0000000..9af7813 ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/Macros.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/Option.hpp b/external-cli/include/ignition/utils/cli/Option.hpp -new file mode 100644 -index 0000000..7f8379b ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/Option.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/Split.hpp b/external-cli/include/ignition/utils/cli/Split.hpp -new file mode 100644 -index 0000000..6995e99 ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/Split.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/StringTools.hpp b/external-cli/include/ignition/utils/cli/StringTools.hpp -new file mode 100644 -index 0000000..f3d996d ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/StringTools.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/Timer.hpp b/external-cli/include/ignition/utils/cli/Timer.hpp -new file mode 100644 -index 0000000..63758f6 ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/Timer.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/TypeTools.hpp b/external-cli/include/ignition/utils/cli/TypeTools.hpp -new file mode 100644 -index 0000000..979a7e8 ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/TypeTools.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/Validators.hpp b/external-cli/include/ignition/utils/cli/Validators.hpp -new file mode 100644 -index 0000000..219bc51 ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/Validators.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/include/ignition/utils/cli/Version.hpp b/external-cli/include/ignition/utils/cli/Version.hpp -new file mode 100644 -index 0000000..0b4772b ---- /dev/null -+++ b/external-cli/include/ignition/utils/cli/Version.hpp -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (C) 2021 Open Source Robotics Foundation -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ * -+ */ -+ -+#include -diff --git a/external-cli/src/CMakeLists.txt b/external-cli/src/CMakeLists.txt -new file mode 100644 -index 0000000..b81f671 ---- /dev/null -+++ b/external-cli/src/CMakeLists.txt -@@ -0,0 +1,7 @@ -+ign_add_component( -+ cli -+ INTERFACE -+ INDEPENDENT_FROM_PROJECT_LIB -+ GET_TARGET_NAME component) -+ -+target_link_libraries(${component} INTERFACE CLI11::CLI11) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 40d5050..ec98911 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set component_name = "utils" %} {% set base_name = "libignition-" + component_name %} -{% set version = "1_1.0.0" %} +{% set version = "1_1.1.0" %} {% set version_clean = version.split('_')[1] %} {% set major_version = version_clean.split('.')[0] %} {% set name = base_name + major_version %} @@ -11,12 +11,10 @@ package: source: - url: https://github.com/ignitionrobotics/ign-{{ component_name }}/archive/ignition-{{ component_name }}{{ version }}.tar.gz - sha256: bd024164f12f66e125b544602ec481f6760d5a710aeb62d34a015fb598ee5a0a - patches: - - 19.patch + sha256: 4f40698ea2390c4f6835a184c02aaa31863923fdc737002e1e636afc2d0b1c72 build: - number: 2 + number: 0 run_exports: - {{ pin_subpackage(name, max_pin='x') }}