Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

capnpc: add option to build capnp exe from src #268

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "capnpc/capnproto"]
path = capnpc/capnproto
url = https://github.com/capnproto/capnproto.git
7 changes: 7 additions & 0 deletions capnpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ readme = "README.md"

keywords = ["encoding", "protocol", "serialization"]

[features]
build-capnp = []

[lib]

name = "capnpc"
Expand All @@ -37,3 +40,7 @@ path = "../capnp"
# Fortunately, this is pretty easy, and is just an internal implementation detail.
default-features=false
features=[]

[build-dependencies]
cmake = "0.1"
which = "4.2"
Comment on lines +44 to +46
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cmake should probably be marked optional, while activated by build-capnp feature?

[features]
build-capnp = ["dep:cmake"]

[build-dependencies]
cmake = { version = "0.1", optional = true }
which = "4.2"

See also Cargo reference. The dep: syntax requires Rust 1.60.

14 changes: 14 additions & 0 deletions capnpc/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#[cfg(feature = "build-capnp")]
fn main() {
cmake::build("capnproto");
}

#[cfg(not(feature = "build-capnp"))]
fn main() {
if !which::which("capnp").is_ok() {
panic!(
"capnp executable not found. install it with your package manager or enable the \
\"build-capnp\" feature to build it from source"
);
}
Comment on lines +8 to +13
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if !which::which("capnp").is_ok() {
    panic!(msg);
}

could be written as:

which::which("capnp").expect(msg);

}
1 change: 1 addition & 0 deletions capnpc/capnproto
Submodule capnproto added at b49431
15 changes: 14 additions & 1 deletion capnpc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,19 @@ mod pointer_constants;

use std::path::{Path, PathBuf};

#[cfg(feature = "build-capnp")]
fn capnp_exe() -> PathBuf {
let mut p = PathBuf::from(env!("OUT_DIR"));
p.push("bin");
p.push("capnp");
p
Comment on lines +71 to +74
Copy link
Contributor

@Bromeon Bromeon May 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably a matter of style, but you could just use:

PathBuf::from(env!("OUT_DIR"))
    .join("bin")
    .join("capnp")

}

#[cfg(not(feature = "build-capnp"))]
fn capnp_exe() -> PathBuf {
PathBuf::from("capnp")
}

// Copied from capnp/src/lib.rs, where this conversion lives behind the "std" feature flag,
// which we don't want to depend on here.
pub(crate) fn convert_io_err(err: std::io::Error) -> capnp::Error {
Expand Down Expand Up @@ -218,7 +231,7 @@ impl CompilerCommand {
let mut command = if let Some(executable) = &self.executable_path {
::std::process::Command::new(executable)
} else {
::std::process::Command::new("capnp")
::std::process::Command::new(&capnp_exe())
};

command.arg("compile").arg("-o").arg("-");
Expand Down