From 0f1ec1488bf0bdd70d74f812ffb3ec70dc55b68e Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Sat, 29 Jun 2019 02:01:58 +0200
Subject: Added citation for TIDES, sorted progs alphabetically
While reviewing Prasenjit's commits, I noticed that we had forgot to add
the citation for TIDES, also to make things clear, the program/library
build rules are now sorted alphabetically.
Finally, I noticed that after building the TiKZ PDF figures, it is crashing
(like on Prasenjit's computer). After looking around, I noticed its because
we were setting the of the `TEXINPUTS' environment variable to be the
installed TeX Live directory (which was ultimately redundant because by
default TeX will look into where it was installed). The important thing is
just that we remove any possible value the host system has, not to set new
directories.
---
reproduce/analysis/config/pdf-build.mk | 2 +-
reproduce/analysis/make/initialize.mk | 6 +++++-
reproduce/analysis/make/paper.mk | 8 ++++----
3 files changed, 10 insertions(+), 6 deletions(-)
(limited to 'reproduce/analysis')
diff --git a/reproduce/analysis/config/pdf-build.mk b/reproduce/analysis/config/pdf-build.mk
index c75f5d1..3a86ff3 100644
--- a/reproduce/analysis/config/pdf-build.mk
+++ b/reproduce/analysis/config/pdf-build.mk
@@ -18,4 +18,4 @@
# permitted in any medium without royalty provided the copyright notice and
# this notice are preserved. This file is offered as-is, without any
# warranty.
-pdf-build-final =
+pdf-build-final = yes
diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk
index 640ba2d..d176489 100644
--- a/reproduce/analysis/make/initialize.mk
+++ b/reproduce/analysis/make/initialize.mk
@@ -103,15 +103,19 @@ curdir := $(shell echo $$(pwd))
# itself and doesn't use the local system's default tools. With these
# environment variables, we are setting it to prefer the software we have
# build here.
+#
+# `TEXINPUTS': we have to remove all possible user-specified directories to
+# avoid conflicts with existing TeX Live solutions. Later (in `paper.mk'),
+# we are also going to overwrite `TEXINPUTS' just before `pdflatex'.
.ONESHELL:
.SHELLFLAGS = -ec
+export TEXINPUTS :=
export CCACHE_DISABLE := 1
export PATH := $(installdir)/bin
export LD_LIBRARY_PATH := $(installdir)/lib
export LDFLAGS := -L$(installdir)/lib
export SHELL := $(installdir)/bin/bash
export CPPFLAGS := -I$(installdir)/include
-export TEXINPUTS := $(installdir)/texlive//
diff --git a/reproduce/analysis/make/paper.mk b/reproduce/analysis/make/paper.mk
index 34d88a4..c17028a 100644
--- a/reproduce/analysis/make/paper.mk
+++ b/reproduce/analysis/make/paper.mk
@@ -98,10 +98,10 @@ $(texbdir)/paper.bbl: tex/src/references.tex $(mtexdir)/dependencies-bib.tex \
# We'll run LaTeX first to generate the `.bcf' file (necessary
# for `biber') and then run `biber' to generate the `.bbl' file.
- p=$$(pwd);
- export TEXINPUTS=$$p:$$TEXINPUTS;
+ p=$$(pwd)
+ export TEXINPUTS=$$p:
cd $(texbdir);
- pdflatex -shell-escape -halt-on-error $$p/paper.tex;
+ pdflatex -shell-escape -halt-on-error $$p/paper.tex
biber paper
fi
@@ -126,7 +126,7 @@ paper.pdf: $(mtexdir)/project.tex paper.tex $(texbdir)/paper.bbl
# Go into the top TeX build directory and make the paper.
p=$$(pwd)
- export TEXINPUTS=$$p:$$TEXINPUTS
+ export TEXINPUTS=$$p:
cd $(texbdir)
pdflatex -shell-escape -halt-on-error $$p/paper.tex
--
cgit v1.2.1