Fix build; Correct target/ path in generated .gitignore

This commit is contained in:
Olivia Brooks
2026-01-27 21:30:45 -05:00
parent 676b0b606b
commit 649507bbcb
2 changed files with 22 additions and 1 deletions

View File

@@ -140,6 +140,7 @@ fn init() -> anyhow::Result<()> {
f.write_all(include_bytes!("../assets/src/main/Main.java"))?;
}
<<<<<<< HEAD
// Make src/test/Test.java
if let Result::Ok(mut f) = OpenOptions::new().write(true).create_new(is_empty).open(
DIR_TEST
@@ -148,6 +149,16 @@ fn init() -> anyhow::Result<()> {
.with_extension(JAVA_EXT_SOURCE),
) {
f.write_all(include_bytes!("../assets/src/test/Test.java"))?;
=======
// Make src/test/MainTest.java
if let Result::Ok(mut f) = OpenOptions::new().write(true).create_new(is_empty).open(
DIR_TEST
.clone()
.join("MainTest")
.with_extension(JAVA_EXT_SOURCE),
) {
f.write_all(include_bytes!("../assets/src/test/MainTest.java"))?;
>>>>>>> e79c26c (Fix build; Correct target/ path in generated .gitignore)
}
// git init .
@@ -164,7 +175,7 @@ fn init() -> anyhow::Result<()> {
f.read_to_string(&mut buf)?;
for ignored in [
DIR_TARGET.as_path().display().to_string(),
format!("{}/", DIR_TARGET.file_name().unwrap().display()),
format!("*.{}", JAVA_EXT_CLASS),
] {
if !buf.contains(&ignored) {