Merge branch '201-add-lua-and-lmod-to-pmodules-module' into 'master'

Resolve "add lua and Lmod to Pmodules module"

Closes #201

See merge request Pmodules/src!178

Pmodules/modulecmd.bash.in

@@ -38,8 +38,7 @@ declare -x  TCLLIBPATH
 std::prepend_path TCLLIBPATH "${PMODULES_HOME}/lib/Pmodules"
 
 declare -r tcl_cmd="${libexecdir}/modulecmd.bin"
-#declare -r lmod_cmd="${PMODULES_HOME}/lmod/lmod/libexec/lmod"
-declare -r lmod_cmd="/usr/share/lmod/lmod/libexec/lmod"
+declare -r lmod_cmd="${PMODULES_HOME}/libexec/lmod/lmod/libexec/lmod"
 declare -- modulecmd="${tcl_cmd}"
 
 declare -- verbosity_lvl=${PMODULES_VERBOSITY:-'verbose'}

build

@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 #
 
-declare -rx VERSION='1.1.12'
+declare -rx VERSION='1.1.13'
 declare -rx BASH5_VERSION='5.2.15'
 declare -rx TCL_VERSION='8.6.13'
 declare -rx TCLLIB_VERSION='1.21'
 declare -rx MODULES_VERSION='3.2.10.2'
+declare -rx LMOD_VERSION='8.7'
 
 # for macOS only
 declare -rx GETOPT_VERSION='1.1.6'

recipes/042-lua

@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# https://
+#
+P=lua
+V=${LUA_VERSION:-5.4.6}
+FNAME="$P-$V.tar.gz"
+DOWNLOAD_URL="http://www.lua.org/ftp/$P-$V.tar.gz"
+
+source "$(dirname "$0")/librecipes.bash"
+
+#---
+# configure
+
+LUA_PREFIX="${PREFIX}/libexec/lua"
+export INSTALL_TOP="${LUA_PREFIX}"
+PATH="${LUA_PREFIX}/bin:$PATH" 
+sed -i "s;/usr/local/;${INSTALL_TOP}/;" "${SRC_DIR}/src/luaconf.h"
+#---
+# compile & install
+make -e -j ${NJOBS} || exit ${PB_ERR_MAKE}
+make -e install || exit ${PB_ERR_INSTALL}
+
+#---
+# post-install
+
+#---
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:

recipes/043-luarocks

@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# https://
+#
+P=luarocks
+V=${LUAROCKS_VERSION:-3.9.2}
+FNAME="$P-$V.tar.gz"
+DOWNLOAD_URL="https://luarocks.org/releases/$P-$V.tar.gz"
+
+source "$(dirname "$0")/librecipes.bash"
+
+#---
+# configure
+LUA_PREFIX="${PREFIX}/libexec/lua"
+PATH="${LUA_PREFIX}/bin:$PATH" 
+"${SRC_DIR}"/configure \
+        --prefix="${LUA_PREFIX}" \
+
+
+#---
+# compile & install
+make -e -j ${NJOBS} || exit ${PB_ERR_MAKE}
+make -e install || exit ${PB_ERR_INSTALL}
+
+#---
+# post-install
+
+#---
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:

recipes/044-lua-posix

@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# https://
+#
+#---
+LUA_PREFIX="${PREFIX}/libexec/lua"
+PATH="${LUA_PREFIX}/bin:$PATH" 
+
+luarocks install luaposix
+
+#---
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:

recipes/045-lmod

@@ -0,0 +1,55 @@
+#!/bin/bash
+#
+# https://
+#
+P=lmod
+V=${LMOD_VERSION:-8.7}
+FNAME="$P-$V.tar.gz"
+DOWNLOAD_URL="https://sourceforge.net/projects/lmod/files/Lmod-$V.tar.bz2/download"
+
+source "$(dirname "$0")/librecipes.bash"
+
+#---
+# configure
+mkdir -p "${BUILD_DIR}" && cd "$_" || exit ${PB_ERR_SYSTEM}
+case $(uname -s) in
+	Linux )
+		: declare -x LIBS="-lz -lpthread"
+		;;
+	Darwin )
+		: declare -x LIBS="-lz -framework CoreFoundation"
+		;;
+	* )
+		echo "Oops: unsupported OS!" 1>&2
+		exit ${PB_ERR_SYSTEM}
+		;;
+esac
+
+#export C_INCLUDE_PATH+=":${PREFIX}/include" 
+#export LIBRARY_PATH+=":${PREFIX}/lib"
+#export TCL_INCLUDE="${PREFIX}/include/tcl.h"
+#export TCL_LIBS="${PREFIX}/lib/libtcl8.6.a"
+
+PATH="${PREFIX}/libexec/lua/bin:$PAT:$PATH" 
+LMOD_PREFIX="${PREFIX}/libexec"
+"${SRC_DIR}"/configure \
+	--prefix="${LMOD_PREFIX}" \
+	--exec-prefix="${LMOD_PREFIX}" \
+	--with-module-path="${PREFIX%%/Tools*}/Tools/${PMODULES_MODULEFILES_DIR}" \
+	--with-fastTCLInterp=no \
+        || exit ${PB_ERR_CONFIGURE}
+
+#---
+# compile & install
+make -j ${NJOBS} || exit ${PB_ERR_MAKE}
+make install || exit ${PB_ERR_INSTALL}
+
+#---
+# post-install
+
+#---
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:

recipes/librecipes.bash

@@ -20,7 +20,7 @@ DOWNLOADS_DIR="${PMODULES_DISTFILESDIR:-${TMP_DIR}/Downloads}"
 SRC_DIR="${TMP_DIR}/$P-$V/src"
 BUILD_DIR="${TMP_DIR}/$P-$V/build"
 SRC_FILE="${DOWNLOADS_DIR}/${FNAME}"
-
+UTILBIN_DIR='libexec'
 
 declare -ix PB_ERR_ARG=1
 declare -ix PB_ERR_SETUP=2