diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-06-27 23:49:36 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-06-27 23:49:36 +0100 |
| commit | 3d7d8cedfe0698e895949027906ce5ca996aad17 (patch) | |
| tree | 108627d6dcb039ad340e75b1b14081524cc5a3df /reproduce/analysis/make/initialize.mk | |
| parent | 57f922480d62a826b3e6030c81b85b412794fd4c (diff) | |
| parent | c151eddbcc5f4208b40dc3037a8ae8adb0ff9173 (diff) | |
Imported recent work in master, minor conflict fixed in paper.mk
Only two conflicts came up in the newly added comments of 'paper.mk' in the
Maneage branch. It happened because in this project we don't use
'pdflatex', but 'latex' alone.
Diffstat (limited to 'reproduce/analysis/make/initialize.mk')
| -rw-r--r-- | reproduce/analysis/make/initialize.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk index 489f9e3..d01cda0 100644 --- a/reproduce/analysis/make/initialize.mk +++ b/reproduce/analysis/make/initialize.mk @@ -243,6 +243,7 @@ clean: clean-mmap rm -rf $(BDIR)/tex/macros/!(dependencies.tex|dependencies-bib.tex) rm -rf $(BDIR)/!(software|tex) $(BDIR)/tex/!(macros|$(texbtopdir)) rm -rf $(BDIR)/tex/build/!(tikz) $(BDIR)/tex/build/tikz/* + rm -rf $(BDIR)/software/preparation-done.mk distclean: clean # Without cleaning the Git hooks, we won't be able to easily @@ -385,19 +386,15 @@ dist-zip: $(project-package-contents) # Package the software tarballs. dist-software: curdir=$$(pwd) + dirname=software-$(project-commit-hash) cd $(BDIR) - if [ -d .git ]; then - dirname="software-$$(git describe --dirty --always --long)" - else - dirname="software-NOGIT"; - fi mkdir $$dirname cp -L software/tarballs/* $$dirname/ tar -cf $$dirname.tar $$dirname gzip -f --best $$dirname.tar rm -rf $$dirname cd $$curdir - mv $(BDIR)/$$dir.tar.gz ./ + mv $(BDIR)/$$dirname.tar.gz ./ |