Skip to content

Commit

Permalink
merging main onto irreversible
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert McLay committed Feb 7, 2025
2 parents 4251be8 + 53d526d commit c0f786f
Show file tree
Hide file tree
Showing 168 changed files with 28,588 additions and 25,328 deletions.
2 changes: 1 addition & 1 deletion .versionDate
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2024-10-12 19:57 -05:00
2025-02-04 18:12 -07:00
17 changes: 6 additions & 11 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,6 @@ UNAME_S := $(shell uname -s)
VersionDate := $(shell cat $(VDateFn))
MODE := @MODE@

ifeq ($(UNAME_S),Darwin)
SED := gsed
else
SED := sed
endif

MODE_X := $(shell $(srcdir)/proj_mgmt/convert_mode.sh -x $(MODE))
MODE_R := $(shell $(srcdir)/proj_mgmt/convert_mode.sh -r $(MODE))

Expand Down Expand Up @@ -250,9 +244,9 @@ install: pre-install zsh_tab_funcs fish_tab_funcs
fi;
echo:
@echo Version: $(version)
@echo GIT_VERSION: $(GIT_VERSION)
@echo GIT_BRANCH: $(GIT_BRANCH)
@echo Version: '$(version)'
@echo GIT_VERSION: '$(GIT_VERSION)'
@echo GIT_BRANCH: '$(GIT_BRANCH)'
man_pages: $(DESTDIR)$(MAN_PAGES) $(DESTDIR)$(MAN_PAGES_CAT)
ifeq ($(PATH_TO_POD2MAN), UNKNOWN_POD2MAN)
Expand All @@ -278,7 +272,7 @@ __installMe:
fn=$${bareN%%.in*}; \
ext=$${bareN#*.}; \
: echo "DIRLOC/fn: $(DIRLOC)/$$fn"; \
$(SED) -e 's|@PREFIX@|$(prefix)|g' \
sed -e 's|@PREFIX@|$(prefix)|g' \
-e 's|@LMOD_TOP_DIR@|$(MY_PACKAGE)|g' \
-e 's|@path_to_lua@|$(PATH_TO_LUA)|g' \
-e 's|@hashsum@|$(PATH_TO_HASHSUM)|g' \
Expand Down Expand Up @@ -444,7 +438,8 @@ config.status:
./config.status --recheck
trailing_blanks_removed:
find . -type d \( -path ./rt -o -path ./spec/Spider/h \) -prune -o -name '*.lua' -exec $(SED) -i -e 's/ *$$//' {} \;
find . -type d \( -path ./rt -o -path ./spec/Spider/h \) -prune -o -type f -name '*.lua' -exec sed -i.bak.BAK -e 's/ *$$//' {} \;
find . -type d \( -path ./rt -o -path ./spec/Spider/h \) -prune -o -name '*.lua.bak.BAK' -exec rm {} \;
dist:
GIT_BRANCH=`git status | head -n 1 | sed -e 's/^[# ]*On branch //g' -e 's/^[# ]*HEAD detached at//g'`; \
Expand Down
19 changes: 17 additions & 2 deletions README.new
Original file line number Diff line number Diff line change
Expand Up @@ -187,5 +187,20 @@ Lmod 8.7+
(8.7.51) * Fix bug in load test.
(8.7.52) * Add MName:isVisible() so that load hooks can figure out if a loaded module is is visible or not.
(8.7.53) * updating docs to include link to 165_debugging_lmod.rst


(8.7.54) * Remove all v.file tests in dealing with ModuleA
* using self.__mpathT[mpath].hiddenT and self.__hiddenT instead of merged table for hidden status
* Added mrc:set_display_mode() before commands.
* Build reverse maps for mod2versionT and full2aliasesT dynamically
* Added MRC:pairsForMRC_aliases iterator
* Removed MRC:__marged_hiddenT, MRC:__marged_forbiddenT and MRC:__mergedAlias2modT
* Issue #731: Support for env. var. LMOD_SHOW_HIDDEN
* Issue #739: Make tcl files have "spider" as mode matching when Lmod is in spider mode.
(8.7.55) * Patch #737: A better test for spaces in front of # for admin.list
(8.7.56) * Issue #742: Switch Makefile.in to use dump-downed sed instead of Gnu Sed
* PR #743: Allow TCL modulefile to test shell type
* Trailing blanks removed.
* Fixed LMOD_FILE_IGNORE_PATTERNS so that it can be an env. var and converted to a Lua array table.
* Documented LMOD_FILE_IGNORE_PATTERNS
* Issue #740: Rewrite ModuleA l_find_vA so that it checks partial version strings.
* Issue #745: posix.setenv("var", false, true) must change to posix.setenv("var", nil, true).
* Issue #728: Disallow fast TCL interp with TCL 9+. This will hopely fixed in the future (;->)
Loading

0 comments on commit c0f786f

Please sign in to comment.