Use pip and pex cache dirs to speed up build. 'make clean' to wipe out caches (in tmp dir)

Author: timvaillancourt

.gitignore

@@ -1,6 +1,6 @@
 bin
 build
 rpmbuild
-pex
+tmp
 *.pyc
 .idea

Makefile

@@ -34,4 +34,4 @@ rpm: clean
 	rpmbuild -D "_topdir $(PWD)/rpmbuild" -D "version $(VERSION)" -bb rpmbuild/SPECS/$(NAME).spec
 
 clean:
-	rm -rf bin build rpmbuild $(NAME).egg-info pex 2>/dev/null
+	rm -rf bin build rpmbuild $(NAME).egg-info tmp 2>/dev/null

scripts/build.sh

@@ -8,8 +8,9 @@ rootdir=$(readlink -f $(dirname $0)/..)
 srcdir=${rootdir}/${mod_name}
 bindir=${rootdir}/bin
 builddir=${rootdir}/build
-cachedir=${rootdir}/cache
-pexcachedir=${cachedir}/cache/pex
+tmpdir=${rootdir}/tmp
+pexdir=${tmpdir}/pex
+pipdir=${tmpdir}/pip
 venvdir=${builddir}/venv
 output_file=${bindir}/${name}
 require_file=${builddir}/requirements.txt
@@ -88,15 +89,16 @@ if [ -d ${srcdir} ]; then
 	fi
 	source ${venvdir}/bin/activate
 
-	${venvdir}/bin/python2.7 ${venvdir}/bin/pip install pex requests
+	[ ! -d ${pipdir} ] && mkdir -p ${pipdir}
+	${venvdir}/bin/python2.7 ${venvdir}/bin/pip install --download-cache=${pipdir} pex requests
 	if [ $? -gt 0 ]; then
 		echo "Failed to install pex utility for building!"
 		exit 1
 	fi
 
 	[ ! -d ${bindir} ] && mkdir -p ${bindir}
-	[ ! -d ${pexcachedir} ] && mkdir -p ${pexcachedir}
-	${venvdir}/bin/python2.7 ${venvdir}/bin/pex --cache-root ${pexcachedir}  -o ${output_file} -m ${mod_name} -r ${require_file} ${builddir}
+	[ ! -d ${pexdir} ] && mkdir -p ${pexdir}
+	${venvdir}/bin/python2.7 ${venvdir}/bin/pex -o ${output_file} -m ${mod_name} -r ${require_file} --pex-root=${pexdir}  ${builddir}
 	if [ $? -lt 1 ] && [ -x ${output_file} ]; then
 		echo "pex executable written to '$output_file'"
 	else