Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ mkdir _output/gcc
git clean -x -d -f -e test -e _output -e _downloads -e _watcom
make -C country clean
make all COMPILER=gcc
mv -n bin/KGC*.map bin/KGC*.sys _output/gcc/.
mv -n bin/kgc*.map bin/kgc*.sys _output/gcc/.
mv -n bin/country.sys _output/gcc/.
# GCC share
(
Expand All @@ -36,7 +36,7 @@ mkdir _output/wc
git clean -x -d -f -e test -e _output -e _downloads -e _watcom
make -C country clean
make all COMPILER=owlinux
mv -n bin/KWC*.map bin/KWC*.sys _output/wc/.
mv -n bin/kwc*.map bin/kwc*.sys _output/wc/.
mv -n bin/country.sys _output/wc/.

## DOS (GCC)
Expand Down Expand Up @@ -71,7 +71,7 @@ git clean -x -d -f -e test -e _output -e _downloads -e _watcom
} | unix2dos > config.bat

dosemu -td -q -K . -E "build.bat"
mv -n bin/KWC*.map bin/KWC*.sys _output/wc_dos/.
mv -n bin/kwc*.map bin/kwc*.sys _output/wc_dos/.
mv -n bin/country.sys _output/wc_dos/.


Expand All @@ -91,7 +91,7 @@ if [ -d ${HOME}/.dosemu/drive_c/tc201 ] ; then
} | unix2dos > config.bat

dosemu -td -q -K . -E "build.bat"
mv -n bin/KTC*.map bin/KTC*.sys _output/tc_dos/.
mv -n bin/ktc*.map bin/ktc*.sys _output/tc_dos/.
mv -n bin/country.sys _output/tc_dos/.
# TC share
(
Expand Down
16 changes: 8 additions & 8 deletions ci_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

KVER=8632

if [ ! -f _output/gcc/KGC${KVER}.sys ] ; then
if [ ! -f _output/gcc/kgc${KVER}.sys ] ; then
echo GCC built kernel not present
exit 1
fi

if [ ! -f _output/wc/KWC${KVER}.sys ] ; then
if [ ! -f _output/wc/kwc${KVER}.sys ] ; then
echo Watcom built kernel not present
exit 1
fi

if [ ! -f _output/wc_dos/KWC38632.sys ] ; then
if [ ! -f _output/wc_dos/kwc38632.sys ] ; then
echo Watcom DOS built kernel not present
exit 1
fi

if [ ! -f _output/tc_dos/KTC8632.sys ] && [ -d ${HOME}/.dosemu/drive_c/tc201 ] ; then
if [ ! -f _output/tc_dos/ktc8632.sys ] && [ -d ${HOME}/.dosemu/drive_c/tc201 ] ; then
echo Turbo C 2.01 built kernel not present
exit 1
fi
Expand All @@ -26,23 +26,23 @@ echo Kernels have all been built
find _output -ls

cd test
if ! ./test.sh ../_output/gcc/KGC${KVER}.sys diskgc bootgc 'boot gcc: '
if ! ./test.sh ../_output/gcc/kgc${KVER}.sys diskgc bootgc 'boot gcc: '
then
echo GCC boot test failed
exit 2
fi
if ! ./test.sh ../_output/wc/KWC${KVER}.sys diskwc bootwc 'boot wc: '
if ! ./test.sh ../_output/wc/kwc${KVER}.sys diskwc bootwc 'boot wc: '
then
echo OpenWatcom boot test failed
exit 2
fi
if ! ./test.sh ../_output/wc_dos/KWC38632.sys diskwcd bootwcd 'boot wcd: '
if ! ./test.sh ../_output/wc_dos/kwc38632.sys diskwcd bootwcd 'boot wcd: '
then
echo 'OpenWatcom(DOS) boot test failed'
exit 2
fi
if [ -d ${HOME}/.dosemu/drive_c/tc201 ] ; then
if ! ./test.sh ../_output/tc_dos/KTC8632.sys disktcd boottcd 'boot tcd: '
if ! ./test.sh ../_output/tc_dos/ktc8632.sys disktcd boottcd 'boot tcd: '
then
echo 'Turbo C 2.01 boot test failed'
exit 2
Expand Down
2 changes: 1 addition & 1 deletion mkfiles/bc3.mak
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TINY=-lt
CFLAGST=-L$(LIBPATH) -mt -a- -k- -f- -ff- -O -Z -d
CFLAGSC=-L$(LIBPATH) -a- -mc

TARGET=KT3
TARGET=kt3

# used for building the library

Expand Down
2 changes: 1 addition & 1 deletion mkfiles/bc5.mak
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TINY=-lt
CFLAGST=-L$(LIBPATH) -mt -a- -k- -f- -ff- -O -Z -d
CFLAGSC=-L$(LIBPATH) -a- -mc

TARGET=KBC
TARGET=kbc

# used for building the library

Expand Down
2 changes: 1 addition & 1 deletion mkfiles/gcc.mak
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#* TARGETOPT : options, handled down to the compiler
#**********************************************************************

TARGET=KGC$(XCPU)$(XFAT)
TARGET=kgc$(XCPU)$(XFAT)
TARGETOPT=-march=i8086

ifeq ($(XCPU),186)
Expand Down
2 changes: 1 addition & 1 deletion mkfiles/mscl8.mak
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ TARGETOPT=-G1
TARGETOPT=-G3
!endif

TARGET=KMS
TARGET=kms

#
# heavy stuff - building
Expand Down
2 changes: 1 addition & 1 deletion mkfiles/tc2.mak
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TINY=-lt
CFLAGST=-L$(LIBPATH) -mt -a- -k- -f- -ff- -O -Z -d -w
CFLAGSC=-L$(LIBPATH) -a- -mc

TARGET=KTC
TARGET=ktc

# used for building the library

Expand Down
2 changes: 1 addition & 1 deletion mkfiles/tc3.mak
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TINY=-lt
CFLAGST=-L$(LIBPATH) -mt -a- -k- -f- -ff- -O -Z -d
CFLAGSC=-L$(LIBPATH) -a- -mc

TARGET=KT3
TARGET=kt3

# used for building the library

Expand Down
2 changes: 1 addition & 1 deletion mkfiles/turbocpp.mak
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TINY=-lt
CFLAGST=-L$(LIBPATH) -mt -a- -k- -f- -ff- -O -Z -d
CFLAGSC=-L$(LIBPATH) -a- -mc

TARGET=KTP
TARGET=ktp

# used for building the library

Expand Down
2 changes: 1 addition & 1 deletion mkfiles/watcom.mak
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ TINY=-mt
CFLAGST=-zp1-os-s-we-e3-wx-bt=DOS
CFLAGSC=-mc-zp1-os-s-we-e3-wx-bt=DOS

TARGET=KWC
TARGET=kwc

# used for building the library

Expand Down