Skip to content

Commit 03620b0

Browse files
hattnehattne
committed
Reduce verbose output from non-critical commands
Remove -v (--verbose) option from rsync and tar. Do not store intermediate downloads and elide seemingly redundant touch:es. Note that http://downloads.sf.net/cbflib/PyCifRW-4.3_rev_19Jun21.tar.gz ($(PY3CIFRWURL)) appears to be an uncompressed tarfile, despite its .gz extension.
1 parent fb199a4 commit 03620b0

File tree

6 files changed

+132
-464
lines changed

6 files changed

+132
-464
lines changed

‎Makefile‎

Lines changed: 22 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -542,11 +542,6 @@ REGEX_INCLUDES ?=
542542
endif
543543

544544

545-
# Program to use to retrieve a URL
546-
547-
DOWNLOAD ?= wget -N
548-
#DOWNLOAD ?= curl -O -L
549-
550545
# Flag to control symlinks versus copying
551546

552547
SLFLAGS = --use_ln
@@ -574,7 +569,7 @@ RANLIB = /usr/bin/ranlib
574569
#
575570
#SIGNATURE ?= /usr/bin/openssl dgst -md5
576571
#SIGNATURE ?= (/usr/bin/openssl dgst -md5 | sed "s/^.*= //")
577-
SIGNATURE ?= ( cat > md5tmp; cmake -E md5sum md5tmp| sed "s/ .*//")
572+
SIGNATURE ?= ( cat > md5tmp; md5sum md5tmp| sed "s/ .*//")
578573

579574
#
580575
# Pipe command to extract all but the first line of a text file
@@ -1486,7 +1481,6 @@ $(SWIG_FORTRAN_KIT): build_swig_fortran
14861481
git clone $(SWIG_FORTRAN_URL) $(SWIG_FORTRAN_KIT)
14871482
(export SWIG_FORTRAN_PREFIX=$(PWD);cd $(SWIG_FORTRAN_KIT); ./autogen.sh; \
14881483
./configure --prefix=$(F90CBF); make; make install)
1489-
touch $(SWIG_FORTRAN_KIT)
14901484
endif
14911485

14921486
ifneq ($(CBFLIB_DONT_USE_LOCAL_SWIG),yes)
@@ -1500,7 +1494,6 @@ $(SWIG_KIT): build_swig
15001494
git clone $(SWIG_URL) $(SWIG_KIT)
15011495
(export SWIG_PREFIX=$(PWD);cd $(SWIG_KIT); ./autogen.sh; \
15021496
./configure --prefix=$(SWIG_PREFIX); make; make install)
1503-
touch $(SWIG_KIT)
15041497
endif
15051498

15061499

@@ -1512,10 +1505,7 @@ build_py2cifrw: $(M4)/Makefile.m4
15121505
touch build_py2cifrw
15131506
$(PY2CIFRW): build_py2cifrw
15141507
-rm -rf $(PY2CIFRW)
1515-
-rm -rf $(PY2CIFRW).tar.gz
1516-
$(DOWNLOAD) $(PY2CIFRWURL)
1517-
tar -xvf $(PY2CIFRW).tar.gz
1518-
-rm $(PY2CIFRW).tar.gz
1508+
wget -O - -nv $(PY2CIFRWURL) | tar -xzf -
15191509
(cd $(PY2CIFRW); \
15201510
PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python:$(PY2CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
15211511
mkdir -p $(PY2CIFRW_PREFIX)/lib/python/site-packages; \
@@ -1529,10 +1519,7 @@ build_py2ply: $(M4)/Makefile.m4
15291519
touch build_py2ply
15301520
$(PY2PLY): build_py2ply
15311521
-rm -rf $(PY2PLY)
1532-
-rm -rf $(PY2PLY).tar.gz
1533-
$(DOWNLOAD) $(PY2PLYURL)
1534-
tar -xvf $(PY2PLY).tar.gz
1535-
-rm $(PY2PLY).tar.gz
1522+
wget -O - -nv $(PY2PLYURL) | tar -xzf -
15361523
(cd $(PY2PLY); \
15371524
PYTHONPATH=$(PY2CIFRW_PREFIX)/lib/python:$(PY2CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
15381525
mkdir -p $(PY2CIFRW_PREFIX)/lib/python/site-packages; \
@@ -1548,10 +1535,7 @@ build_py3cifrw: $(M4)/Makefile.m4
15481535
touch build_py3cifrw
15491536
$(PY3CIFRW): build_py3cifrw
15501537
-rm -rf $(PY3CIFRW)
1551-
-rm -rf $(PY3CIFRW).tar.gz
1552-
$(DOWNLOAD) $(PY3CIFRWURL)
1553-
tar -xvf $(PY3CIFRW).tar.gz
1554-
-rm $(PY3CIFRW).tar.gz
1538+
wget -O - -nv $(PY3CIFRWURL) | tar -xf -
15551539
(cd $(PY3CIFRW); \
15561540
PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
15571541
mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \
@@ -1565,10 +1549,7 @@ build_py3ply: $(M4)/Makefile.m4
15651549
touch build_py3ply
15661550
$(PY3PLY): build_py3ply
15671551
-rm -rf $(PY3PLY)
1568-
-rm -rf $(PY3PLY).tar.gz
1569-
$(DOWNLOAD) $(PY3PLYURL)
1570-
tar -xvf $(PY3PLY).tar.gz
1571-
-rm $(PY3PLY).tar.gz
1552+
wget -O - -nv $(PY3PLYURL) | tar -xzf -
15721553
(cd $(PY3PLY); \
15731554
PYTHONPATH=$(PY3CIFRW_PREFIX)/lib/python:$(PY3CIFRW_PREFIX)/lib64/python; export PYTHONPATH; \
15741555
mkdir -p $(PY3CIFRW_PREFIX)/lib/python/site-packages; \
@@ -1583,11 +1564,7 @@ endif
15831564
ifneq ($(NUWEB_DEP),'')
15841565
$(NUWEB_DEP):
15851566
-rm -rf $(NUWEB_DEP)
1586-
-rm -rf $(NUWEB_DEP).tar.gz
1587-
$(DOWNLOAD) $(NUWEB_URL)
1588-
tar -xvf $(NUWEB_DEP).tar.gz
1589-
touch $(NUWEB_DEP)
1590-
rm $(NUWEB_DEP).tar.gz
1567+
wget -O - -nv $(NUWEB_URL) | tar -xzf -
15911568

15921569
$(NUWEB_DEP2): $(NUWEB_DEP)
15931570
(cd $(NUWEB_DEP); make nuweb; cp nuweb $(NUWEB_DEP2))
@@ -1602,19 +1579,15 @@ build_regex: $(M4)/Makefile.m4
16021579
touch build_regex
16031580
$(REGEX): build_regex
16041581
-rm -rf $(REGEX)
1605-
-rm -rf $(REGEX).tar.gz
1606-
$(DOWNLOAD) $(REGEX_URL)
1607-
tar -xvf $(REGEX).tar.gz
1608-
touch $(REGEX)
1609-
-rm $(REGEX).tar.gz
1582+
wget -O - -nv $(REGEX_URL) | tar -xzf -
16101583
cp config.guess config.sub $(REGEX)
16111584
(cd $(REGEX); \
16121585
prefix=$(REGEX_PREFIX); export prefix; \
16131586
./configure --prefix=$(REGEX_PREFIX); make install)
16141587
@-cp $(REGEX_PREFIX)/include/pcreposix.h $(REGEX_PREFIX)/include/regex.h
16151588
$(REGEX)_INSTALL: $(REGEX)
16161589
-rm -rf $(REGEX)_install
1617-
rsync -avz $(REGEX)/ $(REGEX)_install
1590+
rsync -az $(REGEX)/ $(REGEX)_install
16181591
(cd $(REGEX)_install; prefix=$(CBF_PREFIX); export prefix; \
16191592
make distclean; ./configure --prefix=$(CBF_PREFIX); make install )
16201593
@-cp $(CBF_PREFIX)/include/pcreposix.h $(CBF_PREFIX)/include/regex.h
@@ -1626,17 +1599,13 @@ build_tiff: $(M4)/Makefile.m4
16261599
touch build_tiff
16271600
$(TIFF): build_tiff config.guess config.sub
16281601
-rm -rf $(TIFF)
1629-
-rm -rf $(TIFF).tar.gz
1630-
$(DOWNLOAD) $(TIFF_URL)
1631-
tar -xvf $(TIFF).tar.gz
1632-
touch $(TIFF)
1633-
-rm $(TIFF).tar.gz
1602+
wget -O - -nv $(TIFF_URL) | tar -xzf -
16341603
cp config.guess config.sub $(TIFF)/config/
16351604
(cd $(TIFF); prefix=$(TIFF_PREFIX); export prefix; \
16361605
./configure --prefix=$(TIFF_PREFIX); make install)
16371606
$(TIFF)_INSTALL: $(TIFF)
16381607
-rm -rf $(TIFF)_install
1639-
rsync -avz $(TIFF)/ $(TIFF)_install
1608+
rsync -az $(TIFF)/ $(TIFF)_install
16401609
(cd $(TIFF)_install; make distclean; prefix=$(CBF_PREFIX); export prefix; \
16411610
./configure --prefix=$(CBF_PREFIX); make install)
16421611

@@ -1650,30 +1619,26 @@ build_hdf5: $(M4)/Makefile.m4
16501619
touch build_hdf5
16511620
$(HDF5): build_hdf5 $(LIBAECdep)
16521621
-rm -rf $(HDF5)
1653-
-rm -rf $(HDF5).tar.gz
1654-
$(DOWNLOAD) $(HDF5_URL)
1655-
tar -xvf $(HDF5).tar.gz
1622+
wget -O - -nv $(HDF5_URL) | tar -xzf -
16561623
cp config.guess $(HDF5)/bin/config.guess
16571624
cp config.sub $(HDF5)/bin/config.sub
1658-
touch $(HDF5)
1659-
-rm $(HDF5).tar.gz
16601625
echo "first level HDF5 install in "$(HDF5_PREFIX)
16611626
(cd $(ROOT)/$(HDF5); \
16621627
CFLAGS="$(CFLAGS)"; export CFLAGS; \
16631628
mkdir -p hdf5; prefix=$(ROOT)/$(HDF5)/hdf5; export prefix; \
16641629
./configure --prefix=$(ROOT)/$(HDF5)/hdf5 --enable-build-mode=production \
16651630
--enable-trace --enable-fortran --enable-using-memchecker --with-szlib=$(ROOT) ;\
16661631
make install; \
1667-
rsync -avz $(ROOT)/$(HDF5)/hdf5/bin/ $(HDF5_PREFIX)/bin; \
1668-
rsync -avz $(ROOT)/$(HDF5)/hdf5/lib/ $(HDF5_PREFIX)/lib; \
1669-
rsync -avz $(ROOT)/$(HDF5)/hdf5/include/ $(HDF5_PREFIX)/include; \
1632+
rsync -az $(ROOT)/$(HDF5)/hdf5/bin/ $(HDF5_PREFIX)/bin; \
1633+
rsync -az $(ROOT)/$(HDF5)/hdf5/lib/ $(HDF5_PREFIX)/lib; \
1634+
rsync -az $(ROOT)/$(HDF5)/hdf5/include/ $(HDF5_PREFIX)/include; \
16701635
cd $(HDF5_PREFIX)/bin; $(ROOT)/$(HDF5)/hdf5/bin/h5redeploy -force )
16711636
$(HDF5)_INSTALL: $(HDF5)
16721637
-rm -rf $(HDF5)_install
16731638
echo "final HDF5 install in "$(CBF_PREFIX)
1674-
rsync -avz $(ROOT)/$(HDF5)/hdf5/bin/ $(CBF_PREFIX)/bin; \
1675-
rsync -avz $(ROOT)/$(HDF5)/hdf5/lib/ $(CBF_PREFIX)/lib; \
1676-
rsync -avz $(ROOT)/$(HDF5)/hdf5/include/ $(CBF_PREFIX)/include; \
1639+
rsync -az $(ROOT)/$(HDF5)/hdf5/bin/ $(CBF_PREFIX)/bin; \
1640+
rsync -az $(ROOT)/$(HDF5)/hdf5/lib/ $(CBF_PREFIX)/lib; \
1641+
rsync -az $(ROOT)/$(HDF5)/hdf5/include/ $(CBF_PREFIX)/include; \
16771642
cd $(CBF_PREFIX)/bin; $(ROOT)/$(HDF5)/hdf5/bin/h5redeploy -force
16781643
endif
16791644

@@ -1686,13 +1651,9 @@ build_libaec: $(M4)/Makefile.m4
16861651
$(LIBAEC): build_libaec
16871652
mkdir -p $(SOLIB)
16881653
-rm -rf $(LIBAEC)
1689-
-rm -rf $(LIBAEC).tar.gz
1690-
$(DOWNLOAD) $(LIBAEC_URL)
1691-
tar -xvf $(LIBAEC).tar.gz
1692-
-rm $(LIBAEC).tar.gz
1654+
wget -O - -nv $(LIBAEC_URL) | tar -xzf -
16931655
(cd $(LIBAEC); mkdir -p build; cd build; ../configure --prefix=$(ROOT); make install; \
16941656
cp $(LIB)/libsz.so* $(LIB)/libaec.so* $(SOLIB))
1695-
touch $(LIBAEC)
16961657
endif
16971658

16981659
ifneq ($(CBFLIB_DONT_USE_LZ4),yes)
@@ -1705,10 +1666,7 @@ $(LZ4): $(HDF5) build_lz4
17051666
mkdir -p $(SOLIB)
17061667
-rm -rf $(LZ4)
17071668
ifneq ($(MSYS2),yes)
1708-
-rm -rf $(LZ4).tar.gz
1709-
$(DOWNLOAD) $(LZ4_URL)
1710-
tar -xvf $(LZ4).tar.gz
1711-
-rm $(LZ4).tar.gz
1669+
wget -O - -nv $(LZ4_URL) | tar -xzf -
17121670
(cp $(LZ4include)/lz4.h $(INCLUDE); \
17131671
$(CC) $(CFLAGS) $(SOWCFLAGS) $(INCLUDES) $(WARNINGS) -c $(LZ4src)/lz4.c -o lz4.o; \
17141672
$(CC) $(CFLAGS) $(SOCFLAGS) $(INCLUDES) $(WARNINGS) -c $(LZ4src)/h5zlz4.c -o h5zlz4.o; \
@@ -1718,7 +1676,6 @@ else
17181676
git clone $(LZ4_URL)
17191677
(cd $(LZ4); mkdir build; cd build; cmake .. -G 'MSYS Makefiles' -DENABLE_LZ4_PLUGIN="yes"; make all; cp plugins/* $(SOLIB))
17201678
endif
1721-
touch $(LZ4)
17221679
endif
17231680

17241681

@@ -1734,7 +1691,6 @@ $(BSHUF): $(HDF5) build_BSHUF $(LZ4dep)
17341691
git clone $(BSHUF_URL)
17351692
(cd $(BSHUF); git submodule update --init; $(PYTHON3) -m build --config-setting=install \
17361693
-C--h5plugin -C--h5plugin-dir=../solib -C--zstd -C--user)
1737-
touch $(BSHUF)
17381694
endif
17391695

17401696
ifneq ($(CBFLIB_DONT_USE_ZSTD),yes)
@@ -1754,7 +1710,6 @@ $(ZSTD): $(HDF5) build_ZSTD
17541710
$(CC) -shared zstd_h5plugin.o $(HDF5SOLIBS_LOCAL) $(HDF5SOLIBS_SYSTEM) -lzstd \
17551711
-o $(SOLIB)/$(ZSTDFILTER).so; \
17561712
rm zstd_h5plugin.o)
1757-
touch $(ZSTD)
17581713
endif
17591714

17601715
ifneq ($(CBFLIB_DONT_USE_CQRLIB),yes)
@@ -1776,7 +1731,6 @@ cqrlib $(SOLIB)/libcqr.so $(LIB)lbcqr.a: build_CQRLIB
17761731
ifneq ($(RANLIB),)
17771732
$(RANLIB) $(LIB)/libcqr.a
17781733
endif
1779-
touch cqrlib
17801734
endif
17811735

17821736

@@ -1956,7 +1910,6 @@ $(PY2CBF)/xmas/readmarheader.py \
19561910
$(PY2CBF)/xmas/xmasheaders.py \
19571911
$(PY2CBF)/xmas/xmas_cif_template.cif : $(NUWEB_DEP) $(NUWEB_DEP2) $(PY2CBF)/pycbf.w
19581912
(cd $(PY2CBF); $(NUWEB) pycbf.w )
1959-
touch $(PY2CBF)/py2setup_py.m4
19601913

19611914
$(PY2CBF)/_py2cbf.$(PY2CBFEXT): $(PY2CBF) shared \
19621915
$(PY2CBF)/py2setup.py \
@@ -2028,7 +1981,6 @@ $(PY3CBF)/xmas/readmarheader.py \
20281981
$(PY3CBF)/xmas/xmasheaders.py \
20291982
$(PY3CBF)/xmas/xmas_cif_template.cif: $(NUWEB_DEP) $(NUWEB_DEP2) $(PY3CBF)/pycbf.w
20301983
(cd $(PY3CBF); $(NUWEB) pycbf.w )
2031-
touch $(PY3CBF)/py3setup_py.m4
20321984

20331985

20341986
$(PY3CBF)/_pycbf.$(PY3CBFEXT): $(PY3CBF) shared \
@@ -2488,16 +2440,10 @@ $(BIN)/cbf_testxfelread: $(LIB)/libcbf.a $(EXAMPLES)/cbf_testxfelread.c $(EXAMPL
24882440
#
24892441

24902442
$(DATADIRI): $(M4)/Makefile.m4
2491-
(cd ..; $(DOWNLOAD) $(DATAURLI))
2492-
(cd ..; tar -zxvf CBFlib_$(VERSION)_Data_Files_Input.tar.gz)
2493-
touch $(DATADIRI)
2494-
-(cd ..; rm CBFlib_$(VERSION)_Data_Files_Input.tar.gz)
2443+
wget -O - -nv $(DATAURLI) | tar -C .. -xzf -
24952444

24962445
$(DATADIRO): $(M4)/Makefile.m4
2497-
(cd ..; $(DOWNLOAD) $(DATAURLO))
2498-
(cd ..; tar -zxvf CBFlib_$(VERSION)_Data_Files_Output.tar.gz)
2499-
touch $(DATADIRO)
2500-
-(cd ..; rm CBFlib_$(VERSION)_Data_Files_Output.tar.gz)
2446+
wget -O - -nv $(DATAURLO) | tar -C .. -xzf -
25012447

25022448
# Input Data Files
25032449

@@ -3178,7 +3124,7 @@ tar: $(DOCUMENTS) $(SOURCE) $(SRC)/cbf.stx $(HEADERS) $(M4FILES)\
31783124
README.html README Makefile \
31793125
$(JPEGS)
31803126
-/bin/rm -f CBFlib.tar*
3181-
tar cvBf CBFlib.tar \
3127+
tar -cf CBFlib.tar \
31823128
$(DOCUMENTS) $(SOURCE) $(SRC)/cbf.stx $(HEADERS) $(M4FILES)\
31833129
$(EXAMPLES) \
31843130
README.html README Makefile \

0 commit comments

Comments
 (0)