Small fixes in nrnivmodl regarding MODS_LOCATION (#235)

Small fixes in nrnivmodl regarding MODS_LOCATION
 - MODS_LOCATION was always being overwriten from CLI. Now it can be
loaded from the save file.

Co-authored-by: Pramod Kumbhar <[email protected]>

Author: ferdonline

extra/nrnivmodl-core.in

@@ -11,6 +11,7 @@ ROOTDIR=$(perl -e "use Cwd 'abs_path'; print abs_path('$_PARENT')")
 MAKE_OPTIONS="MECH_NAME NMODL_BINARY DESTDIR INCFLAGS LINKFLAGS MODS_PATH VERBOSE"
 PARALLELISM=4
 SAVE_FILE="@CMAKE_HOST_SYSTEM_PROCESSOR@/nrnivmodl_options.txt"
+params_MODS_PATH="."
 
 while getopts "n:m:v:d:i:l:p:hV" OPT; do
     case "$OPT" in
@@ -62,9 +63,19 @@ if [ -f "$SAVE_FILE" ]; then
 fi
 
 # If defined mods dir be in $1
-# Note: due to bug #712 makefile wont handle mod dir with spaces, so we let it fail here
-params_MODS_PATH=$1
+if [ $# -eq 1 ]; then
+    # Note: due to bug #712 makefile wont handle mod dir with spaces, so we let it fail here
+    params_MODS_PATH=$1
+fi
+if [ -d $params_MODS_PATH ]; then
+    # warn if no mod files provided
+    ls $params_MODS_PATH/*.mod || echo "WARNING: No mods found!"
+else
+    echo "FATAL: Invalid mods directory: '$params_MODS_PATH'"
+    exit 1
+fi
 
+# Output options & populate make_params
 mkdir -p "$(dirname "$SAVE_FILE")"
 echo "# nrnivmodl-core options. Mods location: $params_MODS_PATH" > $SAVE_FILE
 
@@ -78,13 +89,11 @@ for param in $MAKE_OPTIONS; do
     fi
 done >> "$SAVE_FILE"
 
-# If -I (install) provided, call "make install"
+# If -d (deploy) provided, call "make install"
 if [ "$params_DESTDIR" ]; then
     make_params+=("install")
 fi
 
-# warn if no mod files provided
-ls "${params_MODS_PATH:-.}"/*.mod || echo "WARNING: No mods found!"
 make -j$PARALLELISM -f "${ROOTDIR}/share/coreneuron/nrnivmodl_core_makefile" "${make_params[@]}"
 
 echo "mods built successfully."

tests/jenkins/nrnivmodl-core.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -e
+set -xe
 
 . /gpfs/bbp.cscs.ch/apps/hpc/jenkins/config/modules.sh
 module load intel hpe-mpi
@@ -13,11 +13,15 @@ mkdir -p ${CORENRN_TYPE}
 
 pushd ${CORENRN_TYPE}
 
+set +x
 if [ "${TEST_DIR}" = "ringtest" ]; then
-    $WORKSPACE/install_${CORENRN_TYPE}/bin/nrnivmodl-core ../mod-ext
+    echo "Running install_${CORENRN_TYPE}/bin/nrnivmodl-core ."
+    $WORKSPACE/install_${CORENRN_TYPE}/bin/nrnivmodl-core .
 else
+    echo "Running install_${CORENRN_TYPE}/bin/nrnivmodl-core ../mod"
     $WORKSPACE/install_${CORENRN_TYPE}/bin/nrnivmodl-core ../mod
 fi
+set -x
 
 # rpath $ORIGIN should make it relocatable
 find * -mindepth 1 -maxdepth 1 -type f -exec mv "{}" ./ \;