Commit 6c9cc6f79cea723c0707fee5525e7946d9dcc8de
1 parent
242ec465
Exists in
master
and in
1 other branch
Implementing ci-build script.
Showing
2 changed files
with
27 additions
and
12 deletions
Show diff stats
.vscode/c_cpp_properties.json
... | ... | @@ -20,7 +20,8 @@ |
20 | 20 | "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.23.28105/bin/Hostx64/x64/cl.exe", |
21 | 21 | "cStandard": "c11", |
22 | 22 | "cppStandard": "c++17", |
23 | - "intelliSenseMode": "msvc-x64" | |
23 | + "intelliSenseMode": "msvc-x64", | |
24 | + "configurationProvider": "ms-vscode.makefile-tools" | |
24 | 25 | } |
25 | 26 | ], |
26 | 27 | "version": 4 | ... | ... |
win/ci-build.sh
... | ... | @@ -18,34 +18,48 @@ die ( ) { |
18 | 18 | |
19 | 19 | cd $(dirname $(dirname $(readlink -f ${0}))) |
20 | 20 | |
21 | +rm -fr .build | |
22 | + | |
21 | 23 | # |
22 | 24 | # Build LIB3270 |
23 | 25 | # |
24 | 26 | echo "Building lib3270" |
25 | -rm -fr ./wmi | |
26 | -git clone https://github.com/PerryWerneck/lib3270.git ./lib3270 > $LOGFILE 2>&1 || die "clone lib3270 failure" | |
27 | -pushd 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 | |
28 | 30 | ./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure" |
29 | 31 | ./configure > $LOGFILE 2>&1 || die "Configure failure" |
30 | 32 | make clean > $LOGFILE 2>&1 || die "Make clean failure" |
31 | 33 | make all > $LOGFILE 2>&1 || die "Make failure" |
32 | -popd .. | |
34 | +popd | |
33 | 35 | |
34 | -export LIB3270_CFLAGS="-I./lib3270/src/include" | |
35 | -export LIB3270_LIBS="-L./lib3270/.bin/Release -l3270.delayed" | |
36 | +export LIB3270_CFLAGS="-I./.build/lib3270/src/include" | |
37 | +export LIB3270_LIBS="-L./.build/lib3270/.bin/Release -l3270.delayed" | |
36 | 38 | |
37 | 39 | # |
38 | 40 | # Build LIBV3270 |
39 | 41 | # |
42 | +echo "Building libv3270" | |
43 | +mkdir -p .build/libv3270 | |
44 | +git clone https://github.com/PerryWerneck/libv3270.git ./.build/libv3270 > $LOGFILE 2>&1 || die "clone libv3270 failure" | |
45 | +pushd ./.build/libv3270 | |
46 | +./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure" | |
47 | +./configure > $LOGFILE 2>&1 || die "Configure failure" | |
48 | +make clean > $LOGFILE 2>&1 || die "Make clean failure" | |
49 | +make all > $LOGFILE 2>&1 || die "Make failure" | |
50 | +popd | |
51 | + | |
52 | +export LIBV3270_CFLAGS="-I./.build/libv3270/src/include" | |
53 | +export LIBV3270_LIBS="-L./.build/libv3270/.bin/Release -lv3270" | |
40 | 54 | |
41 | 55 | # |
42 | 56 | # Build PW3270 |
43 | 57 | # |
44 | -#echo "Building VMDETECT" | |
45 | -#./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure" | |
46 | -#./configure > $LOGFILE 2>&1 || die "Configure failure" | |
47 | -#make clean > $LOGFILE 2>&1 || die "Make clean failure" | |
48 | -#make all > $LOGFILE 2>&1 || die "Make failure" | |
58 | +echo "Building PW3270" | |
59 | +./autogen.sh > $LOGFILE 2>&1 || die "Autogen failure" | |
60 | +./configure > $LOGFILE 2>&1 || die "Configure failure" | |
61 | +make clean > $LOGFILE 2>&1 || die "Make clean failure" | |
62 | +make all > $LOGFILE 2>&1 || die "Make failure" | |
49 | 63 | |
50 | 64 | echo "Build complete" |
51 | 65 | ... | ... |