build: splitting out compatibility and simplyfying timestamps

Author: Sam Kleinman

bin/makefile.compatibility

@@ -0,0 +1,18 @@
+# Fixing `sed` for OS X
+UNAME := $(shell uname)
+
+ifeq ($(UNAME), Linux)
+SED_ARGS_FILE = -i -r
+SED_ARGS_REGEX = -r
+endif
+
+ifeq ($(UNAME), Darwin)
+SED_ARGS_FILE = -i "" -E
+SED_ARGS_REGEX = -E
+endif
+
+ifeq ($(shell test -f /etc/arch-release && echo arch || echo Linux),arch)
+PYTHONBIN = python2
+else
+PYTHONBIN = python
+endif

makefile

@@ -3,6 +3,9 @@ MAKEFLAGS += -j
 MAKEFLAGS += -r
 MAKEFLAGS += --no-print-directory
 
+# includes
+include bin/makefile.compatibility 
+
 # Build directory tweaking.
 output = build
 public-output = $(output)/public
@@ -15,26 +18,22 @@ manual-branch = master
 current-branch := $(shell git symbolic-ref HEAD 2>/dev/null | cut -d "/" -f "3" )
 last-commit := $(shell git rev-parse --verify HEAD)
 
+timestamp := $(shell date +%Y%m%d%H%M)
+
 ifeq ($(current-branch),$(manual-branch))
 current-if-not-manual = $(manual-branch)
 else
 current-if-not-manual = $(current-branch)
 endif
 
-# Fixing `sed` for OS X
-UNAME := $(shell uname)
-ifeq ($(UNAME), Linux)
-SED_ARGS_FILE = -i -r
-SED_ARGS_REGEX = -r
-endif
-ifeq ($(UNAME), Darwin)
-SED_ARGS_FILE = -i "" -E
-SED_ARGS_REGEX = -E
-endif
-
 # Sphinx variables.
 SPHINXOPTS = -c ./
 SPHINXBUILD = sphinx-build
+
+ifdef NITPICK
+SPHINXOPTS += -n -w $(branch-output)/build.$(timestamp).log
+endif
+
 PAPER = letter
 PAPEROPT_a4 = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
@@ -292,12 +291,6 @@ epub:
 #
 ######################################################################
 
-ifeq ($(shell test -f /etc/arch-release && echo arch || echo Linux),arch)
-PYTHONBIN = python2
-else
-PYTHONBIN = python
-endif
-
 $(branch-output)/sitemap.xml.gz:$(branch-output)/dirhtml
 
 SITEMAPBUILD = $(PYTHONBIN) bin/sitemap_gen.py
@@ -437,8 +430,7 @@ PDFLATEXCOMMAND = TEXINPUTS=".:$(branch-output)/latex/:" pdflatex --interaction
 #
 ##########################################################################
 
-ARCHIVE_DATE := $(shell date +%s)
-archive:$(public-output).$(ARCHIVE_DATE).tar.gz
+archive:$(public-output).$(timestamp).tar.gz
 	@echo [archive]: created $< archive.
 $(public-output).$(ARCHIVE_DATE).tar.gz:$(public-output)
 	tar -czvf $@ $<