Skip to content

Commit

Permalink
remove 1.9.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Croydon committed Sep 16, 2024
1 parent d8bc1ac commit 45a9589
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 44 deletions.
5 changes: 0 additions & 5 deletions recipes/doxygen/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,3 @@ sources:
- "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"
"1.9.5":
url:
- "https://github.com/doxygen/doxygen/releases/download/Release_1_9_5/doxygen-1.9.5.src.tar.gz"
- "https://sourceforge.net/projects/doxygen/files/doxygen-1.9.5.src.tar.gz"
sha256: "55b454b35d998229a96f3d5485d57a0a517ce2b78d025efb79d57b5a2e4b2eec"
14 changes: 1 addition & 13 deletions recipes/doxygen/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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, replace_in_file, rm, rmdir
from conan.tools.files import copy, get, replace_in_file, rm, rmdir

Check warning on line 4 in recipes/doxygen/all/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration)

Unused replace_in_file imported from conan.tools.files

Check warning on line 4 in recipes/doxygen/all/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration)

Unused rm imported from conan.tools.files
from conan.tools.microsoft import check_min_vs, is_msvc_static_runtime

Check warning on line 5 in recipes/doxygen/all/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration)

Unused check_min_vs imported from conan.tools.microsoft
from conan.tools.scm import Version
import os
Expand Down Expand Up @@ -41,9 +41,6 @@ def _minimum_compiler_version(self):
"msvc": "191",
}

def export_sources(self):
export_conandata_patches(self)

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

Expand All @@ -52,8 +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: Before https://github.com/doxygen/doxygen/pull/10888 was merged,
# Doxygen used upper case CMake variables to link/include IConv, so we are using patches for targets.
self.requires("libiconv/1.17")

def compatibility(self):
Expand Down Expand Up @@ -87,13 +82,6 @@ def generate(self):
deps.generate()

def build(self):
rm(self, "FindIconv.cmake", os.path.join(self.source_folder, "cmake"))
for cmake_file in ["CMakeLists.txt", os.path.join("src", "CMakeLists.txt"), os.path.join("addon", "doxyapp", "CMakeLists.txt"), os.path.join("addon", "doxyparse", "CMakeLists.txt")]:
cmake_file = os.path.join(self.source_folder, cmake_file)
replace_in_file(self, cmake_file, "find_package(Iconv REQUIRED)\n", "find_package(Iconv REQUIRED)\nget_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)\n", strict=False)
replace_in_file(self, cmake_file, "find_package(Iconv)\\n", "find_package(Iconv)\nget_target_property(ICONV_INCLUDE_DIR Iconv::Iconv INTERFACE_INCLUDE_DIRECTORIES)\n", strict=False)
replace_in_file(self, cmake_file, "${ICONV_LIBRARIES}", "Iconv::Iconv", strict=False)
apply_conandata_patches(self)
cmake = CMake(self)
cmake.verbose = True
cmake.configure()
Expand Down

This file was deleted.

2 changes: 0 additions & 2 deletions recipes/doxygen/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
versions:
"1.12.0":
folder: "all"
"1.9.5":
folder: "all"

0 comments on commit 45a9589

Please sign in to comment.