From 91d26930475e309b62b78c600c52290f40295e09 Mon Sep 17 00:00:00 2001
From: ye-jianbang <173945901@qq.com>
Date: Tue, 26 Apr 2022 11:10:32 +0800
Subject: [PATCH 1/2] add libs

---
 package/R/3.6.3/install.sh                               | 3 +--
 package/automake/1.16.5/install.sh                       | 3 +--
 package/boost/1.72.0/clang/install.sh                    | 9 +++++++++
 package/git/2.35.1/install.sh                            | 2 +-
 package/htslib/1.15/install.sh                           | 2 +-
 package/libjpeg/v7/install.sh                            | 2 +-
 package/libpng/1.6.37/install.sh                         | 2 +-
 package/python3/3.7.10/install.sh                        | 2 +-
 package/samtools/1.15/install.sh                         | 2 +-
 package/szip/2.1.1/install.sh                            | 2 +-
 package/udunits/2.2.28/install.sh                        | 2 +-
 package/zlib/1.2.11/install.sh                           | 2 +-
 templates/R/3.6.3/data.R.arm.bisheng.config              | 4 ----
 .../automake/1.16.5/data.automake.arm.bisheng.config     | 4 ----
 templates/boost/1.72.0/data.boost.arm.cpu.config         | 7 +------
 templates/git/2.35.1/data.git.arm.bisheng.config         | 4 ----
 templates/htslib/1.15/data.htslib.arm.bisheng.config     | 4 ----
 templates/libjpeg/v7/data.libjpeg.arm.cpu.config         | 5 -----
 templates/libpng/1.6.37/data.libpng.arm.cpu.config       | 5 -----
 templates/python3/3.7.10/data.python3.arm.bisheng.config | 4 ----
 templates/samtools/1.15/data.samtools.arm.bisheng.config | 4 ----
 templates/szip/2.1.1/data.szip.arm.bisheng.config        | 4 ----
 templates/udunits/2.2.28/data.udunits.arm.cpu.config     | 7 -------
 templates/zlib/1.2.11/data.zlib.arm.cpu.config           | 5 -----
 24 files changed, 21 insertions(+), 69 deletions(-)
 create mode 100644 package/boost/1.72.0/clang/install.sh

diff --git a/package/R/3.6.3/install.sh b/package/R/3.6.3/install.sh
index daa865d..66c0e2e 100755
--- a/package/R/3.6.3/install.sh
+++ b/package/R/3.6.3/install.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
-
-#wget https://cloud.r-project.org/src/base/R-3/R-3.6.3.tar.gz
 #yum install libXt-devel.aarch64 readline-devel.aarch64
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u https://cloud.r-project.org/src/base/R-3/R-3.6.3.tar.gz
 cd ${JARVIS_TMP}
 tar -xvf ${JARVIS_DOWNLOAD}/R-3.6.3.tar.gz
 cd R-3.6.3
diff --git a/package/automake/1.16.5/install.sh b/package/automake/1.16.5/install.sh
index 3ef8673..233a4d7 100644
--- a/package/automake/1.16.5/install.sh
+++ b/package/automake/1.16.5/install.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
-
-#wget https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz
 cd ${JARVIS_TMP}
 tar -xvf ${JARVIS_DOWNLOAD}/automake-1.16.5.tar.gz
 cd automake-1.16.5
diff --git a/package/boost/1.72.0/clang/install.sh b/package/boost/1.72.0/clang/install.sh
new file mode 100644
index 0000000..d6cfad1
--- /dev/null
+++ b/package/boost/1.72.0/clang/install.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -x
+set -e
+. ${DOWNLOAD_TOOL} -u https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz
+cd ${JARVIS_TMP}
+tar -xvf ${JARVIS_DOWNLOAD}/boost_1_72_0.tar.gz
+cd boost_1_72_0
+./bootstrap.sh --with-toolset=clang
+./b2 install --prefix=$1
diff --git a/package/git/2.35.1/install.sh b/package/git/2.35.1/install.sh
index 9993f8b..7533c13 100644
--- a/package/git/2.35.1/install.sh
+++ b/package/git/2.35.1/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-#wget https://github.com/git/git/archive/refs/tags/v2.35.1.tar.gz -O git-2.35.1.tar.gz
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u https://github.com/git/git/archive/refs/tags/v2.35.1.tar.gz -f git-2.35.1.tar.gz
 cd ${JARVIS_TMP}
 tar -xvf ${JARVIS_DOWNLOAD}/git-2.35.1.tar.gz
 cd git-2.35.1
diff --git a/package/htslib/1.15/install.sh b/package/htslib/1.15/install.sh
index c9d1359..a8064d9 100644
--- a/package/htslib/1.15/install.sh
+++ b/package/htslib/1.15/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-#wget https://github.com/samtools/htslib/releases/download/1.15/htslib-1.15.tar.bz2
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u https://github.com/samtools/htslib/releases/download/1.15/htslib-1.15.tar.bz2
 cd ${JARVIS_TMP}
 tar -xvf ${JARVIS_DOWNLOAD}/htslib-1.15.tar.bz2
 cd htslib-1.15 
diff --git a/package/libjpeg/v7/install.sh b/package/libjpeg/v7/install.sh
index 56a4f9a..46215f2 100644
--- a/package/libjpeg/v7/install.sh
+++ b/package/libjpeg/v7/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-#下载地址：http://www.ijg.org/files/jpegsrc.v7.tar.gz
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u http://www.ijg.org/files/jpegsrc.v7.tar.gz
 cd ${JARVIS_TMP}
 tar xvf ${JARVIS_DOWNLOAD}/jpegsrc.v7.tar.gz
 cd jpeg-7
diff --git a/package/libpng/1.6.37/install.sh b/package/libpng/1.6.37/install.sh
index 5bbc9ff..af16a46 100644
--- a/package/libpng/1.6.37/install.sh
+++ b/package/libpng/1.6.37/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-#下载地址：https://nchc.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.gz
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u https://nchc.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.gz
 cd ${JARVIS_TMP}
 tar xvf ${JARVIS_DOWNLOAD}/libpng-1.6.37.tar.gz
 cd libpng-1.6.37
diff --git a/package/python3/3.7.10/install.sh b/package/python3/3.7.10/install.sh
index 2dd773f..38b87d0 100644
--- a/package/python3/3.7.10/install.sh
+++ b/package/python3/3.7.10/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# https://repo.huaweicloud.com/python/3.7.10/Python-3.7.10.tgz
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u https://repo.huaweicloud.com/python/3.7.10/Python-3.7.10.tgz
 cd ${JARVIS_TMP}
 #yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-devel readline-devel tk-devel gcc make libffi-devel
 tar -zxvf ${JARVIS_DOWNLOAD}/Python-3.7.10.tgz
diff --git a/package/samtools/1.15/install.sh b/package/samtools/1.15/install.sh
index c275133..09bc470 100644
--- a/package/samtools/1.15/install.sh
+++ b/package/samtools/1.15/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-#wget https://github.com/samtools/samtools/releases/download/1.15/samtools-1.15.tar.bz2
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u https://github.com/samtools/samtools/releases/download/1.15/samtools-1.15.tar.bz2
 cd ${JARVIS_TMP}
 tar xvf ${JARVIS_DOWNLOAD}/samtools-1.15.tar.bz2
 cd samtools-1.15
diff --git a/package/szip/2.1.1/install.sh b/package/szip/2.1.1/install.sh
index 12191e7..6cc1367 100644
--- a/package/szip/2.1.1/install.sh
+++ b/package/szip/2.1.1/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-#wget https://distfiles.macports.org/szip/szip-2.1.1.tar.gz
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u https://distfiles.macports.org/szip/szip-2.1.1.tar.gz 
 cd ${JARVIS_TMP}
 tar xvf ${JARVIS_DOWNLOAD}/szip-2.1.1.tar.gz
 cd szip-2.1.1
diff --git a/package/udunits/2.2.28/install.sh b/package/udunits/2.2.28/install.sh
index 5538418..655e441 100644
--- a/package/udunits/2.2.28/install.sh
+++ b/package/udunits/2.2.28/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-#下载地址：https://artifacts.unidata.ucar.edu/repository/downloads-udunits/2.2.28/udunits-2.2.28.tar.gz
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u https://artifacts.unidata.ucar.edu/repository/downloads-udunits/2.2.28/udunits-2.2.28.tar.gz
 cd ${JARVIS_TMP}
 tar xvf ${JARVIS_DOWNLOAD}/udunits-2.2.28.tar.gz
 cd udunits-2.2.28
diff --git a/package/zlib/1.2.11/install.sh b/package/zlib/1.2.11/install.sh
index 1122db7..5fe5b47 100644
--- a/package/zlib/1.2.11/install.sh
+++ b/package/zlib/1.2.11/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-#下载地址：http://www.zlib.net/zlib-1.2.11.tar.gz
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u http://www.zlib.net/zlib-1.2.11.tar.gz
 cd ${JARVIS_TMP}
 tar -xvf ${JARVIS_DOWNLOAD}/zlib-1.2.11.tar.gz
 cd zlib-1.2.11
diff --git a/templates/R/3.6.3/data.R.arm.bisheng.config b/templates/R/3.6.3/data.R.arm.bisheng.config
index 9f7779a..10cceed 100644
--- a/templates/R/3.6.3/data.R.arm.bisheng.config
+++ b/templates/R/3.6.3/data.R.arm.bisheng.config
@@ -1,10 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-R/3.6.3 https://cloud.r-project.org/src/base/R-3/R-3.6.3.tar.gz
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
-
 [DEPENDENCY]
 ./jarvis -install bisheng/2.1.0 com
 
diff --git a/templates/automake/1.16.5/data.automake.arm.bisheng.config b/templates/automake/1.16.5/data.automake.arm.bisheng.config
index 32ba035..540e577 100644
--- a/templates/automake/1.16.5/data.automake.arm.bisheng.config
+++ b/templates/automake/1.16.5/data.automake.arm.bisheng.config
@@ -1,10 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-automake/1.16.5 https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
-
 [DEPENDENCY]
 ./jarvis -install bisheng/2.1.0 com
 
diff --git a/templates/boost/1.72.0/data.boost.arm.cpu.config b/templates/boost/1.72.0/data.boost.arm.cpu.config
index c9ee64d..8974380 100644
--- a/templates/boost/1.72.0/data.boost.arm.cpu.config
+++ b/templates/boost/1.72.0/data.boost.arm.cpu.config
@@ -1,11 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-boost/1.72.0 https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
-
-
 [DEPENDENCY]
 ./jarvis -install bisheng/2.1.0 com
 
@@ -22,7 +17,7 @@ binary_dir =
 case_dir =
 
 [BUILD]
-./jarvis -install boost/1.72.0 clang
+./jarvis -install boost/1.72.0/clang clang
 
 [RUN]
 run =
diff --git a/templates/git/2.35.1/data.git.arm.bisheng.config b/templates/git/2.35.1/data.git.arm.bisheng.config
index ace25fa..986ded6 100644
--- a/templates/git/2.35.1/data.git.arm.bisheng.config
+++ b/templates/git/2.35.1/data.git.arm.bisheng.config
@@ -1,10 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-git/2.35.1 https://github.com/git/git/archive/refs/tags/v2.35.1.tar.gz git-2.35.1.tar.gz
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
-
 [DEPENDENCY]
 ./jarvis -install bisheng/2.1.0 com
 
diff --git a/templates/htslib/1.15/data.htslib.arm.bisheng.config b/templates/htslib/1.15/data.htslib.arm.bisheng.config
index 452779d..8f652df 100644
--- a/templates/htslib/1.15/data.htslib.arm.bisheng.config
+++ b/templates/htslib/1.15/data.htslib.arm.bisheng.config
@@ -1,10 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-htslib/1.15 https://github.com/samtools/htslib/releases/download/1.15/htslib-1.15.tar.bz2
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
-
 [DEPENDENCY]
 ./jarvis -install bisheng/2.1.0 com
 
diff --git a/templates/libjpeg/v7/data.libjpeg.arm.cpu.config b/templates/libjpeg/v7/data.libjpeg.arm.cpu.config
index dda95b7..705fd5e 100644
--- a/templates/libjpeg/v7/data.libjpeg.arm.cpu.config
+++ b/templates/libjpeg/v7/data.libjpeg.arm.cpu.config
@@ -1,11 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-libjpeg/v7 http://www.ijg.org/files/jpegsrc.v7.tar.gz
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
-
-
 [DEPENDENCY]
 ./jarvis -install bisheng/2.1.0 com
 
diff --git a/templates/libpng/1.6.37/data.libpng.arm.cpu.config b/templates/libpng/1.6.37/data.libpng.arm.cpu.config
index 2df1be7..9f05387 100644
--- a/templates/libpng/1.6.37/data.libpng.arm.cpu.config
+++ b/templates/libpng/1.6.37/data.libpng.arm.cpu.config
@@ -1,11 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-libpng/1.6.37 https://nchc.dl.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.gz
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
-
-
 [DEPENDENCY]
 ./jarvis -install bisheng/2.1.0 com
 
diff --git a/templates/python3/3.7.10/data.python3.arm.bisheng.config b/templates/python3/3.7.10/data.python3.arm.bisheng.config
index 0796dbf..54604f2 100644
--- a/templates/python3/3.7.10/data.python3.arm.bisheng.config
+++ b/templates/python3/3.7.10/data.python3.arm.bisheng.config
@@ -1,10 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-python3/3.7.10 https://repo.huaweicloud.com/python/3.7.10/Python-3.7.10.tgz
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
-
 [DEPENDENCY]
 ./jarvis -install bisheng/2.1.0 com
 
diff --git a/templates/samtools/1.15/data.samtools.arm.bisheng.config b/templates/samtools/1.15/data.samtools.arm.bisheng.config
index 8dac01a..ebac9fe 100644
--- a/templates/samtools/1.15/data.samtools.arm.bisheng.config
+++ b/templates/samtools/1.15/data.samtools.arm.bisheng.config
@@ -1,10 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-samtools/1.15 https://github.com/samtools/samtools/releases/download/1.15/samtools-1.15.tar.bz2
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
-
 [DEPENDENCY]
 ./jarvis -install bisheng/2.1.0 com
 
diff --git a/templates/szip/2.1.1/data.szip.arm.bisheng.config b/templates/szip/2.1.1/data.szip.arm.bisheng.config
index 03c22f2..95e26ac 100644
--- a/templates/szip/2.1.1/data.szip.arm.bisheng.config
+++ b/templates/szip/2.1.1/data.szip.arm.bisheng.config
@@ -1,10 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-szip/2.1.1 https://distfiles.macports.org/szip/szip-2.1.1.tar.gz
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
-
 [DEPENDENCY]
 ./jarvis -install bisheng/2.1.0 com
 
diff --git a/templates/udunits/2.2.28/data.udunits.arm.cpu.config b/templates/udunits/2.2.28/data.udunits.arm.cpu.config
index 4e81b5a..b9c54c8 100644
--- a/templates/udunits/2.2.28/data.udunits.arm.cpu.config
+++ b/templates/udunits/2.2.28/data.udunits.arm.cpu.config
@@ -1,13 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-udunits/2.2.28 https://artifacts.unidata.ucar.edu/repository/downloads-udunits/2.2.28/udunits-2.2.28.tar.gz
-hucx/1.1.1 https://github.com/kunpengcompute/hucx/archive/refs/tags/v1.1.1-huawei.tar.gz hucx-1.1.1-huawei.tar.gz
-xucg/1.1.1 https://github.com/kunpengcompute/xucg/archive/refs/tags/v1.1.1-huawei.tar.gz xucg-1.1.1-huawei.tar.gz
-hmpi/1.1.1 https://github.com/kunpengcompute/hmpi/archive/refs/tags/v1.1.1-huawei.tar.gz hmpi-1.1.1-huawei.tar.gz
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
-
 [DEPENDENCY]
 module purge
 ./jarvis -install bisheng/2.1.0 com
diff --git a/templates/zlib/1.2.11/data.zlib.arm.cpu.config b/templates/zlib/1.2.11/data.zlib.arm.cpu.config
index 18845ba..f936d12 100644
--- a/templates/zlib/1.2.11/data.zlib.arm.cpu.config
+++ b/templates/zlib/1.2.11/data.zlib.arm.cpu.config
@@ -1,11 +1,6 @@
 [SERVER]
 11.11.11.11
 
-[DOWNLOAD]
-zlib/1.2.11 https://nchc.dl.sourceforge.net/project/libpng/zlib/1.2.11/zlib-1.2.11.tar.gz
-bisheng/2.1.0 https://mirrors.huaweicloud.com/kunpeng/archive/compiler/bisheng_compiler/bisheng-compiler-2.1.0-aarch64-linux.tar.gz
-
-
 [DEPENDENCY]
 ./jarvis -install bisheng/2.1.0 com
 
-- 
Gitee


From c34a6a26d687583e6f0889b8651765a453a82aef Mon Sep 17 00:00:00 2001
From: ye-jianbang <173945901@qq.com>
Date: Tue, 26 Apr 2022 11:19:07 +0800
Subject: [PATCH 2/2] add_boost

---
 package/boost/1.72.0/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/boost/1.72.0/install.sh b/package/boost/1.72.0/install.sh
index b4f4932..d74792d 100644
--- a/package/boost/1.72.0/install.sh
+++ b/package/boost/1.72.0/install.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
-#wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz
 set -x
 set -e
+. ${DOWNLOAD_TOOL} -u https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz
 cd ${JARVIS_TMP}
 tar -xvf ${JARVIS_DOWNLOAD}/boost_1_72_0.tar.gz
 cd boost_1_72_0
-./bootstrap.sh --with-toolset=clang
+./bootstrap.sh
 ./b2 install --prefix=$1
-- 
Gitee