Skip to content

Commit

Permalink
Merge branch 'PR686' into testing
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert McLay committed Jun 18, 2024
2 parents 479f02d + 7f715ee commit 06047b8
Show file tree
Hide file tree
Showing 14 changed files with 350 additions and 70 deletions.
32 changes: 22 additions & 10 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ PS := @PS@
READLINK := @READLINK@
EXPR := @EXPR@
MODULES_AUTO_HANDLING := @MODULES_AUTO_HANDLING@
PATH_TO_POD2MAN := @PATH_TO_POD2MAN@
PATH_TO_HASHSUM := @PATH_TO_HASHSUM@
PATH_TO_LUAC := @PATH_TO_LUAC@
PATH_TO_PAGER := @PATH_TO_PAGER@
Expand All @@ -106,7 +107,8 @@ INIT_KSH_FUNCS := $(MY_PACKAGE)/init/ksh_funcs
FISH_TAB := $(MY_PACKAGE)/init/fish_tab_completion
MESSAGEDIR := $(MY_PACKAGE)/messageDir
LMOD_MF := $(MY_PACKAGE)/modulefiles/Core
MAN_PAGES := $(MY_PACKAGE)/share/man/cat1
MAN_PAGES_CAT := $(MY_PACKAGE)/share/man/cat1
MAN_PAGES := $(MY_PACKAGE)/share/man/man1
LMOD_MF_SOURCE := $(patsubst %, $(srcdir)/%, MF/*.version.lua)
SETTARG_SOURCE := $(patsubst %, $(srcdir)/%, settarg/*.lua settarg/targ.in)
DATE_cmd := $(srcdir)/proj_mgmt/DATE_cmd.sh
Expand Down Expand Up @@ -138,10 +140,11 @@ ifeq ($(GIT_BRANCH),)
endif
DIRLIST := $(DESTDIR)$(LIBEXEC) $(DESTDIR)$(TOOLS) $(DESTDIR)$(SETTARG) \
$(DESTDIR)$(SHELLS) $(DESTDIR)$(INIT) $(DESTDIR)$(LIB) \
$(DESTDIR)$(LMOD_MF) $(DESTDIR)$(MAN_PAGES) $(DESTDIR)$(MESSAGEDIR) \
$(DESTDIR)$(I18N) $(DESTDIR)$(FISH_TAB) $(DESTDIR)$(INIT_KSH_FUNCS)
DIRLIST := $(DESTDIR)$(LIBEXEC) $(DESTDIR)$(TOOLS) $(DESTDIR)$(SETTARG) \
$(DESTDIR)$(SHELLS) $(DESTDIR)$(INIT) $(DESTDIR)$(LIB) \
$(DESTDIR)$(LMOD_MF) $(DESTDIR)$(MESSAGEDIR) $(DESTDIR)$(I18N) \
$(DESTDIR)$(FISH_TAB) $(DESTDIR)$(MAN_PAGES) $(DESTDIR)$(MAN_PAGES_CAT) \
$(DESTDIR)$(INIT_KSH_FUNCS)
STANDALONE_PRGM := src/lmod.in.lua src/addto.in.lua \
src/spider.in.lua src/clearLMOD_cmd.in.lua \
Expand Down Expand Up @@ -252,11 +255,20 @@ echo:
@echo GIT_VERSION: $(GIT_VERSION)
@echo GIT_BRANCH: $(GIT_BRANCH)
man_pages: $(DESTDIR)$(MAN_PAGES)
LUA_CPATH='$(MY_PACKAGE)/lib/?.so;$(SYS_LUA_CPATH);;' \
LUA_PATH='$(MY_PACKAGE)/libexec/?.lua;$(SYS_LUA_PATH);;' \
$(PATH_TO_LUA) $(srcdir)/src/lmod.in.lua bash --help 2> $(DESTDIR)$(MAN_PAGES)/module.1
chmod $(MODE_R) $(DESTDIR)$(MAN_PAGES)/module.1
man_pages: $(DESTDIR)$(MAN_PAGES) $(DESTDIR)$(MAN_PAGES_CAT)
ifeq ($(PATH_TO_POD2MAN), UNKNOWN_POD2MAN)
LUA_CPATH='$(MY_PACKAGE)/lib/?.so;$(SYS_LUA_CPATH);;' \
LUA_PATH='$(MY_PACKAGE)/libexec/?.lua;$(SYS_LUA_PATH);;' \
$(PATH_TO_LUA) $(srcdir)/src/lmod.in.lua bash --help 2> $(DESTDIR)$(MAN_PAGES_CAT)/module.1
chmod $(MODE_R) $(DESTDIR)$(MAN_PAGES_CAT)/module.1
else
LUA_CPATH='$(MY_PACKAGE)/lib/?.so;$(SYS_LUA_CPATH);;' \
LUA_PATH='$(MY_PACKAGE)/libexec/?.lua;$(SYS_LUA_PATH);;' \
$(PATH_TO_LUA) $(srcdir)/src/lmod.in.lua bash --pod 2> $(DESTDIR)$(MAN_PAGES)/module.pod
$(PATH_TO_POD2MAN) $(DESTDIR)$(MAN_PAGES)/module.pod > $(DESTDIR)$(MAN_PAGES)/module.1
$(RM) $(DESTDIR)$(MAN_PAGES)/module.pod
chmod $(MODE_R) $(DESTDIR)$(MAN_PAGES)/module.1
endif
$(DIRLIST) :
install -m $(MODE_X) -d $@
Expand Down
4 changes: 4 additions & 0 deletions README.new
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,8 @@ Lmod 8.7+
(8.7.39) * Fix busted test for ModuleA.
(8.7.40) * Bug fix for prepend/append path when trying to add an empty string.
* Bug fix for serializeTbl: handle empty or single blank string as key
W.I.P:
(8.7.41) * Issue #686: Generate a perl pod format for manpage for module.1'



12 changes: 8 additions & 4 deletions build.rtm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,23 @@ echo Making Version: $PKG_VERSION

parallel_make_install()
{
PARALLEL_BUILD="-j"
if [ -n ${LMOD_SIMPLE_BUILD:-} ]; then
PARALLEL_BUILD=""
fi

if [ -e .git ]; then
GIT_VERSION=`git describe --always`
else
GIT_VERSION=$(LUA_PATH="./src/?.lua;" lua -e "V=require('Version'); print(V.tag())")
fi

if [ "$BUILD_TYPE" != "EXPERIMENTAL" ]; then
echo "$SUDO $MAKE -j GIT_VERSION=$GIT_VERSION install $MAKE_EXTRA"
$SUDO $MAKE -j GIT_VERSION=$GIT_VERSION install $MAKE_EXTRA
echo "$SUDO $MAKE $PARALLEL_BUILD GIT_VERSION=$GIT_VERSION install $MAKE_EXTRA"
$SUDO $MAKE $PARALLEL_BUILD GIT_VERSION=$GIT_VERSION install $MAKE_EXTRA
else
echo "$SUDO $MAKE pre-install $MAKE_EXTRA"
#$SUDO $MAKE GIT_VERSION=$GIT_VERSION -j pre-install $MAKE_EXTRA
$SUDO $MAKE GIT_VERSION=$GIT_VERSION -j pre-install $MAKE_EXTRA
$SUDO $MAKE GIT_VERSION=$GIT_VERSION $PARALLEL_BUILD pre-install $MAKE_EXTRA
$SUDO rm -f $BASE_DIR/lmod/EXPERIMENTAL
$SUDO ln -s $PKG_VERSION $BASE_DIR/lmod/EXPERIMENTAL
fi
Expand Down
49 changes: 49 additions & 0 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ PATH_TO_GIT
PATH_TO_LS
READLINK
PS
PATH_TO_POD2MAN
EXPR
BASENAME
PATH_TO_SRC
Expand Down Expand Up @@ -4656,6 +4657,7 @@ PATH_TO_SRC=$SRCDIR
if test $MODE != "user_default" ; then
mode=0$MODE
EXEC_BITS=$(( 0111 & $mode ));
Expand Down Expand Up @@ -4955,6 +4957,53 @@ if test "$BC" = "UNKNOWN_BC" ; then
exit 1
fi
# Extract the first word of "pod2man", so it can be a program name with args.
set dummy pod2man; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
printf %s "checking for $ac_word... " >&6; }
if test ${ac_cv_path_PATH_TO_POD2MAN+y}
then :
printf %s "(cached) " >&6
else $as_nop
case $PATH_TO_POD2MAN in
[\\/]* | ?:[\\/]*)
ac_cv_path_PATH_TO_POD2MAN="$PATH_TO_POD2MAN" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
case $as_dir in #(((
'') as_dir=./ ;;
*/) ;;
*) as_dir=$as_dir/ ;;
esac
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
ac_cv_path_PATH_TO_POD2MAN="$as_dir$ac_word$ac_exec_ext"
printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_PATH_TO_POD2MAN" && ac_cv_path_PATH_TO_POD2MAN="UNKNOWN_POD2MAN"
;;
esac
fi
PATH_TO_POD2MAN=$ac_cv_path_PATH_TO_POD2MAN
if test -n "$PATH_TO_POD2MAN"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PATH_TO_POD2MAN" >&5
printf "%s\n" "$PATH_TO_POD2MAN" >&6; }
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
fi
# Extract the first word of "git", so it can be a program name with args.
set dummy git; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
Expand Down
3 changes: 3 additions & 0 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,7 @@ PATH_TO_SRC=$SRCDIR

AC_SUBST(BASENAME)
AC_SUBST(EXPR)
AC_SUBST(PATH_TO_POD2MAN)
AC_SUBST(PS)
AC_SUBST(READLINK)
AC_SUBST(PATH_TO_LS)
Expand Down Expand Up @@ -821,6 +822,8 @@ if test "$BC" = "UNKNOWN_BC" ; then
exit 1
fi

AC_PATH_PROG(PATH_TO_POD2MAN, pod2man, UNKNOWN_POD2MAN)

AC_PATH_PROG(PATH_TO_GIT, git, "")
AC_PATH_PROGS(PATH_TO_PAGER,[less] [more], [more])

Expand Down
29 changes: 11 additions & 18 deletions messageDir/en.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,13 +343,11 @@ MODULEPATH directory: "%{mpath}" has too many non-modulefiles (%{regularFn}). Pl
-- Usage Message
--------------------------------------------------------------------------
usage_cmdline = "module [options] sub-command [args ...]",
help_title = "Help sub-commands:\n" ..
"------------------",
help_title = "Help sub-commands:\n\n",
help1 = "prints this message",
help2 = "print help message from module(s)",

load_title = "Loading/Unloading sub-commands:\n" ..
"-------------------------------",
load_title = "Loading/Unloading sub-commands:\n\n",
load1 = "load module(s)",
load2 = "Add module(s), do not complain if not found",
load3 = "Remove module(s), do not complain if not found",
Expand All @@ -358,8 +356,7 @@ MODULEPATH directory: "%{mpath}" has too many non-modulefiles (%{regularFn}). Pl
load6 = "reload aliases from current list of modules.",
load7 = "reload all currently loaded modules.",

list_title = "Listing / Searching sub-commands:\n" ..
"---------------------------------",
list_title = "Listing / Searching sub-commands:\n\n",
list1 = "List loaded modules",
list2 = "List loaded modules that match the pattern",
list3 = "List available modules",
Expand All @@ -374,15 +371,13 @@ MODULEPATH directory: "%{mpath}" has too many non-modulefiles (%{regularFn}). Pl
ov1 = "List all available modules by short names with number of versions",
ov2 = "List available modules by short names with number of versions that contain \"string\"",

srch_title = "Searching with Lmod:\n" ..
"--------------------",
srch_title = "Searching with Lmod:\n\n",
srch0 = " All searching (spider, list, avail, keyword) support regular expressions:",
srch1 = "Finds all the modules that start with `p' or `P'",
srch2 = "Finds all modules that have \"mpi\" in their name.",
srch3 = "Finds all modules that end with \"mpi\" in their name.",

collctn_title = "Handling a collection of modules:\n"..
"--------------------------------",
collctn_title = "Handling a collection of modules:\n\n",
collctn1 = "Save the current list of modules to a user defined \"default\" collection.",
collctn2 = "Save the current list of modules to \"name\" collection.",
collctn3 = "The same as \"restore system\"",
Expand All @@ -393,15 +388,13 @@ MODULEPATH directory: "%{mpath}" has too many non-modulefiles (%{regularFn}). Pl
collctn8 = "Describe the contents of a module collection.",
collctn9 = "Disable (i.e. remove) a collection.",

depr_title = "Deprecated commands:\n" ..
"--------------------",
depr_title = "Deprecated commands:\n\n",
depr1 = "load name collection of modules or user's \"default\" if no name given.",
depr2 = "===> Use \"restore\" instead <====",
depr3 = "Save current list of modules to name if given, otherwise save as the default list for you the user.",
depr4 = "===> Use \"save\" instead. <====",

misc_title = "Miscellaneous sub-commands:\n" ..
"---------------------------",
misc_title = "Miscellaneous sub-commands:\n\n",
misc1 = "show the commands in the module file.",
misc2 = "Prepend or Append path to MODULEPATH.",
misc3 = "remove path from MODULEPATH.",
Expand All @@ -410,8 +403,7 @@ MODULEPATH directory: "%{mpath}" has too many non-modulefiles (%{regularFn}). Pl
misc_isAvail = "return a true status if module can be loaded",


env_title = "Important Environment Variables:\n" ..
"--------------------------------",
env_title = "Important Environment Variables:\n\n",
env1 = "If defined to be \"YES\" then Lmod prints properties and warning in color.",
web_sites = "Lmod Web Sites",
rpt_bug = " To report a bug please read ",
Expand Down Expand Up @@ -447,8 +439,9 @@ MODULEPATH directory: "%{mpath}" has too many non-modulefiles (%{regularFn}). Pl
miniConfig_H = "Report Lmod Configuration differences",
novice_H = "Turn off expert and quiet flag",
nrdirect_H = "Force output of list, avail and spider to stderr",
nx_T = "Do not print extensions",
nx_H = "Do not print extensions",
pin_hlp = "When doing a restore use specified version, do not follow defaults",
pod_H = "Generate pod format",
quiet_hlp = "Do not print out warnings",
raw_hlp = "Print modulefile in raw output when used with show",
redirect_H = "Send the output of list, avail, spider to stdout (not stderr)",
Expand All @@ -459,7 +452,7 @@ MODULEPATH directory: "%{mpath}" has too many non-modulefiles (%{regularFn}). Pl
terse_hlp = "Write out in machine readable format for commands: list, avail, spider, savelist",
terseShowExt_H = "report extensions when doing a terse avail",
timer_hlp = "report run times",
trace_T = "trace major changes such as loads",
trace_H = "trace major changes such as loads",
v_hlp = "Print version info and quit",
width_hlp = "Use this as max term width",

Expand Down
Loading

0 comments on commit 06047b8

Please sign in to comment.