diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-12-01 16:36:04 +0000 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-12-01 16:38:08 +0000 |
| commit | a9786200d5ed5bde30cb29b445e2a6af06694b2e (patch) | |
| tree | ca1f3277f6ee724b43e458a5df25795a665827fe /reproduce/analysis/make/initialize.mk | |
| parent | 8fbf384f7ca3d3cba566194c21da23ee6c9374be (diff) | |
| parent | ac8eee90b1580fb566ee5b84fef9acb4ed437c01 (diff) | |
Imported recent work in Maneage, minor conflicts fixed
Some minor conflicts that came up during the merge were fixed.
Diffstat (limited to 'reproduce/analysis/make/initialize.mk')
| -rw-r--r-- | reproduce/analysis/make/initialize.mk | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk index 6431863..75f87ee 100644 --- a/reproduce/analysis/make/initialize.mk +++ b/reproduce/analysis/make/initialize.mk @@ -38,9 +38,6 @@ mtexdir = $(texdir)/macros bashdir = reproduce/analysis/bash pconfdir = reproduce/analysis/config installdir = $(BDIR)/software/installed -# --------- Delete for no Gnuastro --------- -gconfdir = reproduce/analysis/config/gnuastro -# ------------------------------------------ @@ -240,7 +237,7 @@ clean: clean-mmap # features like ignoring the listing of a file with `!()' that we # are using afterwards. shopt -s extglob - rm -rf $(BDIR)/tex/macros/!(dependencies.tex|dependencies-bib.tex) + rm -rf $(BDIR)/tex/macros/!(dependencies.tex|dependencies-bib.tex|hardware-parameters.tex) rm -rf $(BDIR)/!(software|tex) $(BDIR)/tex/!(macros|$(texbtopdir)) rm -rf $(BDIR)/tex/build/!(tikz) $(BDIR)/tex/build/tikz/* rm -rf $(BDIR)/software/preparation-done.mk @@ -255,8 +252,8 @@ distclean: clean # `rm' program. So for this recipe, we'll use the host system's # `rm', not our own. $$sys_rm -rf $(BDIR) + $$sys_rm -f $(pconfdir)/LOCAL.conf $$sys_rm -f Makefile .gnuastro .local .build - $$sys_rm -f $(pconfdir)/LOCAL.conf $(gconfdir)/gnuastro-local.conf @@ -487,8 +484,13 @@ print-copyright = \ # actually exists, it is also aded as a `.PHONY' target above. $(mtexdir)/initialize.tex: | $(mtexdir) - # Version and title of project. - @echo "\newcommand{\projecttitle}{$(metadata-title)}" > $@ + # Version and title of project. About the starting '@': since these + # commands are run every time with './project make', it is annoying + # to print them on the standard output every time. With the '@', + # make will not print the commands that it runs in this recipe. + @d=$$(git show -s --format=%aD HEAD | awk '{print $$2, $$3, $$4}') + echo "\newcommand{\projectdate}{$$d}" > $@ + echo "\newcommand{\projecttitle}{$(metadata-title)}" >> $@ echo "\newcommand{\projectversion}{$(project-commit-hash)}" >> $@ # arXiv/Zenodo identifier (necessary for download link): @@ -505,10 +507,6 @@ $(mtexdir)/initialize.tex: | $(mtexdir) # after cloning from a fork that didn't include it!). In this # case, we'll just return the string a clear string. v=$$(git describe --always --long maneage) || v=maneage-ref-missing + d=$$(git show -s --format=%aD $$v | awk '{print $$2, $$3, $$4}') + echo "\newcommand{\maneagedate}{$$d}" >> $@ echo "\newcommand{\maneageversion}{$$v}" >> $@ - - # Get the date of the most recent commit from the Maneage - # branch. Note that with '%aD', the format looks like this: - # Wed, 9 Sep 2020 10:08:20 +0200 - v=$$(git show -s --format=%aD $$v | awk '{print $$2, $$3, $$4}') - echo "\newcommand{\maneagedate}{$$v}" >> $@ |