diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-04 23:35:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-04 23:35:29 +0300 |
| commit | 2afa95a5719cc2ac083df7e6b911a36e0a3f21f3 (patch) | |
| tree | 65f41812aa2478042858e4ad0e49efa2f3a58cea /.ci/buildlib.sh | |
| parent | cfaca6721d0dfcf2aa6559a25d9028723b997a18 (diff) | |
| parent | 3b5049928a6c82ce72f99cf07ef40499f027160d (diff) | |
| download | spm-zlib_ng.tar.gz spm-zlib_ng.tar.bz2 spm-zlib_ng.tar.xz spm-zlib_ng.zip | |
Merge branch 'master' into zlib_ngzlib_ng
Diffstat (limited to '.ci/buildlib.sh')
| -rwxr-xr-x | .ci/buildlib.sh | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/.ci/buildlib.sh b/.ci/buildlib.sh index 18ece90..fa6481d 100755 --- a/.ci/buildlib.sh +++ b/.ci/buildlib.sh @@ -1,21 +1,8 @@ #!/bin/bash -mkdir /usr/local/spm -cp -r . /usr/local/spm -export dir123=$(pwd) -cd /usr/local/spm - -export installname="${1}_${2}" -export envname="env" export srcbranch="$2" -./.ci/run.sh ./getsrc.sh "$1" || exit 1 -./.ci/run.sh ./build.sh "$1" || exit 1 - -echo mkdir "${dir123}/bin/${installname}" -mkdir "${dir123}/bin/${installname}" +export envname="${1}_${2}" -echo cp -r "/usr/local/spm/bin/${installname}" "${dir123}/bin/" -cp -r "/usr/local/spm/bin/${installname}" "${dir123}/bin/" - -echo "cp ./env/runenv.sh ${dir123}/bin/${installname}/" -cp "./env/runenv.sh" "${dir123}/bin/${installname}/" || exit 1 +cd /usr/local/spm || exit 1 +./.ci/runretry.sh ./getsrc.sh "$1" || exit 1 +./.ci/run.sh ./build.sh "$1" || exit 1 |