From 799a09681e3435005457e5c9be3b988623e18fd4 Mon Sep 17 00:00:00 2001
From: Jiri Malak <malak.jiri@gmail.com>
Date: Mon, 8 Jul 2024 20:04:44 +0200
Subject: [PATCH] CI-build: a little simplify CI-build development ignore
 _downloads, _output and _watcom sub-directories contents in git use
 _downloads sub-directory for CI buil OW snapshot

---
 .gitignore  |  5 +++++
 ci_build.sh | 25 +++++++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8941ab5..20a5e2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,8 @@ bin/setver.sys
 *~
 *.diff
 *.rej
+
+# CI build
+_downloads/**
+_output/**
+_watcom/**
diff --git a/ci_build.sh b/ci_build.sh
index 93af8be..4bb7a2e 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -11,11 +11,9 @@ echo BUILD_DIR is \"${BUILD_DIR}\"
 rm -rf _output
 mkdir _output
 
-OWTAR=ow-snapshot.tar.xz
-
 # GCC
 mkdir _output/gcc
-git clean -x -d -f -e test -e _output -e _downloads -e _watcom -e $OWTAR
+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/.
@@ -31,18 +29,21 @@ mv -n share/src/share.com _output/gcc/.
 mv -n share/src/share.map _output/gcc/.
 
 # Watcom
+OWTAR=ow-snapshot.tar.xz
 if [ ! -d _watcom ] ; then
-  [ -f $OWTAR ] || wget --no-verbose https://github.com/open-watcom/open-watcom-v2/releases/download/Last-CI-build/$OWTAR
-
+  mkdir -p _downloads
   mkdir _watcom
-  (cd _watcom && tar -xf ../$OWTAR)
+  if [ ! -f _downloads/$OWTAR ] ; then
+    (cd _downloads && wget --no-verbose https://github.com/open-watcom/open-watcom-v2/releases/download/Last-CI-build/$OWTAR)
+  fi
+  (cd _watcom && tar -xf ../_downloads/$OWTAR)
 fi
 
-export PATH=$BUILD_DIR/bin:$PATH:$BUILD_DIR/_watcom/binl64
 export WATCOM=$BUILD_DIR/_watcom
+export PATH=$BUILD_DIR/bin:$PATH:$WATCOM/binl64
 
 mkdir _output/wc
-git clean -x -d -f -e test -e _output -e _downloads -e _watcom -e $OWTAR
+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/.
@@ -50,7 +51,7 @@ mv -n bin/country.sys _output/wc/.
 
 ## DOS (GCC)
 #mkdir _output/gcc_dos
-#git clean -x -d -f -e test -e _output -e _downloads -e _watcom -e $OWTAR
+#git clean -x -d -f -e test -e _output -e _downloads -e _watcom
 #{
 #  echo set COMPILER=GCC
 #  echo set MAKE=make
@@ -65,7 +66,7 @@ mv -n bin/country.sys _output/wc/.
 
 # DOS (Watcom)
 mkdir _output/wc_dos
-git clean -x -d -f -e test -e _output -e _downloads -e _watcom -e $OWTAR
+git clean -x -d -f -e test -e _output -e _downloads -e _watcom
 {
   echo set COMPILER=WATCOM
   echo set WATCOM='C:\\devel\\watcomc'
@@ -74,7 +75,7 @@ git clean -x -d -f -e test -e _output -e _downloads -e _watcom -e $OWTAR
   echo set XFAT=32
   echo set XNASM='C:\\devel\\nasm\\nasm'
   echo set OLDPATH=%PATH%
-  echo set PATH='C:\\devel\\watcomc\\binw;C:\\bin;%OLDPATH%'
+  echo set PATH='%WATCOM%\\binw;C:\\bin;%OLDPATH%'
 } | unix2dos > config.bat
 
 dosemu -td -q -K . -E "build.bat"
@@ -85,7 +86,7 @@ mv -n bin/country.sys _output/wc_dos/.
 # DOS (Turbo C 2.01)
 if [ -d ${HOME}/.dosemu/drive_c/tc201 ] ; then
   mkdir _output/tc_dos
-  git clean -x -d -f -e test -e _output -e _downloads -e _watcom -e $OWTAR
+  git clean -x -d -f -e test -e _output -e _downloads -e _watcom
   {
     echo set COMPILER=TC2
     echo set TC2_BASE='C:\\tc201'