CI: Split into two output directories

This commit is contained in:
Andrew Bird 2021-10-07 23:11:57 +01:00 committed by Kenneth J Davis
parent fb372711e5
commit 7479889e79
2 changed files with 9 additions and 7 deletions

View File

@ -12,13 +12,14 @@ rm -rf _output
mkdir _output mkdir _output
# GCC # GCC
mkdir _output/gcc
git clean -x -d -f -e _output -e _watcom -e ow-snapshot.tar.gz git clean -x -d -f -e _output -e _watcom -e ow-snapshot.tar.gz
make all COMPILER=gcc make all COMPILER=gcc
mv -n bin/KGC*.map bin/KGC*.sys _output/. mv -n bin/KGC*.map bin/KGC*.sys _output/gcc/.
# GCC share # GCC share
(cd share && make clobber && env COMPILER=gcc ./build.sh) (cd share && make clobber && env COMPILER=gcc ./build.sh)
mv -n share/share.com _output/gshare.com mv -n share/share.com _output/gcc/.
mv -n share/share.map _output/gshare.map mv -n share/share.map _output/gcc/.
# Watcom # Watcom
if [ ! -d _watcom ] ; then if [ ! -d _watcom ] ; then
@ -31,8 +32,9 @@ fi
export PATH=$BUILD_DIR/bin:$PATH:$BUILD_DIR/_watcom/binl64 export PATH=$BUILD_DIR/bin:$PATH:$BUILD_DIR/_watcom/binl64
export WATCOM=$BUILD_DIR/_watcom export WATCOM=$BUILD_DIR/_watcom
mkdir _output/wc
git clean -x -d -f -e _output -e _watcom -e ow-snapshot.tar.gz git clean -x -d -f -e _output -e _watcom -e ow-snapshot.tar.gz
make all COMPILER=owlinux make all COMPILER=owlinux
mv -n bin/KWC*.map bin/KWC*.sys _output/. mv -n bin/KWC*.map bin/KWC*.sys _output/wc/.
echo done echo done

View File

@ -2,16 +2,16 @@
KVER=8632 KVER=8632
if [ ! -f _output/KGC${KVER}.sys ] ; then if [ ! -f _output/gcc/KGC${KVER}.sys ] ; then
echo GCC built kernel not present echo GCC built kernel not present
exit 1 exit 1
fi fi
if [ ! -f _output/KWC${KVER}.sys ] ; then if [ ! -f _output/wc/KWC${KVER}.sys ] ; then
echo Watcom built kernel not present echo Watcom built kernel not present
exit 1 exit 1
fi fi
echo GCC and Watcom kernels have all been built echo GCC and Watcom kernels have all been built
ls -l _output/K* find _output -ls
exit 0 exit 0