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

refactor: cleanup code #17

Merged
merged 2 commits into from
May 11, 2022
Merged

refactor: cleanup code #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0777ba8
refactor: cleanup implib file name code
messense May 10, 2022
0c08987
fix: improve error message when dlltool is not found
messense May 10, 2022
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
35 changes: 21 additions & 14 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,25 +148,29 @@ impl ImportLibraryGenerator {

write(&defpath, def_file_content)?;

let impllib_ext = if self.env == "msvc" {
IMPLIB_EXT_MSVC
} else {
IMPLIB_EXT_GNU
};
let implib_file = match self.version {
Some((major, minor)) => {
format!("python{}{}{}", major, minor, impllib_ext)
}
None => format!("python3{}", impllib_ext),
};
// Try to guess the `dlltool` executable name from the target triple.
let mut command = match (self.arch.as_str(), self.env.as_str()) {
// 64-bit MinGW-w64 (aka x86_64-pc-windows-gnu)
("x86_64", "gnu") => self.build_dlltool_command(
DLLTOOL_GNU,
&def_file.replace(".def", IMPLIB_EXT_GNU),
&defpath,
out_dir,
),
("x86_64", "gnu") => {
self.build_dlltool_command(DLLTOOL_GNU, &implib_file, &defpath, out_dir)
}
// 32-bit MinGW-w64 (aka i686-pc-windows-gnu)
("x86", "gnu") => self.build_dlltool_command(
DLLTOOL_GNU_32,
&def_file.replace(".def", IMPLIB_EXT_GNU),
&defpath,
out_dir,
),
("x86", "gnu") => {
self.build_dlltool_command(DLLTOOL_GNU_32, &implib_file, &defpath, out_dir)
}
// MSVC ABI (multiarch)
(_, "msvc") => {
let implib_file = def_file.replace(".def", IMPLIB_EXT_MSVC);
if let Some(command) = find_lib_exe(&self.arch) {
self.build_dlltool_command(
command.get_program(),
Expand All @@ -188,7 +192,10 @@ impl ImportLibraryGenerator {
};

// Run the selected `dlltool` executable to generate the import library.
let status = command.status()?;
let status = command.status().map_err(|e| {
let msg = format!("{:?} failed with {}", command, e);
Error::new(e.kind(), msg)
})?;

if status.success() {
Ok(())
Expand Down