Skip to content

Commit 8f9fd54

Browse files
committed
install: zip ChangeLog file to reduce install size
Install ChangeLog.gz zipped documentation file instead of ChangeLog to reduce installation size (-1.5 MB). As a result, gzip becomes mandatory when building Modules from git repository.
1 parent 2d8360d commit 8f9fd54

File tree

7 files changed

+27
-17
lines changed

7 files changed

+27
-17
lines changed

.aspell.en.pws

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
personal_ws-1.1 en 905
1+
personal_ws-1.1 en 907
22
ABBRVLIST
33
ActiveTcl
44
Adrien
@@ -19,6 +19,7 @@ CFLAGS
1919
CLICOLOR
2020
CMake
2121
CONFIGLIST
22+
ChangeLog
2223
ChemAppA
2324
ChildModuleExists
2425
Coccioli
@@ -459,6 +460,7 @@ gitlog
459460
gmake
460461
grp
461462
gz
463+
gzip
462464
hardcode
463465
hdf
464466
homebrewed

.codespellrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# ignore command names used in code: uncomplete
77
ignore-words-list = ans,ot,ue,fo,haa,varius,tthe,tbe,nin,desig,matchin,compre,invers,compiletime,seh,lod,nd,uncomplete
88
# skip git repository internal content
9-
# skip generated content: ChangeLog, doc/build, modulecmd*.tcl, modules.sum
9+
# skip generated content: ChangeLog.gz, doc/build, modulecmd*.tcl, modules.sum
1010
# modules.log, lib/config.sub, lib/config.guess
1111
# skip retrieved content: icdiff, lib/tcl.m4, tcl8.3.5, spack, miniconda3, OpenFOAM-dev
12-
skip = .git,ChangeLog,modulecmd*.tcl,*doc/build,icdiff,*lib/tcl.m4,tcl8.3.5,spack,miniconda3,OpenFOAM-dev,modules.sum,modules.log,*lib/config.sub,*lib/config.guess
12+
skip = .git,ChangeLog.gz,modulecmd*.tcl,*doc/build,icdiff,*lib/tcl.m4,tcl8.3.5,spack,miniconda3,OpenFOAM-dev,modules.sum,modules.log,*lib/config.sub,*lib/config.guess

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/modulecmd.tcl
2-
/ChangeLog
2+
/ChangeLog.gz
33
/README
44
/Makefile.inc
55
/version.inc

INSTALL.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ are required:
4848
* autopoint
4949
* python
5050
* sphinx >= 1.0
51+
* gzip
5152

5253
Get Modules
5354
-----------

Makefile

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ifneq ($(wildcard Makefile.inc),Makefile.inc)
4848
endif
4949
include Makefile.inc
5050

51-
INSTALL_PREREQ := modulecmd.tcl ChangeLog README script/add.modules \
51+
INSTALL_PREREQ := modulecmd.tcl ChangeLog.gz README script/add.modules \
5252
script/modulecmd
5353
ifeq ($(COVERAGE),y)
5454
TEST_PREREQ := $(MODULECMDTEST)_i $(NAGELFAR)
@@ -520,13 +520,15 @@ modulecmd.tcl: tcl/cache.tcl tcl/coll.tcl tcl/envmngt.tcl tcl/init.tcl \
520520

521521
# generate an empty changelog file if not working from git repository
522522
ifeq ($(wildcard .git),.git)
523-
ChangeLog: script/gitlog2changelog.py
523+
ChangeLog.gz: script/gitlog2changelog.py
524524
$(ECHO_GEN)
525525
script/gitlog2changelog.py
526+
gzip -f -9 ChangeLog
526527
else
527-
ChangeLog:
528+
ChangeLog.gz:
528529
$(ECHO_GEN)
529-
echo "Please refer to the NEWS document to learn about main changes" >$@
530+
echo "Please refer to the NEWS document to learn about main changes" >ChangeLog
531+
gzip -f -9 ChangeLog
530532
endif
531533

532534
README:
@@ -662,7 +664,7 @@ endif
662664
ifeq ($(docinstall),y)
663665
$(INSTALL_DIR) '$(DESTDIR)$(docdir)'
664666
$(INSTALL_DATA) COPYING.GPLv2 '$(DESTDIR)$(docdir)/'
665-
$(INSTALL_DATA) ChangeLog '$(DESTDIR)$(docdir)/'
667+
$(INSTALL_DATA) ChangeLog.gz '$(DESTDIR)$(docdir)/'
666668
$(INSTALL_DATA) README '$(DESTDIR)$(docdir)/'
667669
endif
668670
ifeq ($(vimaddons),y)
@@ -726,7 +728,7 @@ ifeq ($(nagelfaraddons),y)
726728
-rmdir -p '$(DESTDIR)$(nagelfardatadir)'
727729
endif
728730
ifeq ($(docinstall),y)
729-
rm -f $(foreach docfile,ChangeLog README COPYING.GPLv2,'$(DESTDIR)$(docdir)/$(docfile)')
731+
rm -f $(foreach docfile,ChangeLog.gz README COPYING.GPLv2,'$(DESTDIR)$(docdir)/$(docfile)')
730732
ifeq ($(builddoc),n)
731733
rmdir '$(DESTDIR)$(docdir)'
732734
endif
@@ -753,12 +755,12 @@ endif
753755

754756
# include pre-generated documents not to require documentation build
755757
# tools when installing from dist tarball
756-
dist-tar: ChangeLog contrib/rpm/environment-modules.spec pkgdoc
758+
dist-tar: ChangeLog.gz contrib/rpm/environment-modules.spec pkgdoc
757759
$(ECHO_GEN2) $(DIST_PREFIX).tar
758760
git archive --prefix=$(DIST_PREFIX)/ --worktree-attributes \
759761
-o $(DIST_PREFIX).tar HEAD
760762
tar -rf $(DIST_PREFIX).tar --transform 's,^,$(DIST_PREFIX)/,' \
761-
lib/configure lib/config.h.in $(DIST_AUTORECONF_EXTRA) ChangeLog \
763+
lib/configure lib/config.h.in $(DIST_AUTORECONF_EXTRA) ChangeLog.gz \
762764
doc/build/MIGRATING.txt doc/build/changes.txt doc/build/INSTALL.txt \
763765
doc/build/INSTALL-win.txt doc/build/NEWS.txt doc/build/CONTRIBUTING.txt \
764766
doc/build/module.1.in doc/build/ml.1 doc/build/modulefile.4 \
@@ -775,7 +777,7 @@ dist-bzip2: dist-tar
775777
dist: dist-gzip
776778

777779
# dist zip ball for Windows platform with all pre-generated relevant files
778-
dist-win: modulecmd.tcl ChangeLog README pkgdoc
780+
dist-win: modulecmd.tcl ChangeLog.gz README pkgdoc
779781
$(ECHO_GEN2) $(DIST_WIN_PREFIX).zip
780782
$(INSTALL_DIR) $(DIST_WIN_PREFIX)
781783
$(INSTALL_DIR) $(DIST_WIN_PREFIX)/libexec
@@ -786,7 +788,7 @@ dist-win: modulecmd.tcl ChangeLog README pkgdoc
786788
$(INSTALL_PROGRAM) script/envml.cmd $(DIST_WIN_PREFIX)/bin/
787789
$(INSTALL_DIR) $(DIST_WIN_PREFIX)/doc
788790
$(INSTALL_DATA) COPYING.GPLv2 $(DIST_WIN_PREFIX)/doc/
789-
$(INSTALL_DATA) ChangeLog $(DIST_WIN_PREFIX)/doc/
791+
$(INSTALL_DATA) ChangeLog.gz $(DIST_WIN_PREFIX)/doc/
790792
$(INSTALL_DATA) README $(DIST_WIN_PREFIX)/doc/
791793
$(INSTALL_DATA) doc/build/MIGRATING.txt $(DIST_WIN_PREFIX)/doc/
792794
$(INSTALL_DATA) doc/build/INSTALL-win.txt $(DIST_WIN_PREFIX)/doc/
@@ -813,7 +815,7 @@ clean:
813815
rm -rf coverage
814816
# do not clean generated docs if not in git repository
815817
ifeq ($(wildcard .git),.git)
816-
rm -f ChangeLog
818+
rm -f ChangeLog.gz
817819
endif
818820
rm -f README
819821
rm -f modulecmd.tcl
@@ -1032,7 +1034,7 @@ $(V).SILENT: initdir pkgdoc doc version.inc contrib/rpm/environment-modules.spec
10321034
tcl/cache.tcl_i tcl/coll.tcl_i tcl/envmngt.tcl_i tcl/init.tcl_i \
10331035
tcl/main.tcl_i tcl/mfinterp.tcl_i tcl/modfind.tcl_i tcl/modeval.tcl_i \
10341036
tcl/modscan.tcl_i tcl/modspec.tcl_i tcl/report.tcl_i tcl/subcmd.tcl_i \
1035-
tcl/util.tcl_i ChangeLog README script/add.modules \
1037+
tcl/util.tcl_i ChangeLog.gz README script/add.modules \
10361038
script/gitlog2changelog.py script/modulecmd \
10371039
lib/libtclenvmodules$(SHLIB_SUFFIX) lib/libtestutil-closedir$(SHLIB_SUFFIX) \
10381040
lib/libtestutil-getpwuid$(SHLIB_SUFFIX) lib/libtestutil-getgroups$(SHLIB_SUFFIX) \

configure

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -963,6 +963,11 @@ else
963963
PYTHON=$reqpath
964964
fi
965965

966+
# gzip is mandatory if installing from git repository to build ChangeLog.gz
967+
if [ -e '.git' ]; then
968+
check_requirement gzip
969+
fi
970+
966971
# get location of commands used 'fullpath' in init scripts
967972
check_requirement 'ps' '' "PATH=$binsearchpath"
968973
# shellcheck disable=SC2034

contrib/rpm/environment-modules.spec.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ fi
181181
%else
182182
%license COPYING.GPLv2
183183
%endif
184-
%doc ChangeLog README NEWS.txt MIGRATING.txt INSTALL.txt CONTRIBUTING.txt changes.txt
184+
%doc ChangeLog.gz README NEWS.txt MIGRATING.txt INSTALL.txt CONTRIBUTING.txt changes.txt
185185
%{_sysconfdir}/modulefiles
186186
%if 0%{?fedora}
187187
%ghost %{_sysconfdir}/profile.d/modules.csh

0 commit comments

Comments
 (0)