Browse Source

Fix beebjit build

master
peter 4 years ago
parent
commit
0157773d75
  1. 14
      Dockerfile
  2. 2
      Jenkinsfile

14
Dockerfile

@ -100,13 +100,13 @@ RUN cd z88dk && chmod 777 build.sh &&\
FROM src AS beebjit
ARG arch
# Beebjit does not build on arm32v7 so don't build on that platform
#RUN if [ "${arch}" != "arm32v7" ]; then (\
RUN cd beebjit &&\
xvfb-startup ./build.sh &&\
cp -p beebjit /dest/usr/local/bin/ &&\
mkdir -p /dest/usr/local/share/beebjit/ &&\
cp -rp roms /dest/usr/local/share/beebjit/
# );fi
RUN if [ "${arch}" != "arm32v7" ]; then (\
cd beebjit &&\
xvfb-startup ./build.sh &&\
cp -p beebjit /dest/usr/local/bin/ &&\
mkdir -p /dest/usr/local/share/beebjit/ &&\
cp -rp roms /dest/usr/local/share/beebjit/ \
);fi
# ==========================================================================================
# Our own tools built by GO

2
Jenkinsfile vendored

@ -29,7 +29,7 @@ tools = [
[ target:"dasm", label:"dasm Assembler", include: targetAny ],
[ target:"z88dk", label:"z88dk Z80 C compiler & Assembler", include: targetAny ],
// beebjit currently fails on ARM32 with a warning in the sound driver
[ target:"beebjit", label:"beebjit BBC Micro Emulator", include: targetAny ],
[ target:"beebjit", label:"beebjit BBC Micro Emulator", include: targetNotArm32 ],
[ target:"tools", label:"disk image tool", include: targetAny ],
]

Loading…
Cancel
Save