Browse Source

Changed compile to accept name of library and updated examples

cmd
Andy Gauge 8 years ago
parent
commit
89a9d3dfce
  1. 31
      src/lib.rs

31
src/lib.rs

@ -24,7 +24,7 @@
//! extern crate gcc; //! extern crate gcc;
//! //!
//! fn main() { //! fn main() {
//! gcc::compile_library("libfoo.a", &["src/foo.c"]); //! gcc::compile_library("foo", &["src/foo.c"]);
//! } //! }
//! ``` //! ```
//! //!
@ -38,7 +38,7 @@
//! .file("src/foo.c") //! .file("src/foo.c")
//! .define("FOO", Some("bar")) //! .define("FOO", Some("bar"))
//! .include("src") //! .include("src")
//! .compile("libfoo.a"); //! .compile("foo");
//! } //! }
//! ``` //! ```
@ -168,7 +168,7 @@ impl ToolFamily {
/// # Example /// # Example
/// ///
/// ```no_run /// ```no_run
/// gcc::compile_library("libfoo.a", &["foo.c", "bar.c"]); /// gcc::compile_library("foo", &["foo.c", "bar.c"]);
/// ``` /// ```
pub fn compile_library(output: &str, files: &[&str]) { pub fn compile_library(output: &str, files: &[&str]) {
let mut c = Config::new(); let mut c = Config::new();
@ -221,7 +221,7 @@ impl Config {
/// .file("src/foo.c") /// .file("src/foo.c")
/// .include(library_path) /// .include(library_path)
/// .include("src") /// .include("src")
/// .compile("libfoo.a"); /// .compile("foo");
/// ``` /// ```
pub fn include<P: AsRef<Path>>(&mut self, dir: P) -> &mut Config { pub fn include<P: AsRef<Path>>(&mut self, dir: P) -> &mut Config {
self.include_directories.push(dir.as_ref().to_path_buf()); self.include_directories.push(dir.as_ref().to_path_buf());
@ -237,7 +237,7 @@ impl Config {
/// .file("src/foo.c") /// .file("src/foo.c")
/// .define("FOO", Some("BAR")) /// .define("FOO", Some("BAR"))
/// .define("BAZ", None) /// .define("BAZ", None)
/// .compile("libfoo.a"); /// .compile("foo");
/// ``` /// ```
pub fn define(&mut self, var: &str, val: Option<&str>) -> &mut Config { pub fn define(&mut self, var: &str, val: Option<&str>) -> &mut Config {
self.definitions.push((var.to_string(), val.map(|s| s.to_string()))); self.definitions.push((var.to_string(), val.map(|s| s.to_string())));
@ -258,7 +258,7 @@ impl Config {
/// gcc::Config::new() /// gcc::Config::new()
/// .file("src/foo.c") /// .file("src/foo.c")
/// .flag("-ffunction-sections") /// .flag("-ffunction-sections")
/// .compile("libfoo.a"); /// .compile("foo");
/// ``` /// ```
pub fn flag(&mut self, flag: &str) -> &mut Config { pub fn flag(&mut self, flag: &str) -> &mut Config {
self.flags.push(flag.to_string()); self.flags.push(flag.to_string());
@ -296,7 +296,7 @@ impl Config {
/// .file("src/foo.c") /// .file("src/foo.c")
/// .shared_flag(true) /// .shared_flag(true)
/// .static_flag(true) /// .static_flag(true)
/// .compile("libfoo.so"); /// .compile("foo");
/// ``` /// ```
pub fn static_flag(&mut self, static_flag: bool) -> &mut Config { pub fn static_flag(&mut self, static_flag: bool) -> &mut Config {
self.static_flag = Some(static_flag); self.static_flag = Some(static_flag);
@ -381,7 +381,7 @@ impl Config {
/// gcc::Config::new() /// gcc::Config::new()
/// .file("src/foo.c") /// .file("src/foo.c")
/// .target("aarch64-linux-android") /// .target("aarch64-linux-android")
/// .compile("libfoo.so"); /// .compile("foo");
/// ``` /// ```
pub fn target(&mut self, target: &str) -> &mut Config { pub fn target(&mut self, target: &str) -> &mut Config {
self.target = Some(target.to_string()); self.target = Some(target.to_string());
@ -392,14 +392,14 @@ impl Config {
/// ///
/// This option is automatically scraped from the `HOST` environment /// This option is automatically scraped from the `HOST` environment
/// variable by build scripts, so it's not required to call this function. /// variable by build scripts, so it's not required to call this function.
/// ///
/// # Example /// # Example
/// ///
/// ```no_run /// ```no_run
/// gcc::Config::new() /// gcc::Config::new()
/// .file("src/foo.c") /// .file("src/foo.c")
/// .host("arm-linux-gnueabihf") /// .host("arm-linux-gnueabihf")
/// .compile("libfoo.so"); /// .compile("foo");
/// ``` /// ```
pub fn host(&mut self, host: &str) -> &mut Config { pub fn host(&mut self, host: &str) -> &mut Config {
self.host = Some(host.to_string()); self.host = Some(host.to_string());
@ -500,11 +500,14 @@ impl Config {
/// Run the compiler, generating the file `output` /// Run the compiler, generating the file `output`
/// ///
/// The name `output` must begin with `lib` and end with `.a` /// The name `output` should be the name of the library. For backwards compatibility,
/// the `output` may start with `lib` and end with `.a`. The Rust compilier will create
/// the assembly with the lib prefix and .a extension. MSVC will create a file without prefix,
/// ending with `.lib`.
pub fn compile(&self, output: &str) { pub fn compile(&self, output: &str) {
assert!(output.starts_with("lib")); let name_start = if output.starts_with("lib") { 3 } else { 0 };
assert!(output.ends_with(".a")); let name_end = if output.ends_with(".a") { output.len() - 2 } else { output.len() };
let lib_name = &output[3..output.len() - 2]; let lib_name = &output[name_start..name_end];
let dst = self.get_out_dir(); let dst = self.get_out_dir();
let mut objects = Vec::new(); let mut objects = Vec::new();

Loading…
Cancel
Save