From cfcf346963cecf544bdd584e5402b6bef97b8435 Mon Sep 17 00:00:00 2001 From: eason <30045503+Eason0729@users.noreply.github.com> Date: Sun, 17 Dec 2023 00:13:06 +0800 Subject: [PATCH 1/3] docs: :memo: change development setup to match present status --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 35ca1aeb..85b75e66 100644 --- a/readme.md +++ b/readme.md @@ -63,10 +63,10 @@ If you prefer to use default config, you can skip step 2 and 3. 1. install following package: -- From system package manager: `protobuf-devel`, `autoconf` ,`gettext`, `libtool`, `gcc`, `libcap-devel`, `systemd-devel`, `yajl-devel`, `libgcrypt-devel` ,`glibc-static`, `libseccomp-devel`, `python36`, `git` +- From system package manager: `protobuf-devel`, `gcc` - From rustup: `rustup`, `cargo`, `just` - From their website: `docker`, `docker-compose` Then start reading documents in subfolder of your interest. -> you may need to run ``just prepare`` again in each subfolder, follow the doucment in each subfolder. +> you may need to run ``just prepare`` in ``judger``, ``backend`` subfolder. From b96813b974f1ceed01af9fee0cc7ea9dae28402c Mon Sep 17 00:00:00 2001 From: eason <30045503+Eason0729@users.noreply.github.com> Date: Sun, 17 Dec 2023 18:47:09 +0800 Subject: [PATCH 2/3] fix: :bug: fix judger gcc plugin return unknown(CE should be return) during linker error --- judger/plugins/gcc-13/compile.c | 3 --- judger/plugins/gcc-13/execute.sh | 2 ++ judger/plugins/gcc-13/spec.toml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) create mode 100755 judger/plugins/gcc-13/execute.sh diff --git a/judger/plugins/gcc-13/compile.c b/judger/plugins/gcc-13/compile.c index df2e022e..8a2d46ee 100644 --- a/judger/plugins/gcc-13/compile.c +++ b/judger/plugins/gcc-13/compile.c @@ -5,9 +5,6 @@ #include #include #include -// #define CC "/usr/lib64/ccache/g++" -// #define SRC "src.cpp" -// #define OUT "src.out" #define CC "/usr/local/bin/g++" #define SRC "/src/src.cpp" #define OUT "/src/src.out" diff --git a/judger/plugins/gcc-13/execute.sh b/judger/plugins/gcc-13/execute.sh new file mode 100755 index 00000000..0fb7318a --- /dev/null +++ b/judger/plugins/gcc-13/execute.sh @@ -0,0 +1,2 @@ +#!/bin/sh +/src/src.out \ No newline at end of file diff --git a/judger/plugins/gcc-13/spec.toml b/judger/plugins/gcc-13/spec.toml index a6602205..60cd5397 100644 --- a/judger/plugins/gcc-13/spec.toml +++ b/judger/plugins/gcc-13/spec.toml @@ -14,7 +14,7 @@ cpu_time = 10000000 total_time = 10000000 [judge] -command = ["/src/src.out"] +command = ["/execute.sh"] kernel_mem = 67108864 multiplier_memory = 1 # user_mem rt_time = 1000000 From 058ee3447e53c732087ef0e356c9f22c581f07c1 Mon Sep 17 00:00:00 2001 From: eason <30045503+Eason0729@users.noreply.github.com> Date: Sun, 17 Dec 2023 18:48:16 +0800 Subject: [PATCH 3/3] fix: :bug: fix judger gcc plugin return unknown(CE should be return) during linker error --- judger/plugins/gcc-13/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/judger/plugins/gcc-13/Dockerfile b/judger/plugins/gcc-13/Dockerfile index 67b6d723..b8740088 100644 --- a/judger/plugins/gcc-13/Dockerfile +++ b/judger/plugins/gcc-13/Dockerfile @@ -1,5 +1,6 @@ FROM gcc:13 WORKDIR / COPY compile.c . +COPY execute.sh / RUN gcc compile.c -o compile RUN rm compile.c \ No newline at end of file