summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-30 19:45:50 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-30 20:02:20 +0300
commitf41a97b2aa98de5062ff389e267ddfeead6a4247 (patch)
tree2e2a71a491e989b1ade37aa5c7505083cb9d4ebe /tools
parent96d26755d99fb5124c63df69a06335cc0e6addcf (diff)
downloadevol-hercules-f41a97b2aa98de5062ff389e267ddfeead6a4247.tar.gz
evol-hercules-f41a97b2aa98de5062ff389e267ddfeead6a4247.tar.bz2
evol-hercules-f41a97b2aa98de5062ff389e267ddfeead6a4247.tar.xz
evol-hercules-f41a97b2aa98de5062ff389e267ddfeead6a4247.zip
fix ci scripts
Diffstat (limited to 'tools')
-rwxr-xr-xtools/ci/scripts/init.sh14
1 files changed, 11 insertions, 3 deletions
diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh
index 516cfaf..73c7aba 100755
--- a/tools/ci/scripts/init.sh
+++ b/tools/ci/scripts/init.sh
@@ -32,6 +32,10 @@ function update_repos {
}
function aptget_update {
+ if [ "$CI_SERVER" == "" ];
+ then
+ return
+ fi
echo "apt-get update"
apt-get update
if [ "$?" != 0 ]; then
@@ -49,6 +53,10 @@ function aptget_update {
}
function aptget_install {
+ if [ "$CI_SERVER" == "" ];
+ then
+ return
+ fi
echo "apt-get -y -qq install $*"
apt-get -y -qq install $*
if [ "$?" != 0 ]; then
@@ -111,13 +119,13 @@ function run_configure_simple {
check_error $?
mkdir build
cd build
- echo "../configure $*"
- ../configure $*
+ echo "../configure $* CPPFLAGS="${VARS}""
+ ../configure $* CPPFLAGS="${VARS}"
check_error $?
}
function run_configure {
- run_configure_simple $* CPPFLAGS="${VARS}"
+ run_configure_simple $*
}
function run_make {