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.

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

Add doxygen/1.12.0 #25287

Closed
wants to merge 17 commits into from
Closed
67 changes: 5 additions & 62 deletions recipes/doxygen/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,63 +1,6 @@
sources:
"1.9.4":
url: "https://sourceforge.net/projects/doxygen/files/doxygen-1.9.4.src.tar.gz"
sha256: "a15e9cd8c0d02b7888bc8356eac200222ecff1defd32f3fe05257d81227b1f37"
"1.9.2":
url: "https://sourceforge.net/projects/doxygen/files/doxygen-1.9.2.src.tar.gz"
sha256: "060f254bcef48673cc7ccf542736b7455b67c110b30fdaa33512a5b09bbecee5"
"1.9.1":
url: "https://sourceforge.net/projects/doxygen/files/doxygen-1.9.1.src.tar.gz"
sha256: "67aeae1be4e1565519898f46f1f7092f1973cce8a767e93101ee0111717091d1"
"1.8.20":
url: "https://sourceforge.net/projects/doxygen/files/doxygen-1.8.20.src.tar.gz"
sha256: "e0db6979286fd7ccd3a99af9f97397f2bae50532e4ecb312aa18862f8401ddec"
"1.8.18":
url: "https://sourceforge.net/projects/doxygen/files/doxygen-1.8.18.src.tar.gz"
sha256: "18173d9edc46d2d116c1f92a95d683ec76b6b4b45b817ac4f245bb1073d00656"
"1.8.17":
url: "https://sourceforge.net/projects/doxygen/files/doxygen-1.8.17.src.tar.gz"
sha256: "2cba988af2d495541cbbe5541b3bee0ee11144dcb23a81eada19f5501fd8b599"
patches:
"1.9.4":
- patch_file: "patches/1.9.4-0001-enable-modern-compilers.patch"
patch_description: "Enable modern compilers"
patch_type: "portability"
patch_source: "https://github.com/doxygen/doxygen/commit/5198966c8d5fec89116d025c74934ac03ea511fa"
- patch_file: "patches/1.9.4-0002-fix-iconv-linkage.patch"
patch_description: "Replace IConv CMake variables by Conan CMake targets"
patch_type: "conan"
"1.9.2":
- patch_file: "patches/1.9.2-0001-imported-target.patch"
patch_description: "Fix includes"
patch_type: "portability"
- patch_file: "patches/1.9.2-0002-fix-iconv-linkage.patch"
patch_description: "Replace IConv CMake variables by Conan CMake targets"
patch_type: "conan"
"1.9.1":
- patch_file: "patches/1.9.1-0001-imported-target.patch"
patch_description: "Fix includes"
patch_type: "portability"
- patch_file: "patches/1.9.1-0002-fix-iconv-linkage.patch"
patch_description: "Replace IConv CMake variables by Conan CMake targets"
patch_type: "conan"
"1.8.20":
- patch_file: "patches/1.8-0001-xapian.patch"
patch_description: "Fix xapian find_package command"
patch_type: "portability"
- patch_file: "patches/1.8.20-0002-fix-iconv-linkage.patch"
patch_description: "Replace IConv CMake variables by Conan CMake targets"
patch_type: "conan"
"1.8.18":
- patch_file: "patches/1.8-0001-xapian.patch"
patch_description: "Fix xapian find_package command"
patch_type: "portability"
- patch_file: "patches/1.8.18-0002-fix-iconv-linkage.patch"
patch_description: "Replace IConv CMake variables by Conan CMake targets"
patch_type: "conan"
"1.8.17":
- patch_file: "patches/1.8-0001-xapian.patch"
patch_description: "Fix xapian find_package command"
patch_type: "portability"
- patch_file: "patches/1.8.17-0002-fix-iconv-linkage.patch"
patch_description: "Replace IConv CMake variables by Conan CMake targets"
patch_type: "conan"
"1.12.0":
url:
- "https://github.com/doxygen/doxygen/releases/download/Release_1_12_0/doxygen-1.12.0.src.tar.gz"
- "https://sourceforge.net/projects/doxygen/files/doxygen-1.12.0.src.tar.gz"
sha256: "a3a3dba2018ef409d83d81a2fc42a0d19bdbe087252ef342bf214b51b8b01634"
19 changes: 5 additions & 14 deletions recipes/doxygen/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get
from conan.tools.microsoft import check_min_vs, is_msvc_static_runtime
from conan.tools.files import copy, get, rmdir
from conan.tools.microsoft import is_msvc_static_runtime
from conan.tools.scm import Version
import os

Expand Down Expand Up @@ -35,19 +35,12 @@ def _settings_build(self):

@property
def _minimum_compiler_version(self):
if Version(self.version) <= "1.9.1":
return {
"gcc": "5",
}
return {
"gcc": "7", # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66297
"Visual Studio": "15",
"msvc": "191",
}

def export_sources(self):
export_conandata_patches(self)

def layout(self):
cmake_layout(self, src_folder="src")

Expand All @@ -56,7 +49,6 @@ def requirements(self):
self.requires("xapian-core/1.4.19")
self.requires("zlib/[>=1.2.11 <2]")
if self.options.enable_app or self.options.enable_parse:
# INFO: Doxygen uses upper case CMake variables to link/include IConv, so we are using patches for targets.
self.requires("libiconv/1.17")

def compatibility(self):
Expand All @@ -66,12 +58,10 @@ def validate(self):
minimum_compiler_version = self._minimum_compiler_version.get(str(self.settings.compiler))
if minimum_compiler_version and Version(self.settings.compiler.version) < minimum_compiler_version:
raise ConanInvalidConfiguration(f"Compiler version too old. At least {minimum_compiler_version} is required.")
if Version(self.version) == "1.8.18":
check_min_vs(self, "191")

def build_requirements(self):
if self._settings_build.os == "Windows":
self.tool_requires("winflexbison/2.5.24")
self.tool_requires("winflexbison/2.5.25")
else:
self.tool_requires("flex/2.6.4")
self.tool_requires("bison/3.8.2")
Expand All @@ -92,15 +82,16 @@ def generate(self):
deps.generate()

def build(self):
apply_conandata_patches(self)
cmake = CMake(self)
cmake.verbose = True
cmake.configure()
cmake.build()

def package(self):
copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
cmake = CMake(self)
cmake.install()
rmdir(self, os.path.join(self.package_folder, "share"))

def package_info(self):
self.cpp_info.set_property("cmake_find_mode", "none")
Expand Down
13 changes: 0 additions & 13 deletions recipes/doxygen/all/patches/1.8-0001-xapian.patch

This file was deleted.

65 changes: 0 additions & 65 deletions recipes/doxygen/all/patches/1.8.17-0002-fix-iconv-linkage.patch

This file was deleted.

65 changes: 0 additions & 65 deletions recipes/doxygen/all/patches/1.8.18-0002-fix-iconv-linkage.patch

This file was deleted.

65 changes: 0 additions & 65 deletions recipes/doxygen/all/patches/1.8.20-0002-fix-iconv-linkage.patch

This file was deleted.

Loading
Loading