aboutsummaryrefslogtreecommitdiff
path: root/reproduce
diff options
context:
space:
mode:
Diffstat (limited to 'reproduce')
-rw-r--r--reproduce/analysis/make/initialize.mk28
-rw-r--r--reproduce/analysis/make/paper.mk15
2 files changed, 31 insertions, 12 deletions
diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk
index 3649fd2..ce0ac95 100644
--- a/reproduce/analysis/make/initialize.mk
+++ b/reproduce/analysis/make/initialize.mk
@@ -489,13 +489,31 @@ $(mtexdir)/initialize.tex: | $(mtexdir)
# Calculate the latest Maneage commit used to build this
# project:
+ # - The project may not have the 'maneage' branch (for example
+ # after cloning from a fork that didn't include it!). In this
+ # case, we'll print a descriptive warning, telling the user what
+ # should be done (reporting the last merged commit and its date
+ # is very useful for the future).
# - The '--dirty' option (used in 'project-commit-hash') isn't
# applicable to "commit-ishes" (direct quote from Git's error
# message!).
- # - The project may not have the 'maneage' branch (for example
- # 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}')
+ if git log maneage -1 &> /dev/null; then
+ c=$$(git merge-base HEAD maneage)
+ v=$$(git describe --always --long $$c)
+ d=$$(git show -s --format=%aD $$v | awk '{print $$2, $$3, $$4}')
+ else
+ echo
+ echo "WARNING: no 'maneage' branch found! Without it, the latest merge of "
+ echo "this project with Maneage can't be reported in the paper (which is bad "
+ echo "for your readers; that includes yourself in a few years). Please run "
+ echo "the commands below to fetch the 'maneage' branch from its own server "
+ echo "and remove this warning (these commands will not affect your project):"
+ echo " $ git remote add origin-maneage http://git.maneage.org/project.git"
+ echo " $ git fetch origin-maneage"
+ echo " $ git branch maneage --track origin-maneage/maneage"
+ echo
+ v="\textcolor{red}{NO-MANEAGE-BRANCH (see printed warning to fix this)}"
+ d="\textcolor{red}{NO-MANEAGE-DATE}"
+ fi
echo "\newcommand{\maneagedate}{$$d}" >> $@
echo "\newcommand{\maneageversion}{$$v}" >> $@
diff --git a/reproduce/analysis/make/paper.mk b/reproduce/analysis/make/paper.mk
index fc10699..2d8a0c9 100644
--- a/reproduce/analysis/make/paper.mk
+++ b/reproduce/analysis/make/paper.mk
@@ -72,14 +72,15 @@ $(mtexdir)/project.tex: $(mtexdir)/verify.tex
echo "LaTeX-built PDF paper will not be built."
echo
if [ x$(more-on-building-pdf) = x1 ]; then
- echo "To build the PDF, make sure you have LaTeX within the "
- echo "project (you can check by running "
- echo "'./.local/bin/latex --version'), _AND_ make sure that "
- echo "the 'pdf-build-final' variable has a value of 'yes', it "
- echo "is defined in: 'reproduce/analysis/config/pdf-build.conf'."
+ echo "To build the PDF, make sure that the 'pdf-build-final' "
+ echo "variable has a value of 'yes' (it is defined in this file)"
+ echo " reproduce/analysis/config/pdf-build.conf"
echo
- echo "If you don't have LaTeX within the project, please re-run"
- echo "'./project configure -e' when you have internet access."
+ echo "If you still see this message, there was a problem with "
+ echo "building LaTeX within the project. You can re-try building"
+ echo "it when you have internet access with the two commands below:"
+ echo " $ rm .local/version-info/tex/texlive*"
+ echo " $./project configure -e"
else
echo "For more, run './project make more-on-building-pdf=1'"
fi