release: v0.3.2 Triangle Patch 2

release: v0.3.2 Triangle Patch 2

Author: ZsgsDesign

Dockerfile

@@ -5,31 +5,35 @@ LABEL org.opencontainers.image.vendor="NJUPTAAA"
 LABEL org.opencontainers.image.documentation="https://njuptaaa.github.io/docs/#/judgeserver/deploy"
 
 COPY build/java_policy /etc
+COPY --chmod=0755 build/nojasm-compiler /usr/bin
 
 RUN buildDeps='software-properties-common git libtool cmake python-dev python3-pip python-pip libseccomp-dev wget ncurses-dev curl' && \
     export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
     apt-get install -y \
         python \
-        python3.7 \
         python-pkg-resources \
         python3-pkg-resources \
         fp-compiler \
         rustc \
         haskell-platform \
         gcc \
         g++ \
+        gcc-multilib \
+        nasm \
         ruby \
         mono-runtime \
         mono-mcs \
+        iverilog \
         apt-transport-https \
         lsb-release \
         ca-certificates \
         $buildDeps && \
     curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs && \
-    add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk && \
+    add-apt-repository ppa:deadsnakes/ppa && apt-get update && apt-get install -y python3.10 && \
+    add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk openjdk-17-jdk && \
     add-apt-repository ppa:longsleep/golang-backports && apt-get update && apt-get install -y golang-go && \
-    add-apt-repository ppa:ondrej/php && apt-get update && apt-get install -y php7.3-cli && \
+    add-apt-repository ppa:ondrej/php && apt-get update && apt-get install -y php8.1-cli && \
     cd /tmp && wget -O FreeBASIC.tar.gz https://versaweb.dl.sourceforge.net/project/fbc/FreeBASIC-1.09.0/Binaries-Linux/ubuntu-18.04/FreeBASIC-1.09.0-ubuntu-18.04-x86_64.tar.gz && \
     tar zxvf FreeBASIC.tar.gz && rm -f FreeBASIC.tar.gz && cd /tmp/FreeBASIC-1.09.0-ubuntu-18.04-x86_64 && ./install.sh -i && cd /tmp && rm -rf /tmp/FreeBASIC-1.09.0-ubuntu-18.04-x86_64 && \
     pip3 install -I --no-cache-dir psutil gunicorn flask requests idna && \
@@ -41,7 +45,12 @@ RUN buildDeps='software-properties-common git libtool cmake python-dev python3-p
     mkdir -p /code && \
     useradd -u 12001 compiler && useradd -u 12002 code && useradd -u 12003 spj && usermod -a -G code spj
 
-ENV NJS_VERSION v0.3.0-Triangle
+RUN ln -sfn /usr/lib/jvm/java-17-openjdk-amd64/bin/java /usr/bin/java17 && \
+    ln -sfn /usr/lib/jvm/java-17-openjdk-amd64/bin/javac /usr/bin/javac17 && \
+    ln -sfn /usr/lib/jvm/java-8-openjdk-amd64/bin/java /usr/bin/java8 && \
+    ln -sfn /usr/lib/jvm/java-8-openjdk-amd64/bin/javac /usr/bin/javac8
+
+ENV NJS_VERSION v0.3.2-Triangle
 
 ADD server /code
 WORKDIR /code

Dockerfile.cn

@@ -5,6 +5,7 @@ LABEL org.opencontainers.image.vendor="NJUPTAAA"
 LABEL org.opencontainers.image.documentation="https://njuptaaa.github.io/docs/#/judgeserver/deploy"
 
 COPY build/java_policy /etc
+COPY --chmod=0755 build/nojasm-compiler /usr/bin
 
 RUN sed -i s/archive.ubuntu.com/mirrors.aliyun.com/g /etc/apt/sources.list && \
     sed -i s/security.ubuntu.com/mirrors.aliyun.com/g /etc/apt/sources.list && \
@@ -14,25 +15,28 @@ RUN sed -i s/archive.ubuntu.com/mirrors.aliyun.com/g /etc/apt/sources.list && \
     apt-get update && \
     apt-get install -y \
         python \
-        python3.7 \
         python-pkg-resources \
         python3-pkg-resources \
         fp-compiler \
         rustc \
         haskell-platform \
         gcc \
         g++ \
+        gcc-multilib \
+        nasm \
         ruby \
         mono-runtime \
         mono-mcs \
+        iverilog \
         apt-transport-https \
         lsb-release \
         ca-certificates \
         $buildDeps && \
     curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs && \
-    add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk && \
+    add-apt-repository ppa:deadsnakes/ppa && apt-get update && apt-get install -y python3.10 && \
+    add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk openjdk-17-jdk && \
     add-apt-repository ppa:longsleep/golang-backports && apt-get update && apt-get install -y golang-go && \
-    add-apt-repository ppa:ondrej/php && apt-get update && apt-get install -y php7.3-cli && \
+    add-apt-repository ppa:ondrej/php && apt-get update && apt-get install -y php8.1-cli && \
     cd /tmp && wget -O FreeBASIC.tar.gz https://versaweb.dl.sourceforge.net/project/fbc/FreeBASIC-1.09.0/Binaries-Linux/ubuntu-18.04/FreeBASIC-1.09.0-ubuntu-18.04-x86_64.tar.gz && \
     tar zxvf FreeBASIC.tar.gz && rm -f FreeBASIC.tar.gz && cd /tmp/FreeBASIC-1.09.0-ubuntu-18.04-x86_64 && ./install.sh -i && cd /tmp && rm -rf /tmp/FreeBASIC-1.09.0-ubuntu-18.04-x86_64 && \
     pip3 install -I --no-cache-dir psutil gunicorn flask requests idna && \
@@ -44,7 +48,7 @@ RUN sed -i s/archive.ubuntu.com/mirrors.aliyun.com/g /etc/apt/sources.list && \
     mkdir -p /code && \
     useradd -u 12001 compiler && useradd -u 12002 code && useradd -u 12003 spj && usermod -a -G code spj
 
-ENV NJS_VERSION v0.3.0-Triangle
+ENV NJS_VERSION v0.3.2-Triangle
 
 ADD server /code
 WORKDIR /code

README.md

@@ -62,11 +62,15 @@ NOJ JudgeServer is driven by Babel Extension NOJ, see [Babel Extension NOJ](http
 |Language|Compile/Run Command|
 |--------|-------------------|
 |C|/usr/bin/gcc -DONLINE_JUDGE -O2 -w -fmax-errors=3 -std=c99 {src_path} -lm -o {exe_path}|
+|C 11|/usr/bin/gcc -DONLINE_JUDGE -O2 -w -fmax-errors=3 -std=c11 {src_path} -lm -o {exe_path}|
 |C++|/usr/bin/g++ -DONLINE_JUDGE -O2 -w -fmax-errors=3 -std=c++11 {src_path} -lm -o {exe_path}|
-|Java|/usr/bin/javac {src_path} -d {exe_dir} -encoding UTF8<br>/usr/bin/java -cp {exe_dir} -XX:MaxRAM={max_memory}k -Djava.security.manager -Dfile.encoding=UTF-8 -Djava.security.policy==/etc/java_policy -Djava.awt.headless=true Main|
-|Python2|/usr/bin/python -m py_compile {src_path}<br>/usr/bin/python {exe_path}|
-|Python3|/usr/bin/python3.7 -m py_compile {src_path}<br>/usr/bin/python3.7 {exe_path}|
-|PHP7|/usr/bin/php {exe_path}|
+|C++ 14|/usr/bin/g++ -DONLINE_JUDGE -O2 -w -fmax-errors=3 -std=c++14 {src_path} -lm -o {exe_path}|
+|C++ 17|/usr/bin/g++ -DONLINE_JUDGE -O2 -w -fmax-errors=3 -std=c++17 {src_path} -lm -o {exe_path}|
+|Java 8|/usr/bin/javac8 {src_path} -d {exe_dir} -encoding UTF8<br>/usr/bin/java8 -cp {exe_dir} -XX:MaxRAM={max_memory}k -Djava.security.manager -Dfile.encoding=UTF-8 -Djava.security.policy==/etc/java_policy -Djava.awt.headless=true Main|
+|Java 17|/usr/bin/javac17 {src_path} -d {exe_dir} -encoding UTF8<br>/usr/bin/java17 -cp {exe_dir} -XX:MaxRAM={max_memory}k -Djava.security.manager -Dfile.encoding=UTF-8 -Djava.security.policy==/etc/java_policy -Djava.awt.headless=true Main|
+|Python 2.7|/usr/bin/python2.7 -m py_compile {src_path}<br>/usr/bin/python2.7 {exe_path}|
+|Python 3.10|/usr/bin/python3.10 -m py_compile {src_path}<br>/usr/bin/python3.10 {exe_path}|
+|PHP 8.1|/usr/bin/php {exe_path}|
 |Node.js 16|/usr/bin/node --stack-size=65536 {exe_path}|
 |Go|/usr/bin/go build -o {exe_path} {src_path}|
 |C#|/usr/bin/mcs -optimize+ -out:{exe_path} {src_path}|
@@ -76,8 +80,9 @@ NOJ JudgeServer is driven by Babel Extension NOJ, see [Babel Extension NOJ](http
 |Free Pascal|/usr/bin/fpc -O2 -o{exe_path} {src_path}|
 |Plaintext|/bin/cat {exe_path}|
 |Free Basic|/usr/local/bin/fbc {src_path}|
-
-> Besides, `C++14`, `C++17` and `C11` are also supported, they are standards thus would not be listed from above.
+|Assembly (32bit)|/usr/bin/nasm -f elf32 -o {exe_path}.o {src_path} && /usr/bin/gcc -m32 -o {exe_path} {exe_path}.o|
+|Assembly (64bit)|/usr/bin/nasm -f elf64 -o {exe_path}.o {src_path} && /usr/bin/gcc -o {exe_path} {exe_path}.o|
+|SystemVerilog 2012|/usr/bin/iverilog -g2012 -o {exe_path} {src_path}<br>/usr/bin/vvp {exe_path}|
 
 ## Special Judge Support
 

build/nojasm-compiler

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+target_arch=$1
+exe_path=$2
+src_path=$3
+
+if (($target_arch == 32)); then
+    /usr/bin/nasm -f elf32 -o $exe_path.o $src_path
+    status=$?
+    if (($status == 0)); then
+        /usr/bin/gcc -m32 -o $exe_path $exe_path.o
+    else
+        echo ASM Compilation Fatal Error >&2
+        exit $status
+    fi
+elif (($target_arch == 64)); then
+    /usr/bin/nasm -f elf64 -o $exe_path}.o $src_path
+    status=$?
+    if (($status == 0)); then
+        /usr/bin/gcc -o $exe_path $exe_path.o
+    else
+        echo ASM Compilation Fatal Error >&2
+        exit $status
+    fi
+else
+    echo Unsupported Arch >&2
+    exit 1
+fi