Skip to content

Commit 590f331

Browse files
committed
submission packager bugfixes
1 parent 97777cf commit 590f331

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

tmc-langs-util/src/task_executor/submission_packaging.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,6 @@ pub fn prepare_submission(
248248
let tests_dir = stub_project_root.as_deref().unwrap_or(clone_path);
249249
match plugin {
250250
Plugin::Maven(_) => {
251-
// maven
252-
253251
// copy pom
254252
file_util::copy(clone_path.join("pom.xml"), &dest)?;
255253

@@ -290,6 +288,7 @@ pub fn prepare_submission(
290288

291289
// copy files directly in clone_path to dest
292290
for entry in WalkDir::new(clone_path)
291+
.max_depth(1)
293292
.into_iter()
294293
.filter_entry(|e| e.path().is_file())
295294
{
@@ -299,8 +298,6 @@ pub fn prepare_submission(
299298
}
300299
}
301300
Plugin::Make(_) => {
302-
// make
303-
304301
// copy src and test
305302
log::debug!("copying src and test");
306303
let main_path = clone_path.join("src");
@@ -321,14 +318,11 @@ pub fn prepare_submission(
321318
}
322319
}
323320
_ => {
324-
// langs
325-
326321
// copy libs
327322
log::debug!("copying lib");
328323
let lib_dir = clone_path.join("lib");
329324
if lib_dir.exists() {
330-
let lib_target = dest.join("lib");
331-
file_util::copy(lib_dir, lib_target)?;
325+
file_util::copy(lib_dir, &dest)?;
332326
}
333327

334328
// copy files from config

0 commit comments

Comments
 (0)