build: update to conan 2.0.10 for getting doxygen versions

tomtom-international · Sep 15, 2023 · 0b09dd3 · 0b09dd3
1 parent 33b1c6e
commit 0b09dd3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -133,15 +133,15 @@ docs: doxygen ## generate documentation
 define DOXYGEN_template
 doxygen-$(1):
 	CONAN_USER_HOME=$(BUILD_DIR) CONAN_DEFAULT_PROFILE_PATH="" DOXYGEN_VERSION=$(1) \
-									conan install doxygen/conanfile.py --install-folder=build/doxygen-$(1) --build missing
+									conan install doxygen/conanfile.py --output-folder=build/doxygen-$(1) --build missing -u
 endef
 $(foreach version,$(DOXYGEN_VERSIONS),$(eval $(call DOXYGEN_template,$(version))))
 
 doxygen: doxygen-$(LATEST_DOXYGEN_VERSION) ## Install the latest doxygen version
 
 define GENERATE_TEST_XML_template
 generate-test-xml-$(1): doxygen-$(1)
-	. build/doxygen-$(1)/activate_run.sh; cd tests/data/source_code; python3 generate_xml.py doxygen
+	. build/doxygen-$(1)/conanbuildenv.sh; cd tests/data/source_code; python3 generate_xml.py doxygen
 
 ALL_GENERATE_TEST_XML := $$(ALL_GENERATE_TEST_XML) generate-test-xml-$(1)
 endef

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,6 +1,6 @@
 build==1.0.3
 colorclass==2.2.2
-conan==1.59.0
+conan==2.0.10
 coverage==7.3.1
 doxypypy==0.8.8.7
 flake8==6.1.0

diff --git a/doxygen/conanfile.py b/doxygen/conanfile.py
@@ -14,13 +14,16 @@
 
 import os
 
-from conans import ConanFile
+from conan import ConanFile
 
 
 class DoxygenConan(ConanFile):
     generators = (
-        "virtualrunenv",
+        "VirtualBuildEnv",
     )
-    build_requires = (
+    tool_requires = (
         f"doxygen/{os.environ['DOXYGEN_VERSION']}",
     )
+    default_build_options = {
+        "doxygen/*:enable_search": False,
+    }