baoshuo/S2OJ
baoshuo/S2OJ
1
1
Fork 0
mirror of https://github.com/renbaoshuo/S2OJ.git synced 2024-11-24 16:48:43 +00:00
Code Issues Actions Packages Releases Activity

feat: use s2oj-gcc

Browse Source
This commit is contained in:
Baoshuo Ren 2023-11-18 21:40:47 +08:00
parent b23313bd4f
commit f39eef51e6
Signed by: baoshuo
GPG Key ID: 00CB9680AB29F51A
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
judger/Dockerfile
View File

@ -4,9 +4,11 @@ SHELL ["/bin/bash", "-c"]
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends gnupg ca-certificates apt-transport-https && \ apt-get install -y --no-install-recommends gnupg curl ca-certificates apt-transport-https && \
curl https://git.m.ac/api/packages/baoshuo/debian/repository.key -o /etc/apt/trusted.gpg.d/gitmac-baoshuo.asc && \
echo "deb https://git.m.ac/api/packages/baoshuo/debian all main" | tee -a /etc/apt/sources.list.d/gitmac-baoshuo.list && \
apt-get update && \ apt-get update && \
for pkg in vim ntp zip unzip curl wget build-essential fp-compiler python2.7 python3.10 python3-requests libseccomp-dev openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk tzdata; do \ for pkg in vim ntp zip unzip wget build-essential fp-compiler s2oj-gcc python2.7 python3.10 python3-requests libseccomp-dev openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk tzdata; do \
cnt=10 && \ cnt=10 && \
while ! apt-get install -y "$pkg"; do \ while ! apt-get install -y "$pkg"; do \
if [ $cnt -le 0 ]; then \ if [ $cnt -le 0 ]; then \

4
judger/uoj_judger/include/uoj_run.h
View File

@ -10,8 +10,8 @@
#include <stdexcept> #include <stdexcept>
#include <sys/time.h> #include <sys/time.h>
#define UOJ_GCC "/usr/bin/gcc-11" #define UOJ_GCC "/usr/local/bin/s2oj-gcc"
#define UOJ_GPLUSPLUS "/usr/bin/g++-11" #define UOJ_GPLUSPLUS "/usr/local/bin/s2oj-g++"
#define UOJ_PYTHON2_7 "/usr/bin/python2.7" #define UOJ_PYTHON2_7 "/usr/bin/python2.7"
#define UOJ_PYTHON3 "/usr/bin/python3.10" #define UOJ_PYTHON3 "/usr/bin/python3.10"
#define UOJ_FPC "/usr/bin/fpc" #define UOJ_FPC "/usr/bin/fpc"

6
web/Dockerfile
View File

@ -4,11 +4,13 @@ SHELL ["/bin/bash", "-c"]
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends gnupg ca-certificates apt-transport-https && \ apt-get install -y --no-install-recommends gnupg curl ca-certificates apt-transport-https && \
curl https://git.m.ac/api/packages/baoshuo/debian/repository.key -o /etc/apt/trusted.gpg.d/gitmac-baoshuo.asc && \
echo "deb https://git.m.ac/api/packages/baoshuo/debian all main" | tee -a /etc/apt/sources.list.d/gitmac-baoshuo.list && \
(echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" | tee /etc/apt/sources.list.d/ondrej-php.list) && \ (echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" | tee /etc/apt/sources.list.d/ondrej-php.list) && \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C && \
apt-get update && \ apt-get update && \
for pkg in php7.4 php7.4-yaml php7.4-xml php7.4-dev php7.4-zip php7.4-mysql php7.4-mbstring php7.4-gd php7.4-curl php7.4-imagick libseccomp-dev git vim ntp zip unzip curl wget apache2 libapache2-mod-xsendfile php-pear mysql-client build-essential fp-compiler re2c libseccomp-dev libyaml-dev python2.7 python3.10 python3-requests openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk language-pack-zh-hans cron tzdata; do \ for pkg in php7.4 php7.4-yaml php7.4-xml php7.4-dev php7.4-zip php7.4-mysql php7.4-mbstring php7.4-gd php7.4-curl php7.4-imagick libseccomp-dev git vim ntp zip unzip wget apache2 libapache2-mod-xsendfile php-pear mysql-client build-essential s2oj-gcc fp-compiler re2c libseccomp-dev libyaml-dev python2.7 python3.10 python3-requests openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk language-pack-zh-hans cron tzdata; do \
cnt=10 && \ cnt=10 && \
while ! apt-get install -y "$pkg"; do \ while ! apt-get install -y "$pkg"; do \
if [ $cnt -le 0 ]; then \ if [ $cnt -le 0 ]; then \