hexedtech/codemp
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp.git synced 2024-10-22 17:59:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: put java commands behind feature flag

Browse source
This commit is contained in:
zaaarf 2024-03-10 01:22:05 +01:00
parent 71006696ee
commit 136ce6b052
2 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -41,3 +41,4 @@ rifgen = { git = "https://github.com/Kofituo/rifgen.git", rev = "d27d9785b2febcf
[features] [features]
default = [] default = []
java = ["lazy_static", "jni", "jni-sys", "flapigen", "rifgen", "log"] java = ["lazy_static", "jni", "jni-sys", "flapigen", "rifgen", "log"]
java-artifact = ["java"]

56
build.rs
View file

@ -37,36 +37,42 @@ fn main() {
out_dir.join("glue.rs") out_dir.join("glue.rs")
); );
//TODO panic if no jdk #[cfg(feature = "java-artifact")] {
// panic if no jdk
std::process::Command::new("javac")
.arg("--version")
.status()
.expect("java not found");
// compile java code // compile java code
let mut java_compiled = java_target.clone(); // target/debug/java/classes let mut java_compiled = java_target.clone(); // target/debug/java/classes
java_compiled.push("classes"); java_compiled.push("classes");
recreate_path(&java_compiled); recreate_path(&java_compiled);
let mut javac_cmd = std::process::Command::new("javac"); let mut javac_cmd = std::process::Command::new("javac");
javac_cmd.arg("-d").arg(java_compiled.as_os_str()); javac_cmd.arg("-d").arg(java_compiled.as_os_str());
for java_file in pkg_path.read_dir().unwrap().filter_map(|e| e.ok()) { for java_file in pkg_path.read_dir().unwrap().filter_map(|e| e.ok()) {
javac_cmd.arg(java_file.path().as_os_str()); javac_cmd.arg(java_file.path().as_os_str());
} }
javac_cmd.status().expect("failed to run javac"); javac_cmd.status().expect("failed to run javac");
// jar it! // jar it!
let mut jar_file = target.clone(); // target/debug/codemp-java.jar let mut jar_file = target.clone(); // target/debug/codemp-java.jar
jar_file.push("codemp-java.jar"); jar_file.push("codemp-java.jar");
let mut jar_cmd = std::process::Command::new("jar"); let mut jar_cmd = std::process::Command::new("jar");
jar_cmd.current_dir(&java_compiled) jar_cmd.current_dir(&java_compiled)
.arg("cf") .arg("cf")
.arg(jar_file.as_os_str()); .arg(jar_file.as_os_str());
for java_file in java_compiled.read_dir().unwrap().filter_map(|e| e.ok()) { for java_file in java_compiled.read_dir().unwrap().filter_map(|e| e.ok()) {
let relative_path = java_file.path().clone(); let relative_path = java_file.path().clone();
let relative_path = relative_path.strip_prefix(&java_compiled).unwrap(); let relative_path = relative_path.strip_prefix(&java_compiled).unwrap();
jar_cmd.arg(relative_path.as_os_str()); jar_cmd.arg(relative_path.as_os_str());
}
jar_cmd.status().expect("failed to run jar!");
println!("cargo:rerun-if-changed={}", generated_glue_file.display());
} }
jar_cmd.status().expect("failed to run jar!");
println!("cargo:rerun-if-changed={}", generated_glue_file.display());
} }
} }