matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Remove buildscripts

Browse source 
When installing (a subcrate) from crates.io, it fails because it cannot
find the buildscript. This is the quickfix, simply remove the
buildscript itself and the setup of the buildscript in all Cargo.toml
files.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-05-22 19:18:54 +02:00
parent 5c8af4460e
commit b7d91f0905
30 changed files with 0 additions and 241 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/core/imag-annotate/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-category/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-diagnostics/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[dependencies]
log = "0.4"
toml = "0.4"

2
bin/core/imag-edit/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-git/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-gps/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-grep/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-header/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-ids/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-init/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-link/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-markdown/Cargo.toml
View file

@ -14,8 +14,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-mv/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-ref/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-store/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-tag/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag-view/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/core/imag/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "build.rs"
[build-dependencies]
clap = ">=2.16.1"
libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" }

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

@ -1,151 +0,0 @@
//
// imag - the personal information management suite for the commandline
// Copyright (C) 2015-2019 Matthias Beyer <mail@beyermatthias.de> and contributors
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; version
// 2.1 of the License.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
extern crate clap;
#[macro_use]
extern crate log;
#[macro_use]
extern crate libimagrt;
extern crate libimagerror;
extern crate libimagstore;
extern crate libimagentrytag;
extern crate libimagutil;
use clap::Shell;
use libimagrt::runtime::Runtime;
mod toplevelbuildscript {
include!("../../../build.rs");
pub fn build() {
self::main();
}
}
/// 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)$(,)*)*) => (
$(
#[allow(unused)]
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, $version:ident) => (
$module::build_ui(Runtime::get_default_cli_builder($name, &$version, $name))
)
}
// Actually generates the module.
gen_mods_buildui!(
("../../../bin/core/imag-annotate/src/ui.rs" , imagannotate) ,
("../../../bin/core/imag-category/src/ui.rs" , imagcategory) ,
("../../../bin/core/imag-diagnostics/src/ui.rs" , imagdiagnostics) ,
("../../../bin/core/imag-edit/src/ui.rs" , imagedit) ,
("../../../bin/core/imag-git/src/ui.rs" , imaggit) ,
("../../../bin/core/imag-gps/src/ui.rs" , imaggps) ,
("../../../bin/core/imag-grep/src/ui.rs" , imaggrep) ,
("../../../bin/core/imag-ids/src/ui.rs" , imagids) ,
("../../../bin/core/imag-init/src/ui.rs" , imaginit) ,
("../../../bin/core/imag-link/src/ui.rs" , imaglink) ,
("../../../bin/core/imag-mv/src/ui.rs" , imagmv) ,
("../../../bin/core/imag-ref/src/ui.rs" , imagref) ,
("../../../bin/core/imag-store/src/ui.rs" , imagstore) ,
("../../../bin/core/imag-tag/src/ui.rs" , imagtag) ,
("../../../bin/core/imag-view/src/ui.rs" , imagview) ,
("../../../bin/domain/imag-bookmark/src/ui.rs" , imagbookmark) ,
("../../../bin/domain/imag-contact/src/ui.rs" , imagcontact) ,
("../../../bin/domain/imag-diary/src/ui.rs" , imagdiary) ,
("../../../bin/domain/imag-habit/src/ui.rs" , imaghabit) ,
("../../../bin/domain/imag-log/src/ui.rs" , imaglog) ,
("../../../bin/domain/imag-mail/src/ui.rs" , imagmail) ,
("../../../bin/domain/imag-notes/src/ui.rs" , imagnotes) ,
("../../../bin/domain/imag-timetrack/src/ui.rs" , imagtimetrack) ,
("../../../bin/domain/imag-todo/src/ui.rs" , imagtodo) ,
("../../../bin/domain/imag-wiki/src/ui.rs" , imagwiki) ,
);
fn main() {
// Make the `imag`-App...
let version = make_imag_version!();
let mut app = Runtime::get_default_cli_builder(
"imag",
&version[..],
"imag")
// and add all the subapps as subcommands.
.subcommand(build_subcommand!("annotate" , imagannotate , version))
.subcommand(build_subcommand!("bookmark" , imagbookmark , version))
.subcommand(build_subcommand!("category" , imagcategory , version))
.subcommand(build_subcommand!("contact" , imagcontact , version))
.subcommand(build_subcommand!("diagnostics" , imagdiagnostics , version))
.subcommand(build_subcommand!("diary" , imagdiary , version))
.subcommand(build_subcommand!("edit" , imagedit , version))
.subcommand(build_subcommand!("git" , imaggit , version))
.subcommand(build_subcommand!("gps" , imaggps , version))
.subcommand(build_subcommand!("grep" , imaggrep , version))
.subcommand(build_subcommand!("habit" , imaghabit , version))
.subcommand(build_subcommand!("ids" , imagids , version))
.subcommand(build_subcommand!("init" , imaginit , version))
.subcommand(build_subcommand!("link" , imaglink , version))
.subcommand(build_subcommand!("log" , imaglog , version))
.subcommand(build_subcommand!("mail" , imagmail , version))
.subcommand(build_subcommand!("mv" , imagmv , version))
.subcommand(build_subcommand!("notes" , imagnotes , version))
.subcommand(build_subcommand!("ref" , imagref , version))
.subcommand(build_subcommand!("store" , imagstore , version))
.subcommand(build_subcommand!("tag" , imagtag , version))
.subcommand(build_subcommand!("timetrack" , imagtimetrack , version))
.subcommand(build_subcommand!("todo" , imagtodo , version))
.subcommand(build_subcommand!("view" , imagview , version))
.subcommand(build_subcommand!("wiki" , imagwiki , version));
// Actually generates the completion files
app.gen_completions("imag", Shell::Bash, "../../../target/");
app.gen_completions("imag", Shell::Fish, "../../../target/");
app.gen_completions("imag", Shell::Zsh, "../../../target/");
toplevelbuildscript::build();
}

2
bin/domain/imag-bookmark/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/domain/imag-contact/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/domain/imag-diary/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/domain/imag-habit/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/domain/imag-log/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/domain/imag-mail/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/domain/imag-notes/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/domain/imag-timetrack/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/domain/imag-todo/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://imag-pim.org/doc/"
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[badges]
travis-ci = { repository = "matthiasbeyer/imag" }
is-it-maintained-issue-resolution = { repository = "matthiasbeyer/imag" }

2
bin/domain/imag-wiki/Cargo.toml
View file

@ -13,8 +13,6 @@ documentation = "https://matthiasbeyer.github.io/imag/imag_documentation/index.h
repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
build = "../../../build.rs"
[dependencies]
clap = ">=2.17"
log = "0.4"

34
build.rs
View file

@ -1,34 +0,0 @@
//
// imag - the personal information management suite for the commandline
// Copyright (C) 2015-2018 the imag contributors
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; version
// 2.1 of the License.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
use std::process::Command;
fn main() {
let profile = String::from(::std::env::var("PROFILE").unwrap());
let git_version = if profile == "debug" {
let output = Command::new("git")
.args(&["describe", "HEAD"])
.output()
.unwrap();
String::from_utf8(output.stdout).unwrap()
} else {
String::from("")
};
println!("cargo:rustc-env=CARGO_BUILD_VERSION={}", git_version);
}