diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-02-03 04:21:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-02-03 04:21:46 +0300 |
| commit | ab41e5f152db6a087feab02da111a4f6dcb5c7ea (patch) | |
| tree | 52e6355be0a9d9ed5b0ad8ebd7f1497b49a8a92b /.ci | |
| parent | 8dc0d6e175aeadb00def65f00f049445dabc738d (diff) | |
| download | spm-ab41e5f152db6a087feab02da111a4f6dcb5c7ea.tar.gz spm-ab41e5f152db6a087feab02da111a4f6dcb5c7ea.tar.bz2 spm-ab41e5f152db6a087feab02da111a4f6dcb5c7ea.tar.xz spm-ab41e5f152db6a087feab02da111a4f6dcb5c7ea.zip | |
Update ci scripts for support mulyple libs to build and pack in one dir.
Diffstat (limited to '.ci')
| -rwxr-xr-x | .ci/buildlib.sh | 21 | ||||
| -rwxr-xr-x | .ci/copyfinal.sh | 12 | ||||
| -rwxr-xr-x | .ci/copyspm.sh | 6 | ||||
| -rwxr-xr-x | .ci/run.sh | 2 | ||||
| -rwxr-xr-x | .ci/runretry.sh | 5 |
5 files changed, 28 insertions, 18 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 diff --git a/.ci/copyfinal.sh b/.ci/copyfinal.sh new file mode 100755 index 0000000..562a735 --- /dev/null +++ b/.ci/copyfinal.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +echo mkdir -p "./bin/${installname}" +mkdir -p "./bin/${installname}" + +echo cp -r "/usr/local/spm/bin/${installname}" "./bin/" +cp -r "/usr/local/spm/bin/${installname}" "./bin/" + +echo "/usr/local/spm/env/*.sh ./bin/${installname}/bin/" +cp /usr/local/spm/env/*.sh "./bin/${installname}/bin/" || exit 1 +echo "cp /usr/local/spm/env/run${installname}.sh ./bin/${installname}/bin/runenv.sh" +cp "/usr/local/spm/env/run${installname}.sh" "./bin/${installname}/bin/runenv.sh" || exit 1 diff --git a/.ci/copyspm.sh b/.ci/copyspm.sh new file mode 100755 index 0000000..6cdf1aa --- /dev/null +++ b/.ci/copyspm.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +mkdir /usr/local/spm +cp -r . /usr/local/spm +export dir123=$(pwd) +cd /usr/local/spm @@ -1,5 +1,5 @@ #!/bin/bash cd scripts -../.ci/retry.sh $* || exit 1 +$* || exit 1 cd .. diff --git a/.ci/runretry.sh b/.ci/runretry.sh new file mode 100755 index 0000000..89461de --- /dev/null +++ b/.ci/runretry.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +cd scripts +../.ci/retry.sh $* || exit 1 +cd .. |