From 17077be9565c19a99c5e1f8e82de4143017417f9 Mon Sep 17 00:00:00 2001
From: Scott Mindock <srmindock@wisc.edu>
Date: Thu, 28 Mar 2024 14:22:14 +0000
Subject: [PATCH] Users stuff
---
distro/scripts/adl_cots.sh | 90 +++++++-------------------------------
1 file changed, 16 insertions(+), 74 deletions(-)
diff --git a/distro/scripts/adl_cots.sh b/distro/scripts/adl_cots.sh
index cfcd2ee..d7d23f4 100755
--- a/distro/scripts/adl_cots.sh
+++ b/distro/scripts/adl_cots.sh
@@ -549,86 +549,28 @@ adl()
{
echo ${FUNCNAME[0]}
which java
+ which python3
cd ${BUILD}
tar_name=cspp_sdr_4_0_ADL.tar && \
rm -fr ${BUILD}/ADL && \
install_the_source $tar_name && \
cd ${BUILD}/ADL && \
- ls -al && /
-
-
- export COTS_PYTHON_HOME=/user/libexec
-# ### end replace
-
-# export COTS_HOME=$1
-# export COTSBASE=$2
-# export ADL_HOME=$3
-
-echo "COTS_HOME" ${COTS_HOME}
-ls ${COTS_HOME}
-echo "COTSBASE" ${COTSBASE}
-ls ${COTSBASE}
-echo "ADL_HOME" ${ADL_HOME}
-ls ${ADL_HOME}
-
-# shift 2
-# echo $@
-
-# export ADL_INSTALL=${ADL_HOME}
-# export USER_COTS_PATH=${COTSBASE}/libexec
-# export BUILD=${COTSBASE}/build
-# export JAVA_COTS=${COTSBASE}/JAVA_COTS
-# export JAVA_JARS=${JAVA_COTS}
-
-# make_dir() {
-# DIR=$1
-# if [ ! -e ${DIR} ]; then
-# echo "Directory " ${DIR} "does not exit. Make it now"
-# mkdir -p ${DIR}
-# if [ $? -ne 0 ]; then
-# exit 1
-# fi
-# fi
-# }
-
-# # directories not kept in repo
-# mkdir -p ${ADL_HOME}/data/MSD_LZ/AUX
-# mkdir -p ${ADL_HOME}/tools/bin
-# mkdir -p ${ADL_HOME}/bin/
-# mkdir -p ${ADL_HOME}/perl/modules/PRO/SrcAutogen/src
-# mkdir -p ${ADL_HOME}/CMN/SrcAutogen/src
-
-# echo "Made directories"
-# ls -al ${ADL_HOME}/CMN/SrcAutogen/src
-
-# # gcc netos6 Comment these out for buildbucket
-# export CC="gcc"
-# export CPP="cpp"
-# export CXX="g++"
-# export FORTRAN="gfortran"
-# export FC="gfortran"
-# # gcc netos6 Comment above out for buildbucket
-
-# #CC, FC, CXX, F90, F77, F9X
-
-# #gcc buildbucket
-# export FORTRAN=${FC}
-
-# export F77=${FORTRAN}
-# export FC=${FORTRAN}
-# export LOADER=${FORTRAN}
-# export F77_COMPILER=${FORTRAN}
-# export F90_COMPILER=${FORTRAN}
-# export F95_COMPILER=${FORTRAN}
-# export CPP_COMPILER=${FORTRAN}
-# export F90=${FORTRAN}
-
+ export ADL_HOME=${BUILD}/ADL && \
+ export COTS_PYTHON_HOME=/user/libexec && \
+ echo "COTS_HOME" ${COTS_HOME} && \
+ ls ${COTS_HOME} && \
+ echo "COTSBASE" ${COTSBASE} && \
+ ls ${COTSBASE} && \
+ echo "ADL_HOME" ${ADL_HOME} && \
+ ls ${ADL_HOME} && \
+
+ export ADL_INSTALL=${ADL_HOME} && \
# ln -s /usr/bin/python3 /usr/libexec//bin/python3
-# cd ${ADL_HOME} &&
-# export PATH=${ADL_HOME}/bin:/usr/libexec/bin:$PATH &&
-# source build/envSetup.sh &&
-# export COTS_PYTHON=/usr/libexec/ &&
-# ./buildAdl.sh 2>&1 | tee ${COTS_HOME}/build_adl.log
+cd ${ADL_HOME} && /
+ export PATH=${ADL_HOME}/bin:/usr/libexec/bin:$PATH && /
+ source build/envSetup.sh && /
+ export COTS_PYTHON=/usr/libexec/ && /
+ ./buildAdl.sh 2>&1 | tee ${COTS_HOME}/build_adl.log
}
if [ "$1" == "all" ] ; then
--
GitLab