Update ci scripts for support mulyple libs to build and pack in one dir.

6 files changed, 32 insertions, 22 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
diff --git a/.ci/run.sh b/.ci/run.sh
index 89461de..1c2a6a4 100755
--- a/.ci/run.sh
+++ b/.ci/run.sh
@@ -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 ..
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d7d915..dde9e7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ test:commands1:
   stage: test
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
-  - ./.ci/run.sh ./getsrc.sh zlib
+  - ./.ci/runretry.sh ./getsrc.sh zlib
   - ls src/zlib
   - ./.ci/run.sh ./build.sh zlib
   - ls bin/zlib
@@ -33,7 +33,7 @@ test:commands1:
   - ./.ci/run.sh ./clean.sh zlib
   - mkdir bin/zlib
   - ./.ci/run.sh ./clean.sh zlib
-  - ./.ci/run.sh ./updatesrc.sh zlib
+  - ./.ci/runretry.sh ./updatesrc.sh zlib
   variables:
     srcbranch: v1.2.10
   <<: *job-artifacts
@@ -43,7 +43,7 @@ test:commands2:
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext 
                      zlib1g-dev libtool
-  - ./.ci/run.sh ./getsrc.sh curl
+  - ./.ci/runretry.sh ./getsrc.sh curl
   - ls src/curl
   - ./.ci/run.sh ./build.sh curl
   - ls bin/curl
@@ -52,7 +52,7 @@ test:commands2:
   - ./.ci/run.sh ./clean.sh curl
   - mkdir bin/curl
   - ./.ci/run.sh ./clean.sh curl
-  - ./.ci/run.sh ./updatesrc.sh curl
+  - ./.ci/runretry.sh ./updatesrc.sh curl
   variables:
     srcbranch: curl-7_51_0
   <<: *job-artifacts