-
Notifications
You must be signed in to change notification settings - Fork 741
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2282 from ravenexp/python3-dll-a
pyo3-build-config: Add `python3-dll-a` crate support
- Loading branch information
Showing
10 changed files
with
148 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
//! Optional `python3.dll` import library generator for Windows | ||
|
||
use std::env; | ||
use std::path::PathBuf; | ||
|
||
use python3_dll_a::generate_implib_for_target; | ||
|
||
use crate::errors::{Context, Result}; | ||
|
||
use super::{Architecture, OperatingSystem, Triple}; | ||
|
||
/// Generates the `python3.dll` import library for Windows targets. | ||
/// | ||
/// Places the generated import library into the build script output directory | ||
/// and returns the full library directory path. | ||
/// | ||
/// Does nothing if the target OS is not Windows. | ||
pub(super) fn generate_abi3_import_lib(target: &Triple) -> Result<Option<String>> { | ||
if target.operating_system != OperatingSystem::Windows { | ||
return Ok(None); | ||
} | ||
|
||
let out_dir = env::var_os("OUT_DIR") | ||
.expect("generate_abi3_import_lib() must be called from a build script"); | ||
|
||
// Put the newly created import library into the build script output directory. | ||
let mut out_lib_dir = PathBuf::from(out_dir); | ||
out_lib_dir.push("lib"); | ||
|
||
// Convert `Architecture` enum to rustc `target_arch` option format. | ||
let arch = match target.architecture { | ||
// i686, i586, etc. | ||
Architecture::X86_32(_) => "x86".to_string(), | ||
other => other.to_string(), | ||
}; | ||
|
||
let env = target.environment.to_string(); | ||
|
||
generate_implib_for_target(&out_lib_dir, &arch, &env) | ||
.context("failed to generate python3.dll import library")?; | ||
|
||
let out_lib_dir_string = out_lib_dir | ||
.to_str() | ||
.ok_or("build directory is not a valid UTF-8 string")? | ||
.to_owned(); | ||
|
||
Ok(Some(out_lib_dir_string)) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters