diff --git a/distro/scripts/adl_cots.sh b/distro/scripts/adl_cots.sh
index 3099a0c8eab947b6ccebd20607b84b2a91d2f18e..85cd1e64166b9efab1902c6b1a5bf759379e0fa0 100755
--- a/distro/scripts/adl_cots.sh
+++ b/distro/scripts/adl_cots.sh
@@ -68,7 +68,7 @@ export PATH=${USER_COTS_PATH}/bin:$PATH
export LDFLAGS="-L${USER_COTS_PATH}/lib -L${USER_COTS_PATH}/lib64 "
install_the_source (){
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
# This will download and unpack the requested COT. If the cot is already present it will not be downloaded.
tar_name=$1
@@ -131,47 +131,45 @@ echo_vars()
}
-
-
mk_xerces() {
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=xerces-c-3.2.3.tar.gz && \
install_the_source ${tar_name} && \
cd ${BUILD}/xerces-c-3.2.3 && \
./configure --enable-static --enable-shared --prefix=${USER_COTS_PATH} && \
make && \
make install && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
mk_png() {
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=libpng-1.6.37.tar.gz && \
install_the_source ${tar_name} && \
cd ${BUILD}/libpng* && \
./configure --prefix=${USER_COTS_PATH} && \
make && \
make install && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
mk_zlib() {
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=zlib-1.2.7.tar.gz && \
install_the_source ${tar_name} && \
cd ${BUILD}/zlib* && \
./configure --prefix=${USER_COTS_PATH} && \
make && \
make install && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
mk_bz2() {
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=bzip2-1.0.6.tar.gz && /
install_the_source ${tar_name} && /
cd ${BUILD}/bz* && /
@@ -181,30 +179,27 @@ rm bzless; ln -sr bzmore bzless && /
rm bzegrep; ln -sr bzgrep bzegrep && /
rm bzfgrep; ln -sr bzgrep bzfgrep && /
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
-# -D_GLIBCXX_USE_CXX11_ABI=0
+
+
mk_boost(){
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=boost_1_57_0.tar.gz && \
rm -fr ${USER_COTS_PATH}/lib/*boost* && \
rm -fr ${USER_COTS_PATH}/include/boost && \
install_the_source ${tar_name} && \
cd ${BUILD}/boost* && \
- ./bootstrap.sh --help
./bootstrap.sh --with-toolset=gcc --with-libraries="filesystem","iostreams","regex","thread","serialization","system" --prefix="${USER_COTS_PATH}" && \
- ./b2 --help-options
./b2 install toolset=gcc -q --build-dir=tmp --debug-configuration -d+2 --prefix="${USER_COTS_PATH}" linkflags="-L${USER_COTS_PATH}/lib" cxxflags="${CXXFLAGS} -Wunused-but-set-parameter " && \
- #./b2 install --debug-configuration -d+2 --prefix="'${USER_COTS_PATH}'" --build-dir=tmp/build-boost optimization=speed linkflags="-L${USER_COTS_PATH}/lib" cxxflags="'${CXXFLAGS}' " && \
-
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
mk_wgrib2() {
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=wgrib2.v2.0.2.tgz && \
rm -fr ${BUILD}/grib2 && \
install_the_source ${tar_name} && \
@@ -216,14 +211,12 @@ mk_wgrib2() {
cp -f --preserve=links ./jasp*/src/libjasper/.libs/* ${USER_COTS_PATH}/lib && \
cp -f ./g2clib-1.4.0/grib2.h ${USER_COTS_PATH}/include && \
cp ${BUILD}/grib2/wgrib2/wgrib2 ${USER_COTS_PATH}/bin && \
- #ln -fs ${USER_COTS_PATH}/lib ${USER_COTS_PATH}/g2clib-1.4.0 && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
mk_hdf5() {
- echo ${FUNCNAME[0]}
- gcc --version
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=hdf5-1.10.4.tar.gz && \
install_the_source ${tar_name} && \
cd ${BUILD}/hdf* && \
@@ -232,40 +225,39 @@ mk_hdf5() {
make clean && \
make -j 3 && \
make install && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
mk_log4cplus() {
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=log4cplus-1.0.4.3.tar.gz && \
install_the_source ${tar_name} && \
cd ${BUILD}/log4c* && \
./configure --prefix=${USER_COTS_PATH} && \
make && \
make install && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
mk_szip()
{
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=szip-2.1.tar.gz && \
rm -fr ${BUILD}/szip* && \
- #rm ${USER_COTS_PATH}/lib/*slibc*
install_the_source ${tar_name} && \
cd ${BUILD}/szip* && \
./configure --prefix=${USER_COTS_PATH} && \
make && \
make install && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
mk_slibc()
{
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=slibc-0.9.3.tar.gz && \
rm -fr ${BUILD}/slibc* && \
@@ -283,13 +275,13 @@ mk_slibc()
cd ${USER_COTS_PATH}/lib && \
ln -s ./libslibc.so.0.9.3 libslibc.so && \
ln -s ./libslibc.so.0.9.3 libslibc++.so && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
mk_sqlite()
{
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=sqlite-autoconf-3330000.tar.gz && \
rm -fr ${BUILD}/SQ* && \
cd ${BUILD} && \
@@ -298,13 +290,12 @@ mk_sqlite()
./configure --prefix=${USER_COTS_PATH} --exec-prefix=${USER_COTS_PATH} --disable-tcl && \
make && \
make install && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
-#liblapack.a
mk_lapack(){
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=lapack-3.5.0.tgz && \
rm -fr ${BUILD}/lapack* && \
install_the_source $tar_name && \
@@ -313,39 +304,34 @@ mk_lapack(){
echo "Building BLAS / LAPACK" && \
cd BLAS/SRC && \
export LD_RUN_PATH=${USER_COTS_PATH}/lib64:${USER_COTS_PATH}/lib && \
- echo $LD_RUN_PATH && \
export FORTRAN=${FC} && \
export LOADER=${FC} && \
-
-
make OPTS=" -msse4a -O3 -fPIC -Wall -funderscoring " LD_RUN_PATH=${LD_RUN_PATH} FORTRAN="${FORTRAN} -funderscoring -g " LOADER="${LOADER}" && \
cd ../.. && \
make OPTS=" -msse4a -fPIC -Wall " LD_RUN_PATH=${LD_RUN_PATH} FORTRAN="${FORTRAN} -fimplicit-none -funderscoring -g" LOADER="${LOADER} -g" && \
cp librefblas.a libblas.a && \
cp *.a ${USER_COTS_PATH}/lib && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
mk_gtest()
{
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=gtest-1.7.0.zip && \
rm -fr ${BUILD}/gtest* && \
cd ${BUILD} && \
install_the_source ${tar_name} && \
cd ${BUILD}/gtest* && \
- ./configure --prefix=${USER_COTS_PATH} && \
-
- echo "${FUNCNAME[0]} finished" && \
+ ./configure --prefix=${USER_COTS_PATH} && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
-
}
mk_proto()
{
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
export PATH=/CSPP_SDR_4_0/JAVA_COTS/jdk1.8.0_73/bin/:$PATH
tar_name=protobuf-3.8.x.zip && \
@@ -364,7 +350,6 @@ mk_proto()
make -j 3 && \
make install && \
LIB=${BUILD}/protobuf-3.8/lib && \
- echo "Now java part at line 366" && \
cd ${BUILD}/protobuf*/java && \
export LD_LIBRARY_PATH=${USER_COTS_PATH}/lib && \
export LD_RUN_PATH=${USER_COTS_PATH}/lib && \
@@ -376,24 +361,25 @@ mk_proto()
cd ${BUILD}/protobuf* && \
cd java/core/src/main/java && \
jar cf ${USER_COTS_PATH}/lib/protobuf-java-3.8.0.jar com/google/protobuf/*.class && \
- echo "mk_proto complete"
-
+ echo "mk_proto complete" && \
+ return 0
}
mk_fftw() {
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=fftw-3.3.4.tar.gz && \
install_the_source $tar_name && \
cd ${BUILD}/fftw* && \
CFLAGS=-msse4a ./configure --with-gcc-arch=pentium4 --enable-shared=yes --enable-static=yes --enable-portable-binary --prefix=${USER_COTS_PATH} && \
make && \
- make install
+ make install && \
+ return 0
}
mk_slatec4 ()
{
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=slatec.tar.gz && \
install_the_source $tar_name && \
@@ -403,7 +389,7 @@ mk_slatec4 ()
}
mk_pppack() {
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=pppack.tar.gz && \
rm -fr ${BUILD}/pppack* && \
install_the_source ${tar_name} && \
@@ -421,7 +407,7 @@ mk_pppack() {
mk_libtool()
{
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=libtool-2.4.6.tar.gz && \
rm -fr ${BUILD}/libtool* && \
install_the_source ${tar_name} && \
@@ -429,11 +415,11 @@ mk_libtool()
./configure --prefix=${USER_COTS_PATH} && \
make && \
make install && \
- echo "${FUNCNAME[0]} finished"
+ printf "%s finished \n" ${FUNCNAME[0]}
}
mk_cminpak(){
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
tar_name=cminpack-1.3.6.zip && \
cd ${BUILD} && \
rm -fr ${BUILD}/cminpack-1.3.6 && \
@@ -442,12 +428,11 @@ mk_cminpak(){
make -f Makefile && \
cp cminpack.h ${USER_COTS_PATH}/include && \
cp libcminpack.a ${USER_COTS_PATH}/lib && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
-
where()
{
echo "${FUNCNAME[0]}"
@@ -460,13 +445,13 @@ where()
cp ${ADL_COTS}/where.f . && \
gfortran where.f gettim.c getday.c -o where && \
cp where ${USER_COTS_PATH}/bin && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
mk_hl_region()
{
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
rm -fr ${BUILD}/hdf5_HL*
tar_name=hdf5_HL_REGION-1.1.5.tar.gz && \
install_the_source $tar_name && \
@@ -477,7 +462,7 @@ mk_hl_region()
make clean && \
make CC=$CC INCLUDES="$CPPFLAGS -I${USER_COTS_PATH}/include -I$linc/src $LDFLAGS -lhdf5 -lhdf5_hl -lm" && \
make PREFIX=${USER_COTS_PATH} install && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
mk_nagg(){
@@ -491,7 +476,7 @@ mk_nagg(){
./configure --prefix=${USER_COTS_PATH} --exec-prefix="${USER_COTS_PATH}" --with-hlregion="${USER_COTS_PATH}/lib" CFLAGS="${CFLAGS} -I${USER_COTS_PATH}/include " CPPFLAGS="${CPPFLAGS} -I${USER_COTS_PATH}/include " LDFLAGS="${LDFLAGS} -lm " && \
make && \
make install && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
@@ -508,7 +493,7 @@ wipe()
for_container()
{
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
MYLIBS=/usr/lib64/
@@ -545,7 +530,7 @@ fix_links()
ln -s ./bzfgrep bzgrep && \
rm -f bzless && \
ln -s ./bzless bzmore && \
- echo "${FUNCNAME[0]} finished" && \
+ printf "%s finished \n" ${FUNCNAME[0]} && \
return 0
}
@@ -630,7 +615,7 @@ all()
adl()
{
- echo ${FUNCNAME[0]}
+ printf "%s \n" ${FUNCNAME[0]}
export PATH=/CSPP_SDR_4_0/JAVA_COTS/jdk1.8.0_73/bin/:$PATH
cd ${BUILD}