Expand $OUT_DIR in include_aseprite and include_background_gfx #545
Conversation
| @@ -310,6 +314,7 @@ pub fn include_aseprite_inner(input: TokenStream) -> TokenStream { | |||
| let filenames: Vec<PathBuf> = parsed | |||
| .iter() | |||
| .map(|s| s.value()) | |||
| .map(|s| s.replace(OUT_DIR_TOKEN, &out_dir_path)) | |||
| .map(|s| Path::new(&root).join(&*s)) | |||
There was a problem hiding this comment.
is $OUT_DIR relative to the cargo manifest dir or is it absolute?
There was a problem hiding this comment.
The value you get from std::env::var("OUT_DIR") is absolute.
There was a problem hiding this comment.
Ah, missed this bit in the docs:
If path is absolute, it replaces the current path.
| @@ -663,6 +668,16 @@ fn valid_sprite_size(width: u32, height: u32) -> bool { | |||
| } | |||
| } | |||
|
|
|||
| const OUT_DIR_TOKEN: &str = "$OUT_DIR"; | |||
|
|
|||
| fn get_out_dir(raw_input: &str) -> String { | |||
There was a problem hiding this comment.
given the usage here, should this function just do the replacement?
There was a problem hiding this comment.
I split it to get then replace in order not to call std::env::var for every file when importing multiple sprites.
| @@ -171,6 +171,15 @@ impl config::Config for IncludeBackgroundGfxInput { | |||
| } | |||
| } | |||
|
|
|||
| /// Including from the out directory is supported through the `$OUT_DIR` token. | |||
| /// | |||
| /// ```rust,ignore | |||
There was a problem hiding this comment.
I had to use ignore here because ci would fail since we don't have any build script to create the file in the out directory.
If necessary I could add a build script that copy an example file to the directory instead.
| @@ -91,6 +91,17 @@ macro_rules! align_bytes { | |||
| /// name in code. You should ensure tags are unique as this is not enforced by | |||
| /// aseprite. | |||
| /// | |||
| /// Including from the out directory is supported through the `$OUT_DIR` token. | |||
| /// | |||
| /// ```rust,ignore | |||
|
Thanks! We'll probably do a release on Tuesday :D |
|
@screenshakes We've just released 0.18.1 :) |
|
👍 |
As discussed in #544, this expand $OUT_DIR when used in the include_aseprite and include_background_gfx macros in order to support including from the out directory.
Example usage:
const SPRITE_0: &Graphics = include_aseprite!("$OUT_DIR/sprite_0.aseprite");