Download as
Browse Code »

Commit 89b9d3ac4187bb69719ac4d8f66d2495f0722deb

Authored by Perry Werneck
2 parents a61a9219 e06ae5ca
Exists in develop

Merge branch 'master' into develop

Showing 1 changed file with 11 additions and 10 deletions   Show diff stats
win/ci-build.sh
  Diff comments   View file @89b9d3a
@@ -16,30 +16,31 @@ die ( ) { @@ -16,30 +16,31 @@ die ( ) {
16 exit -1 16 exit -1
17 } 17 }
18 18
19 -cd $(dirname $(dirname $(readlink -f ${0}))) 19 +myDIR=$(dirname $(dirname $(readlink -f ${0})))
  20 +echo "myDIR=${myDIR}"
20 21
21 -rm -fr .build 22 +cd ${myDIR}
  23 +rm -fr ${myDIR}/.build
22 24
23 # 25 #
24 # Build LIB3270 26 # Build LIB3270
25 # 27 #
26 echo "Building lib3270" 28 echo "Building lib3270"
27 -mkdir -p .build/lib3270  
28 -git clone https://github.com/PerryWerneck/lib3270.git ./.build/lib3270 > $LOGFILE 2>&1 || die "clone lib3270 failure"  
29 -pushd ./.build/lib3270 29 +mkdir -p ${myDIR}/.build/lib3270
  30 +git clone https://github.com/PerryWerneck/lib3270.git ${myDIR}/.build/lib3270 > $LOGFILE 2>&1 || die "clone lib3270 failure"
  31 +pushd ${myDIR}/.build/lib3270
30 ./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure" 32 ./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure"
31 ./configure > $LOGFILE 2>&1 || die "Configure failure" 33 ./configure > $LOGFILE 2>&1 || die "Configure failure"
32 make clean > $LOGFILE 2>&1 || die "Make clean failure" 34 make clean > $LOGFILE 2>&1 || die "Make clean failure"
33 make all > $LOGFILE 2>&1 || die "Make failure" 35 make all > $LOGFILE 2>&1 || die "Make failure"
  36 +make install > $LOGFILE 2>&1 || die "Install failure"
34 popd 37 popd
35 38
36 -export LIB3270_CFLAGS="-I./.build/lib3270/src/include"  
37 -export LIB3270_LIBS="-L./.build/lib3270/.bin/Release -l3270.delayed"  
38 -  
39 # 39 #
40 -# Build LIBV3270 40 +# Build PW3270
41 # 41 #
42 -echo "Building libv3270" 42 +echo "Building PW3270"
  43 +cd ${myDIR}
43 ./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure" 44 ./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure"
44 ./configure > $LOGFILE 2>&1 || die "Configure failure" 45 ./configure > $LOGFILE 2>&1 || die "Configure failure"
45 make clean > $LOGFILE 2>&1 || die "Make clean failure" 46 make clean > $LOGFILE 2>&1 || die "Make clean failure"