aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2018-11-26 20:00:15 +0000
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2018-11-26 20:00:15 +0000
commitd4138e68e7160ec1242c08da83c58e2d9097f222 (patch)
tree9251dcca4190bb4d13e24c60fa88b3b5c28b143d
parent5bb72e98b312d22191b13f3821f258449e548516 (diff)
Making lock file directory
We had forgot to add the rule to build the lock file directory for downloading data. This has been corrected.
-rwxr-xr-xconfigure4
-rw-r--r--reproduce/src/make/download.mk2
-rw-r--r--reproduce/src/make/initialize.mk2
3 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index 4753320..d4abda9 100755
--- a/configure
+++ b/configure
@@ -564,7 +564,7 @@ fi
# Build Basic dependencies
# ------------------------
make -f reproduce/src/make/dependencies-basic.mk \
- static_build=$static_build -j8
+ static_build=$static_build #-j8
@@ -579,7 +579,7 @@ make -f reproduce/src/make/dependencies-basic.mk \
# to build them in this script. But after this, we can rely on Makefiles.
numthreads=$($instdir/bin/nproc)
./.local/bin/make -f reproduce/src/make/dependencies.mk \
- static_build=$static_build -j$numthreads
+ static_build=$static_build #-j$numthreads
diff --git a/reproduce/src/make/download.mk b/reproduce/src/make/download.mk
index 332392b..bc6d4cd 100644
--- a/reproduce/src/make/download.mk
+++ b/reproduce/src/make/download.mk
@@ -51,7 +51,7 @@
# series. We thus use the `flock' program to tie/lock the downloading
# process with a file and make sure that only one downloading event is in
# progress at every moment.
-$(indir):; mkdir $@
+$(indir) $(lockdir):; mkdir $@
inputdatasets = $(foreach i, wfpc2, $(indir)/$(i).fits)
$(inputdatasets): $(indir)/%.fits: | $(indir) $(lockdir)
diff --git a/reproduce/src/make/initialize.mk b/reproduce/src/make/initialize.mk
index 61f28cf..3453d4e 100644
--- a/reproduce/src/make/initialize.mk
+++ b/reproduce/src/make/initialize.mk
@@ -34,10 +34,10 @@
# parallel. Also, some programs may not be thread-safe, therefore it will
# be necessary to put a lock on them. This pipeline uses the `flock'
# program to achieve this.
-indir = $(BDIR)/inputs
texdir = $(BDIR)/tex
srcdir = reproduce/src
lockdir = $(BDIR)/locks
+indir = $(BDIR)/inputs
texbdir = $(texdir)/build
tikzdir = $(texbdir)/tikz
mtexdir = $(texdir)/macros