Skip to content

Commit 8119859

Browse files
author
Martin Valgur
committed
cc65: drop test_v1_package
It refuses to work despite package_info() and test_v1_package being virtually unchanged.
1 parent f74366a commit 8119859

File tree

2 files changed

+8
-54
lines changed

2 files changed

+8
-54
lines changed

recipes/cc65/all/conanfile.py

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -152,27 +152,14 @@ def package_info(self):
152152

153153
bin_ext = ".exe" if self.settings.os == "Windows" else ""
154154
bindir = os.path.join(self.package_folder, "bin")
155-
datadir = os.path.join(self.package_folder, "bin", "share", "cc65")
156-
157-
self.output.info(f"Setting CC65_HOME environment variable: {datadir}")
158-
self.buildenv_info.define_path("CC65_HOME", datadir)
159-
160-
cc65_cc = os.path.join(bindir, "cc65" + bin_ext)
161-
self.output.info(f"Setting CC65 environment variable: {cc65_cc}")
162-
self.buildenv_info.define_path("CC65", cc65_cc)
163-
164-
cc65_as = os.path.join(bindir, "ca65" + bin_ext)
165-
self.output.info(f"Setting AS65 environment variable: {cc65_as}")
166-
self.buildenv_info.define_path("AS65", cc65_as)
167-
168-
cc65_ld = os.path.join(bindir, "cl65" + bin_ext)
169-
self.output.info(f"Setting LD65 environment variable: {cc65_ld}")
170-
self.buildenv_info.define_path("LD65", cc65_ld)
155+
self.buildenv_info.define_path("CC65_HOME", os.path.join(self.package_folder, "bin", "share", "cc65"))
156+
self.buildenv_info.define_path("CC65", os.path.join(bindir, "cc65" + bin_ext))
157+
self.buildenv_info.define_path("AS65", os.path.join(bindir, "ca65" + bin_ext))
158+
self.buildenv_info.define_path("LD65", os.path.join(bindir, "cl65" + bin_ext))
171159

172160
# TODO: Legacy, to be removed on Conan 2.0
173-
self.output.info(f"Appending PATH environment variable: {bindir}")
174161
self.env_info.PATH.append(bindir)
175-
self.env_info.CC65_HOME = datadir
176-
self.env_info.CC65 = cc65_cc
177-
self.env_info.AS65 = cc65_as
178-
self.env_info.LD65 = cc65_ld
162+
self.env_info.CC65_HOME = os.path.join(self.package_folder, "bin", "share", "cc65")
163+
self.env_info.CC65 = os.path.join(bindir, "cc65" + bin_ext)
164+
self.env_info.AS65 = os.path.join(bindir, "ca65" + bin_ext)
165+
self.env_info.LD65 = os.path.join(bindir, "cl65" + bin_ext)

recipes/cc65/all/test_v1_package/conanfile.py

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)