Download as
Browse Code »

Commit 39c26b15acc1c9a75229e7e54361e806c50c5e89

Authored by Perry Werneck
1 parent 2bc6b994
Exists in master and in 1 other branch develop

Using ci-build from master.

Showing 1 changed file with 0 additions and 37 deletions   Show diff stats
win/ci-build.sh 100755 → 100644
  Diff comments   View file @39c26b1
... ... @@ -16,82 +16,45 @@ die ( ) {
16 16 exit -1
17 17 }
18 18  
19   -<<<<<<< HEAD
20   -cd $(dirname $(dirname $(readlink -f ${0})))
21   -
22   -rm -fr .build
23   -=======
24 19 myDIR=$(dirname $(dirname $(readlink -f ${0})))
25 20 echo "myDIR=${myDIR}"
26 21  
27 22 cd ${myDIR}
28 23 rm -fr ${myDIR}/.build
29   ->>>>>>> master
30 24  
31 25 #
32 26 # Build LIB3270
33 27 #
34 28 echo "Building lib3270"
35   -<<<<<<< HEAD
36   -mkdir -p .build/lib3270
37   -git clone https://github.com/PerryWerneck/lib3270.git ./.build/lib3270 > $LOGFILE 2>&1 || die "clone lib3270 failure"
38   -pushd ./.build/lib3270
39   -=======
40 29 mkdir -p ${myDIR}/.build/lib3270
41 30 git clone https://github.com/PerryWerneck/lib3270.git ${myDIR}/.build/lib3270 > $LOGFILE 2>&1 || die "clone lib3270 failure"
42 31 pushd ${myDIR}/.build/lib3270
43   ->>>>>>> master
44 32 ./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure"
45 33 ./configure > $LOGFILE 2>&1 || die "Configure failure"
46 34 make clean > $LOGFILE 2>&1 || die "Make clean failure"
47 35 make all > $LOGFILE 2>&1 || die "Make failure"
48   -<<<<<<< HEAD
49   -popd
50   -
51   -export LIB3270_CFLAGS="-I./.build/lib3270/src/include"
52   -export LIB3270_LIBS="-L./.build/lib3270/.bin/Release -l3270.delayed"
53   -
54   -=======
55 36 make install > $LOGFILE 2>&1 || die "Install failure"
56 37 popd
57 38  
58   ->>>>>>> master
59 39 #
60 40 # Build LIBV3270
61 41 #
62 42 echo "Building libv3270"
63   -<<<<<<< HEAD
64   -mkdir -p .build/libv3270
65   -git clone https://github.com/PerryWerneck/libv3270.git ./.build/libv3270 > $LOGFILE 2>&1 || die "clone libv3270 failure"
66   -pushd ./.build/libv3270
67   -=======
68 43 mkdir -p ${myDIR}/.build/libv3270
69 44 git clone https://github.com/PerryWerneck/libv3270.git ${myDIR}/.build/libv3270 > $LOGFILE 2>&1 || die "clone libv3270 failure"
70 45 pushd ${myDIR}/.build/libv3270
71   ->>>>>>> master
72 46 ./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure"
73 47 ./configure > $LOGFILE 2>&1 || die "Configure failure"
74 48 make clean > $LOGFILE 2>&1 || die "Make clean failure"
75 49 make all > $LOGFILE 2>&1 || die "Make failure"
76   -<<<<<<< HEAD
77   -popd
78   -
79   -export LIBV3270_CFLAGS="-I./.build/libv3270/src/include ${LIB3270_CFLAGS}"
80   -export LIBV3270_LIBS="-L./.build/libv3270/.bin/Release -lv3270 ${LIB3270_LIBS}"
81   -
82   -=======
83 50 make install > $LOGFILE 2>&1 || die "Install failure"
84 51 popd
85 52  
86   ->>>>>>> master
87 53 #
88 54 # Build PW3270
89 55 #
90 56 echo "Building PW3270"
91   -<<<<<<< HEAD
92   -=======
93 57 cd ${myDIR}
94   ->>>>>>> master
95 58 ./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure"
96 59 ./configure > $LOGFILE 2>&1 || die "Configure failure"
97 60 make clean > $LOGFILE 2>&1 || die "Make clean failure"
... ...