Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI-build: do download and setup Open Watcom more transparent #118

Merged
merged 1 commit into from
Dec 23, 2024
Merged

CI-build: do download and setup Open Watcom more transparent #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
*.exe
*.tmp

# CI build
_downloads/**
_output/**
_watcom/**

config.bat
command.com
config.mak
Expand Down
11 changes: 5 additions & 6 deletions ci_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ else
fi
echo CI_BUILD_DIR is \"${CI_BUILD_DIR}\"

OWTAR=ow-snapshot.tar.xz

export PATH=$CI_BUILD_DIR/bin:$PATH:$CI_BUILD_DIR/_watcom/binl64
# Open Watcom Environment Setup
export WATCOM=$CI_BUILD_DIR/_watcom
export PATH=$CI_BUILD_DIR/bin:$PATH:$WATCOM/binl64

# Output directory
rm -rf _output
Expand All @@ -25,7 +24,7 @@ LANGUAGES="english dutch finnish french german italian polish pt pt_br russian s
for lng in ${LANGUAGES} ; do
# Do full clean for rebuild of each language
echo "Do full clean"
git clean -q -x -d -f -e _output -e _watcom -e $OWTAR
git clean -q -x -d -f -e _output -e _watcom -e _download
export LNG=${lng}
./build.sh gcc
TGT="_output/gcc/${LNG}"
Expand All @@ -37,7 +36,7 @@ done
for lng in ${LANGUAGES} ; do
# Do full clean for rebuild of each language
echo "Do full clean"
git clean -q -x -d -f -e _output -e _watcom -e $OWTAR
git clean -q -x -d -f -e _output -e _watcom -e _download
export LNG=${lng}
./build.sh wc
TGT="_output/wc/${LNG}"
Expand All @@ -53,7 +52,7 @@ cp -v _output/gcc/english/command.com ${HOME}/.dosemu/drive_c/[Cc][Oo][Mm][Mm][A

# Watcom (DOS) (slow so just English)
mkdir -p _output/wc_dos/english
git clean -q -x -d -f -e _output -e _watcom -e $OWTAR
git clean -q -x -d -f -e _output -e _watcom -e _download
{
echo set COMPILER=WATCOM
echo set WATCOM='C:\\devel\\watcomc'
Expand Down
19 changes: 6 additions & 13 deletions ci_prereq.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,17 @@ sudo apt install dosemu2 dos2unix
# GCC-IA16 for Linux
sudo apt install gcc-ia16-elf libi86-ia16-elf

# Watcom for Linux
OWTAR=ow-snapshot.tar.xz
if [ ! -d _watcom ] ; then
if [ ! -f $OWTAR ] ; then
echo "Downloading OpenWatcom compiler"
wget --no-verbose https://github.com/open-watcom/open-watcom-v2/releases/download/2023-02-01-Build/$OWTAR
fi
echo "Extracting OpenWatcom compiler"
mkdir _watcom
tar -C _watcom -xf $OWTAR
fi

# Common tools for DOS builds
# Tools for DOS builds
mkdir -p _downloads
mkdir -p _watcom
cd _downloads

HERE=$(pwd)

# download and unpack Open Watcom snapshot
[ -f ow-snapshot.tar.xz ] || wget --no-verbose https://github.com/open-watcom/open-watcom-v2/releases/download/Current-build/ow-snapshot.tar.xz
tar -C ../_watcom -xf ow-snapshot.tar.xz

#IBIBLIO_PATH='http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.2/repos'
IBIBLIO_PATH='https://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/repositories/1.3'

Expand Down