diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-17 01:06:20 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-17 01:06:20 +0100 |
| commit | 8eb0892e179b4970a9835d29b5f57dd912ca4464 (patch) | |
| tree | b0858d1021efc399106e2936aa44c4fc37196edb /reproduce/analysis/make | |
| parent | e0a57efde9206c0c7420e03e5fb2a354d568c3ad (diff) | |
IMPORTANT: software config directly under reproduce/software/config
Until now the software configuration parameters were defined under the
`reproduce/software/config/installation/' directory. This was because the
configuration parameters of analysis software (for example Gnuastro's
configurations) were placed under there too. But this was terribly
confusing, because the run-time options of programs falls under the
"analysis" phase of the project.
With this commit, the Gnuastro configuration files have been moved under
the new `reproduce/analysis/config/gnuastro' directory and the software
configuration files are directly under `reproduce/software/config'. A clean
build was done with this change and it didn't crash, but it may cause
crashes in derived projects, so after merging with Maneage, please
re-configure your project to see if anything has been missed. Please let us
know if there is a problem.
Diffstat (limited to 'reproduce/analysis/make')
| -rw-r--r-- | reproduce/analysis/make/initialize.mk | 4 | ||||
| -rw-r--r-- | reproduce/analysis/make/top-make.mk | 2 | ||||
| -rw-r--r-- | reproduce/analysis/make/top-prepare.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk index 3af0012..d8a8b73 100644 --- a/reproduce/analysis/make/initialize.mk +++ b/reproduce/analysis/make/initialize.mk @@ -308,8 +308,8 @@ $(packagecontents): paper.pdf | $(texdir) # have this machine's local settings and are irrelevant for anyone # else. rm -rf $$dir/tex/build/build* - rm $$dir/reproduce/software/config/installation/LOCAL.conf - rm $$dir/reproduce/software/config/gnuastro/gnuastro-local.conf + rm $$dir/reproduce/software/config/LOCAL.conf + rm $$dir/reproduce/analysis/config/gnuastro/gnuastro-local.conf # When submitting to places like arXiv, they will just run LaTeX # once and won't run `biber'. So we need to also keep the `.bbl' diff --git a/reproduce/analysis/make/top-make.mk b/reproduce/analysis/make/top-make.mk index 6c940b8..43e88b2 100644 --- a/reproduce/analysis/make/top-make.mk +++ b/reproduce/analysis/make/top-make.mk @@ -21,7 +21,7 @@ # Load the local configuration (created after running # `./project configure'). -include reproduce/software/config/installation/LOCAL.conf +include reproduce/software/config/LOCAL.conf diff --git a/reproduce/analysis/make/top-prepare.mk b/reproduce/analysis/make/top-prepare.mk index 1778c6b..be7482c 100644 --- a/reproduce/analysis/make/top-prepare.mk +++ b/reproduce/analysis/make/top-prepare.mk @@ -25,7 +25,7 @@ # Load the local configuration (created after running # `./project configure'). -include reproduce/software/config/installation/LOCAL.conf +include reproduce/software/config/LOCAL.conf |