diff --git a/recipes/cc65/all/conanfile.py b/recipes/cc65/all/conanfile.py index 9d50b17e15c883..bd4da386e02d4e 100644 --- a/recipes/cc65/all/conanfile.py +++ b/recipes/cc65/all/conanfile.py @@ -152,27 +152,14 @@ def package_info(self): bin_ext = ".exe" if self.settings.os == "Windows" else "" bindir = os.path.join(self.package_folder, "bin") - datadir = os.path.join(self.package_folder, "bin", "share", "cc65") - - self.output.info(f"Setting CC65_HOME environment variable: {datadir}") - self.buildenv_info.define_path("CC65_HOME", datadir) - - cc65_cc = os.path.join(bindir, "cc65" + bin_ext) - self.output.info(f"Setting CC65 environment variable: {cc65_cc}") - self.buildenv_info.define_path("CC65", cc65_cc) - - cc65_as = os.path.join(bindir, "ca65" + bin_ext) - self.output.info(f"Setting AS65 environment variable: {cc65_as}") - self.buildenv_info.define_path("AS65", cc65_as) - - cc65_ld = os.path.join(bindir, "cl65" + bin_ext) - self.output.info(f"Setting LD65 environment variable: {cc65_ld}") - self.buildenv_info.define_path("LD65", cc65_ld) + self.buildenv_info.define_path("CC65_HOME", os.path.join(self.package_folder, "bin", "share", "cc65")) + self.buildenv_info.define_path("CC65", os.path.join(bindir, "cc65" + bin_ext)) + self.buildenv_info.define_path("AS65", os.path.join(bindir, "ca65" + bin_ext)) + self.buildenv_info.define_path("LD65", os.path.join(bindir, "cl65" + bin_ext)) # TODO: Legacy, to be removed on Conan 2.0 - self.output.info(f"Appending PATH environment variable: {bindir}") self.env_info.PATH.append(bindir) - self.env_info.CC65_HOME = datadir - self.env_info.CC65 = cc65_cc - self.env_info.AS65 = cc65_as - self.env_info.LD65 = cc65_ld + self.env_info.CC65_HOME = os.path.join(self.package_folder, "bin", "share", "cc65") + self.env_info.CC65 = os.path.join(bindir, "cc65" + bin_ext) + self.env_info.AS65 = os.path.join(bindir, "ca65" + bin_ext) + self.env_info.LD65 = os.path.join(bindir, "cl65" + bin_ext) diff --git a/recipes/cc65/all/test_v1_package/conanfile.py b/recipes/cc65/all/test_v1_package/conanfile.py deleted file mode 100644 index b930a6b2cce7f9..00000000000000 --- a/recipes/cc65/all/test_v1_package/conanfile.py +++ /dev/null @@ -1,33 +0,0 @@ -from conans import ConanFile, tools -import os -import shutil - - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - - exports_sources = "hello.c", "text.s" - - _targets = ("c64", "apple2") - - def build(self): - if not tools.cross_building(self.settings): - for src in self.exports_sources: - shutil.copy(os.path.join(self.source_folder, src), os.path.join(self.build_folder, src)) - for target in self._targets: - output = "hello_{}".format(target) - tools.mkdir(target) - try: - # Try removing the output file to give confidence it is created by cc65 - os.unlink(output) - except FileNotFoundError: - pass - self.run("{p} -O -t {t} hello.c -o {t}/hello.s".format(p=os.environ["CC65"], t=target)) - self.run("{p} -t {t} {t}/hello.s -o {t}/hello.o".format(p=os.environ["AS65"], t=target)) - self.run("{p} -t {t} text.s -o {t}/text.o".format(p=os.environ["AS65"], t=target)) - self.run("{p} -o {o} -t {t} {t}/hello.o {t}/text.o {t}.lib".format(o=output, p=os.environ["LD65"], t=target)) - - def test(self): - if not tools.cross_building(self.settings): - for target in self._targets: - assert os.path.isfile("hello_{}".format(target))