From 7cabffc8c798ac31b5e552906267dc8d7921869a Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Sat, 24 Sep 2022 23:05:15 +0200 Subject: [PATCH 1/3] fix autotools install on Windows --- conan/tools/gnu/autotools.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conan/tools/gnu/autotools.py b/conan/tools/gnu/autotools.py index 0db4bd30291..927d5344365 100644 --- a/conan/tools/gnu/autotools.py +++ b/conan/tools/gnu/autotools.py @@ -6,6 +6,7 @@ from conans.client.build import join_arguments from conans.tools import args_to_string from conan.tools.files import chdir +from conan.tools.microsoft import unix_path from conans.util.runners import check_output_runner @@ -55,7 +56,7 @@ def make(self, target=None, args=None): self._conanfile.run(command) def install(self, args=None): - args = args if args is not None else ["DESTDIR={}".format(self._conanfile.package_folder)] + args = args if args is not None else ["DESTDIR={}".format(unix_path(self._conanfile, self._conanfile.package_folder))] self.make(target="install", args=args) def autoreconf(self, args=None): From d0c827241ec29ef45ab217199a5801ea4df8129a Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Wed, 26 Oct 2022 14:08:10 +0200 Subject: [PATCH 2/3] extend win_bash/Autotools test with autotools installation --- .../test/functional/toolchains/gnu/autotools/test_win_bash.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conans/test/functional/toolchains/gnu/autotools/test_win_bash.py b/conans/test/functional/toolchains/gnu/autotools/test_win_bash.py index d0af58717f2..d5bcd4f72a9 100644 --- a/conans/test/functional/toolchains/gnu/autotools/test_win_bash.py +++ b/conans/test/functional/toolchains/gnu/autotools/test_win_bash.py @@ -47,6 +47,10 @@ def build(self): autotools = Autotools(self) autotools.configure() autotools.make() + + def package(self): + autotools = Autotools(self) + autotools.install() """) client.save({"conanfile.py": conanfile, From 6d9c4f0d62b1439cdcd547c28f57a1aee36237e3 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Wed, 26 Oct 2022 18:49:40 +0200 Subject: [PATCH 3/3] install in build() since test runs discrete commands --- .../test/functional/toolchains/gnu/autotools/test_win_bash.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/conans/test/functional/toolchains/gnu/autotools/test_win_bash.py b/conans/test/functional/toolchains/gnu/autotools/test_win_bash.py index d5bcd4f72a9..0c12299a106 100644 --- a/conans/test/functional/toolchains/gnu/autotools/test_win_bash.py +++ b/conans/test/functional/toolchains/gnu/autotools/test_win_bash.py @@ -47,9 +47,6 @@ def build(self): autotools = Autotools(self) autotools.configure() autotools.make() - - def package(self): - autotools = Autotools(self) autotools.install() """)