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.

Sign up for GitHub

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

Jump to bottom

subunit: add version 1.4.4 #24773

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

subunit: add version 1.4.4 #24773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f032952
(#24732) subunit: add version 1.4.4
vsbogd Jul 27, 2024
37a10d4
(#24732) subunit: fix PATH deprecation warning
vsbogd Jul 27, 2024
2dcfbc8
(#24732) subunit: add build requirements
vsbogd Jul 31, 2024
f083eb7
(#24732) subunit: restore 1.4.0 build behavior
vsbogd Aug 23, 2024
fa8f01b
Merge branch 'master' into package/subunit
vsbogd Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions recipes/subunit/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.4.4":
url: "https://github.com/testing-cabal/subunit/archive/refs/tags/1.4.4.tar.gz"
sha256: "395787f52b8b36830c331faca546ea6c248b6cbd8de95989c2f64d432cc90531"
"1.4.0":
url: "https://launchpad.net/subunit/trunk/1.4.0/+download/subunit-1.4.0.tar.gz"
sha256: "00792096e96cbf1d5f9394dadd0ea73309a4f8b2214822949f1888ce5c2cf1c0"
Expand Down
13 changes: 11 additions & 2 deletions recipes/subunit/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,15 @@ def build_requirements(self):
self.win_bash = True
if not self.conf.get("tools.microsoft.bash:path", check_type=str):
self.tool_requires("msys2/cci.latest")
if is_msvc(self):
if self.version == "1.4.0":
if is_msvc(self):
self.tool_requires("automake/1.16.5")
else:
# version >=1.4.4 is kept on GitHub without configuration built
self.tool_requires("libtool/2.4.7")
self.tool_requires("pkgconf/2.2.0")
Copy link
Contributor

@valgur valgur Aug 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
self.tool_requires("pkgconf/2.2.0")

There is no PkgConfigDeps generator used in the recipe. Is the pkgconf tool dependency really being used?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

configure.ac uses PKG_CHECK_... which fails if pkgconf is not installed: https://github.com/testing-cabal/subunit/blob/98aa1076f8aed666262022634ddccdf9e345b13f/configure.ac#L64-L66
I don't know autoconf well to understand whether it can be fixed by another way.

self.tool_requires("automake/1.16.5")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)

Expand Down Expand Up @@ -137,6 +144,8 @@ def build(self):
apply_conandata_patches(self)
with chdir(self, self.source_folder):
autotools = Autotools(self)
if self.version != "1.4.0":
autotools.autoreconf()
autotools.configure()
autotools.make()

Expand Down Expand Up @@ -164,4 +173,4 @@ def package_info(self):
self.cpp_info.components["libcppunit_subunit"].set_property("pkg_config_name", "libcppunit_subunit")

bin_path = os.path.join(self.package_folder, "bin")
self.env_info.PATH.append(bin_path)
self.runenv_info.append_path("PATH", bin_path)
2 changes: 2 additions & 0 deletions recipes/subunit/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"1.4.4":
folder: "all"
"1.4.0":
folder: "all"
Loading