diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-05-21 14:43:09 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-05-21 14:43:09 +0100 |
| commit | ba3546617998735301f1e72fa98872e27520829f (patch) | |
| tree | c2a6a7c38a525ac068392b5eca7fd2134909e1d2 /reproduce/analysis/make | |
| parent | 146122a0ecc8b35263e9d4bfd968535e06456ad7 (diff) | |
Source directory links to build directory all managed in configure
Until now, the `tex/build' symbolic link was put in the clone/source tree
when the build-directory's `tex' directory was being built. Thanks to
Roberto Baena, we just found a bug because of this behavior: when a second
group member is trying to build the pipeline, since the build directory's
`tex' directory already exists, no `tex/build' will be put in their
clone/source directory. As a result, the PDF building will crash.
To fix this (and keep things organized), the two `tex/build' and `tex/tikz'
links (to the build directory) are now built in the configure step while it
is building all the top-level directories. They are no longer built within
the Makefiles.
Also, a comment was added on top of every directory built during the
configuration phase to be clear.
This fixes bug #56362.
Diffstat (limited to 'reproduce/analysis/make')
| -rw-r--r-- | reproduce/analysis/make/initialize.mk | 2 | ||||
| -rw-r--r-- | reproduce/analysis/make/paper.mk | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk index 5f8a062..fe7b5ea 100644 --- a/reproduce/analysis/make/initialize.mk +++ b/reproduce/analysis/make/initialize.mk @@ -151,8 +151,6 @@ export MPI_PYTHON3_SITEARCH := # are looking for in the outputs. .SUFFIXES: $(lockdir): | $(BDIR); mkdir $@ -$(texbdir): | $(texdir); mkdir $@ -$(tikzdir): | $(texbdir); mkdir $@ && ln -fs $@ tex/tikz diff --git a/reproduce/analysis/make/paper.mk b/reproduce/analysis/make/paper.mk index c1d5b33..34d88a4 100644 --- a/reproduce/analysis/make/paper.mk +++ b/reproduce/analysis/make/paper.mk @@ -91,7 +91,7 @@ $(mtexdir)/project.tex: $(foreach s, $(subst paper,,$(makesrc)), $(mtexdir)/$(s) # been modified, we don't want to re-build the bibliography, only the final # PDF. $(texbdir)/paper.bbl: tex/src/references.tex $(mtexdir)/dependencies-bib.tex \ - | $(tikzdir) $(texbdir) $(mtexdir)/project.tex + | $(mtexdir)/project.tex # If `$(mtexdir)/project.tex' is empty, don't build PDF. @macros=$$(cat $(mtexdir)/project.tex) if [ x"$$macros" != x ]; then @@ -118,8 +118,7 @@ $(texbdir)/paper.bbl: tex/src/references.tex $(mtexdir)/dependencies-bib.tex \ # to run everything cleanly from there, it is necessary to add the current # directory (top project directory) to the `TEXINPUTS' environment # variable. -paper.pdf: $(mtexdir)/project.tex paper.tex $(texbdir)/paper.bbl \ - | $(tikzdir) $(texbdir) +paper.pdf: $(mtexdir)/project.tex paper.tex $(texbdir)/paper.bbl # If `$(mtexdir)/project.tex' is empty, don't build the PDF. @macros=$$(cat $(mtexdir)/project.tex) |