matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

build script for shell completion works again

Browse source
This commit is contained in:
Mario Krehl 2018-04-14 01:47:55 +02:00 committed by Matthias Beyer
parent de9ef077c3
commit a104d53919
3 changed files with 20 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
bin/Cargo.toml
View file

@ -1,40 +0,0 @@
[package]
name = "imag"
version = "0.2.0"
authors = ["Matthias Beyer <mail@beyermatthias.de>"]
description = "Part of the imag core distribution: imag command"
keywords = ["imag", "PIM", "personal", "information", "management"]
readme = "../README.md"
license = "LGPL-2.1"
documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.html"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "build.rs"
[build-dependencies]
clap = ">=2.16.1"
version = "2.0"
libimagrt = { path = "../libimagrt" }
libimagentrytag = { path = "../libimagentrytag" }
libimagutil = { path = "../libimagutil" }
[profile.dev]
codegen-units = 2
[dependencies]
version = "2.0"
walkdir = "0.1"
crossbeam = "0.2"
clap = "2.*"
log = "0.3"
[dependencies.libimagrt]
path = "../libimagrt"
[dependencies.libimagerror]
path = "../libimagerror"

90
bin/build.rs
View file

@ -1,90 +0,0 @@
extern crate clap;
extern crate libimagrt;
extern crate libimagentrytag;
extern crate libimagutil;
#[macro_use] extern crate version;
use clap::Shell;
use libimagrt::runtime::Runtime;
/// This macro generates mods with the given '$modulename',
/// whose content is the file given with `$path`.
/// In this case, It is used specifically to include the
/// `ui.rs` files of the imag binaries.
/// The imag project (accidentally?) followed the convention
/// to write a `ui.rs` containing the function
/// `fn build_ui(app : App) -> App`.
/// This macro allows us to use the same named functions by
/// putting them each into their own module.
macro_rules! gen_mods_buildui {
($(($path:expr, $modulename:ident)$(,)*)*) => (
$(
mod $modulename {
include!($path);
}
)*
)
}
/// This macro reduces boilerplate code.
///
/// For example: `build_subcommand!("counter", imagcounter)`
/// will result in the following code:
/// ```ignore
/// imagcounter::build_ui(Runtime::get_default_cli_builder(
/// "counter",
/// &version!()[..],
/// "counter"))
/// ```
/// As for the `&version!()[..]` part, it does not matter
/// which version the subcommand is getting here, as the
/// output of this script is a completion script, which
/// does not contain information about the version at all.
macro_rules! build_subcommand {
($name:expr, $module:ident) => (
$module::build_ui(Runtime::get_default_cli_builder(
$name,
&version!()[..],
$name))
)
}
// Actually generates the module.
gen_mods_buildui!(
("../imag-bookmark/src/ui.rs", imagbookmark),
("../imag-counter/src/ui.rs", imagcounter),
("../imag-diary/src/ui.rs", imagdiary),
("../imag-link/src/ui.rs", imaglink),
("../imag-notes/src/ui.rs", imagnotes),
("../imag-ref/src/ui.rs", imagref),
("../imag-store/src/ui.rs", imagstore),
("../imag-tag/src/ui.rs", imagtag),
("../imag-todo/src/ui.rs", imagtodo),
("../imag-view/src/ui.rs", imagview)
);
fn main() {
// Make the `imag`-App...
let mut app = Runtime::get_default_cli_builder(
"imag",
&version!()[..],
"imag")
// and add all the subapps as subcommands.
.subcommand(build_subcommand!("bookmark", imagbookmark))
.subcommand(build_subcommand!("counter", imagcounter))
.subcommand(build_subcommand!("diary", imagdiary))
.subcommand(build_subcommand!("link", imaglink))
.subcommand(build_subcommand!("notes", imagnotes))
.subcommand(build_subcommand!("ref", imagref))
.subcommand(build_subcommand!("store", imagstore))
.subcommand(build_subcommand!("tag", imagtag))
.subcommand(build_subcommand!("todo", imagtodo))
.subcommand(build_subcommand!("view", imagview));
// Actually generates the completion files
app.gen_completions("imag", Shell::Bash, env!("OUT_DIR"));
app.gen_completions("imag", Shell::Fish, env!("OUT_DIR"));
app.gen_completions("imag", Shell::Zsh, env!("OUT_DIR"));
}

34
bin/core/imag/build.rs
View file

@ -7,6 +7,13 @@ extern crate libimagutil;
use clap::Shell; use clap::Shell;
use libimagrt::runtime::Runtime; use libimagrt::runtime::Runtime;
mod toplevelbuildscript {
include!("../../../build.rs");
pub fn build() {
self::main();
}
}
/// This macro generates mods with the given '$modulename', /// This macro generates mods with the given '$modulename',
/// whose content is the file given with `$path`. /// whose content is the file given with `$path`.
/// In this case, It is used specifically to include the /// In this case, It is used specifically to include the
@ -48,16 +55,15 @@ macro_rules! build_subcommand {
// Actually generates the module. // Actually generates the module.
gen_mods_buildui!( gen_mods_buildui!(
("../imag-bookmark/src/ui.rs", imagbookmark), ("../../../bin/domain/imag-bookmark/src/ui.rs", imagbookmark),
("../imag-counter/src/ui.rs", imagcounter), ("../../../bin/domain/imag-diary/src/ui.rs", imagdiary),
("../imag-diary/src/ui.rs", imagdiary), ("../../../bin/core/imag-link/src/ui.rs", imaglink),
("../imag-link/src/ui.rs", imaglink), ("../../../bin/domain/imag-notes/src/ui.rs", imagnotes),
("../imag-notes/src/ui.rs", imagnotes), ("../../../bin/core/imag-ref/src/ui.rs", imagref),
("../imag-ref/src/ui.rs", imagref), ("../../../bin/core/imag-store/src/ui.rs", imagstore),
("../imag-store/src/ui.rs", imagstore), ("../../../bin/core/imag-tag/src/ui.rs", imagtag),
("../imag-tag/src/ui.rs", imagtag), ("../../../bin/domain/imag-todo/src/ui.rs", imagtodo),
("../imag-todo/src/ui.rs", imagtodo), ("../../../bin/core/imag-view/src/ui.rs", imagview)
("../imag-view/src/ui.rs", imagview)
); );
fn main() { fn main() {
@ -68,7 +74,6 @@ fn main() {
"imag") "imag")
// and add all the subapps as subcommands. // and add all the subapps as subcommands.
.subcommand(build_subcommand!("bookmark", imagbookmark)) .subcommand(build_subcommand!("bookmark", imagbookmark))
.subcommand(build_subcommand!("counter", imagcounter))
.subcommand(build_subcommand!("diary", imagdiary)) .subcommand(build_subcommand!("diary", imagdiary))
.subcommand(build_subcommand!("link", imaglink)) .subcommand(build_subcommand!("link", imaglink))
.subcommand(build_subcommand!("notes", imagnotes)) .subcommand(build_subcommand!("notes", imagnotes))
@ -79,9 +84,10 @@ fn main() {
.subcommand(build_subcommand!("view", imagview)); .subcommand(build_subcommand!("view", imagview));
// Actually generates the completion files // Actually generates the completion files
app.gen_completions("imag", Shell::Bash, env!("OUT_DIR")); app.gen_completions("imag", Shell::Bash, "./");
app.gen_completions("imag", Shell::Fish, env!("OUT_DIR")); app.gen_completions("imag", Shell::Fish, "./");
app.gen_completions("imag", Shell::Zsh, env!("OUT_DIR")); app.gen_completions("imag", Shell::Zsh, "./");
toplevelbuildscript::build();
} }