-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
conanized zlib-ng 2.0.0 #5200
conanized zlib-ng 2.0.0 #5200
Conversation
Signed-off-by: Tomas Krupa <tomas.krupa@innovatrics.com>
|
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the pr.
I've got some small remarks.
Please ask for EAP approval in #4 so we can advance.
recipes/zlib-ng/all/conanfile.py
Outdated
self.copy(pattern="*.a", dst="lib", src=self._build_subfolder, keep_path=False) | ||
self.copy(pattern="*.lib", dst="lib", src=self._build_subfolder, keep_path=False) | ||
|
||
self._rename_libraries() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please insert final newline
self._rename_libraries() | |
self._rename_libraries() |
bin_path = os.path.join("bin", "test_package") | ||
buffer = StringIO() | ||
try: | ||
self.run(bin_path, run_environment=True, output=buffer) | ||
self.output.success("enough.c test passed") | ||
except: | ||
self.output.error(buffer.getvalue()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's no need to parse the output. Just check the return code.
bin_path = os.path.join("bin", "test_package") | |
buffer = StringIO() | |
try: | |
self.run(bin_path, run_environment=True, output=buffer) | |
self.output.success("enough.c test passed") | |
except: | |
self.output.error(buffer.getvalue()) | |
if not tools.cross_building(self.settings): | |
bin_path = os.path.join("bin", "test_package") | |
self.run(bin_path, run_environment=True) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not parsing, just hiding excessive output of the test
recipes/zlib-ng/all/conanfile.py
Outdated
def _rename_libraries(self): | ||
if self.settings.os == "Windows": | ||
lib_path = os.path.join(self.package_folder, "lib") | ||
suffix = "d" if self.settings.build_type == "Debug" else "" | ||
|
||
if self.options.shared: | ||
if self.settings.compiler == "Visual Studio": | ||
current_lib = os.path.join(lib_path, "zlib%s.lib" % suffix) | ||
os.rename(current_lib, os.path.join(lib_path, "zlib.lib")) | ||
else: | ||
if self.settings.compiler == "Visual Studio": | ||
current_lib = os.path.join(lib_path, "zlibstatic%s.lib" % suffix) | ||
os.rename(current_lib, os.path.join(lib_path, "zlib.lib")) | ||
elif self.settings.compiler == "gcc": | ||
current_lib = os.path.join(lib_path, "libzlibstatic.a") | ||
os.rename(current_lib, os.path.join(lib_path, "libzlib.a")) | ||
elif self.settings.compiler == "clang": | ||
current_lib = os.path.join(lib_path, "zlibstatic.lib") | ||
os.rename(current_lib, os.path.join(lib_path, "zlib.lib")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
libraries are renamed here, but in the meantime you define lib names in package_info() like if they were not renamed.
This comment has been minimized.
This comment has been minimized.
Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Signed-off-by: Tomas Krupa <tomas.krupa@innovatrics.com>
Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
This comment has been minimized.
This comment has been minimized.
Signed-off-by: Tomas Krupa <tomas.krupa@innovatrics.com>
This comment has been minimized.
This comment has been minimized.
Signed-off-by: Tomas Krupa <tomas.krupa@innovatrics.com>
@tomas-krupa I think you used a second email for these commits. CLA is asking for tkrupa user too. |
Failure in build 12 (
Note: To save resources, CI tries to finish as soon as an error is found. For this reason you might find that not all the references have been launched or not all the configurations for a given reference. Also, take into account that we cannot guarantee the order of execution as it depends on CI workload and workers availability. |
sorry for my CLA issues, please proceed to PR #5264 |
Specify library name and version: zlib-ng/2.0.0
zlib data compression library for the next generation systems
Author: Hans Kristian Rosbach aka Dead2
Homepage: https://github.com/zlib-ng/zlib-ng
conan-center hook activated.