From 39c26b15acc1c9a75229e7e54361e806c50c5e89 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 11 Jan 2023 09:40:48 -0300
Subject: [PATCH] Using ci-build from master.

---
 win/ci-build.sh | 37 -------------------------------------
 1 file changed, 0 insertions(+), 37 deletions(-)
 mode change 100755 => 100644 win/ci-build.sh

diff --git a/win/ci-build.sh b/win/ci-build.sh
old mode 100755
new mode 100644
index 1151fe9..18b9b08
--- a/win/ci-build.sh
+++ b/win/ci-build.sh
@@ -16,82 +16,45 @@ die ( ) {
 	exit -1
 }
 
-<<<<<<< HEAD
-cd $(dirname $(dirname $(readlink -f ${0})))
-
-rm -fr .build
-=======
 myDIR=$(dirname $(dirname $(readlink -f ${0})))
 echo "myDIR=${myDIR}"
 
 cd ${myDIR}
 rm -fr ${myDIR}/.build
->>>>>>> master
 
 #
 # Build LIB3270
 #
 echo "Building lib3270"
-<<<<<<< HEAD
-mkdir -p .build/lib3270
-git clone https://github.com/PerryWerneck/lib3270.git ./.build/lib3270 > $LOGFILE 2>&1 || die "clone lib3270 failure"
-pushd ./.build/lib3270
-=======
 mkdir -p ${myDIR}/.build/lib3270
 git clone https://github.com/PerryWerneck/lib3270.git ${myDIR}/.build/lib3270 > $LOGFILE 2>&1 || die "clone lib3270 failure"
 pushd  ${myDIR}/.build/lib3270
->>>>>>> master
 ./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure"
 ./configure > $LOGFILE 2>&1 || die "Configure failure"
 make clean > $LOGFILE 2>&1 || die "Make clean failure"
 make all  > $LOGFILE 2>&1 || die "Make failure"
-<<<<<<< HEAD
-popd
-
-export LIB3270_CFLAGS="-I./.build/lib3270/src/include"
-export LIB3270_LIBS="-L./.build/lib3270/.bin/Release -l3270.delayed"
-
-=======
 make install  > $LOGFILE 2>&1 || die "Install failure"
 popd
 
->>>>>>> master
 #
 # Build LIBV3270
 #
 echo "Building libv3270"
-<<<<<<< HEAD
-mkdir -p .build/libv3270
-git clone https://github.com/PerryWerneck/libv3270.git ./.build/libv3270 > $LOGFILE 2>&1 || die "clone libv3270 failure"
-pushd ./.build/libv3270
-=======
 mkdir -p  ${myDIR}/.build/libv3270
 git clone https://github.com/PerryWerneck/libv3270.git ${myDIR}/.build/libv3270 > $LOGFILE 2>&1 || die "clone libv3270 failure"
 pushd ${myDIR}/.build/libv3270
->>>>>>> master
 ./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure"
 ./configure > $LOGFILE 2>&1 || die "Configure failure"
 make clean > $LOGFILE 2>&1 || die "Make clean failure"
 make all  > $LOGFILE 2>&1 || die "Make failure"
-<<<<<<< HEAD
-popd
-
-export LIBV3270_CFLAGS="-I./.build/libv3270/src/include ${LIB3270_CFLAGS}"
-export LIBV3270_LIBS="-L./.build/libv3270/.bin/Release -lv3270 ${LIB3270_LIBS}"
-
-=======
 make install  > $LOGFILE 2>&1 || die "Install failure"
 popd
 
->>>>>>> master
 #
 # Build PW3270
 #
 echo "Building PW3270"
-<<<<<<< HEAD
-=======
 cd ${myDIR}
->>>>>>> master
 ./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure"
 ./configure > $LOGFILE 2>&1 || die "Configure failure"
 make clean > $LOGFILE 2>&1 || die "Make clean failure"
--
libgit2 0.21.2