aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.file-metadatabin3947 -> 4353 bytes
-rwxr-xr-xconfigure117
-rw-r--r--paper.tex156
-rw-r--r--reproduce/config/pipeline/dependency-versions.mk18
-rw-r--r--reproduce/src/make/initialize.mk97
-rw-r--r--reproduce/src/make/paper.mk3
6 files changed, 241 insertions, 150 deletions
diff --git a/.file-metadata b/.file-metadata
index eb42414..dc3b3e2 100644
--- a/.file-metadata
+++ b/.file-metadata
Binary files differ
diff --git a/configure b/configure
index ca11343..1e3ef82 100755
--- a/configure
+++ b/configure
@@ -629,6 +629,12 @@ if ! [ -d $tardir ]; then mkdir $tardir; fi
instdir=$depdir/installed
if ! [ -d $instdir ]; then mkdir $instdir; fi
+texdir=$bdir/tex
+if ! [ -d $texdir ]; then mkdir $texdir; fi
+
+mtexdir=$texdir/macros
+if ! [ -d $mtexdir ]; then mkdir $mtexdir; fi
+
rm -f $installedlink
ln -s $instdir $installedlink
@@ -761,7 +767,7 @@ NOTE: the built software will NOT BE INSTALLED on your system (no root
access is required). They are only for local usage by this reproduction
pipeline. They will be installed in:
- $bdir/dependencies/installed
+ $depdir/installed
EOF
sleep $tsec
@@ -936,6 +942,115 @@ fi
+# Write all the software versions as a LaTeX macro.
+# Versions of programs (same order as 'dependency-versions.mk').
+vertex=$mtexdir/dependency-versions.tex
+function version_in_tex() {
+ v=$(awk '$1=="'"$1"'"{print $3}' $pdir/dependency-versions.mk)
+ if [ x"$v" = x ]; then echo "'$1' not found!"; exit 1; fi
+ echo "\newcommand{\\$2}{$v}" >> $vertex
+}
+echo "%% Automatically created list of software versions." > $vertex
+#version_in_tex "atlas-version" atlasversion
+version_in_tex "bash-version" bashversion
+#version_in_tex "binutils-version" binutilsversion
+version_in_tex "cfitsio-version" cfitsioversion
+version_in_tex "cmake-version" cmakeversion
+version_in_tex "coreutils-version" coreutilsversion
+version_in_tex "curl-version" curlversion
+version_in_tex "diffutils-version" diffutilsversion
+version_in_tex "fftw-version" fftwversion
+version_in_tex "findutils-version" findutilsversion
+version_in_tex "flock-version" flockversion
+version_in_tex "freetype-version" freetypeversion
+version_in_tex "gawk-version" gawkversion
+version_in_tex "gcc-version" gccversion
+version_in_tex "ghostscript-version" ghostscriptversion
+version_in_tex "git-version" gitversion
+version_in_tex "gmp-version" gmpversion
+version_in_tex "gnuastro-version" gnuastroversion
+version_in_tex "grep-version" grepversion
+version_in_tex "gsl-version" gslversion
+version_in_tex "gzip-version" gzipversion
+version_in_tex "hdf5-version" hdffiveversion
+version_in_tex "isl-version" islversion
+version_in_tex "libbsd-version" libbsdversion
+version_in_tex "libffi-version" libffiversion
+version_in_tex "libjpeg-version" libjpegversion
+version_in_tex "libpng-version" libpngversion
+version_in_tex "libtiff-version" libtiffversion
+version_in_tex "libtool-version" libtoolversion
+version_in_tex "lzip-version" lzipversion
+version_in_tex "make-version" makeversion
+version_in_tex "metastore-version" metastoreversion
+version_in_tex "mpfr-version" mpfrversion
+version_in_tex "mpc-version" mpcversion
+version_in_tex "ncurses-version" ncursesversion
+version_in_tex "openblas-version" openblasversion
+version_in_tex "openmpi-version" openmpiversion
+version_in_tex "openssl-version" opensslversion
+version_in_tex "patchelf-version" patchelfversion
+version_in_tex "pkgconfig-version" pkgconfigversion
+version_in_tex "python-version" pythonversion
+version_in_tex "readline-version" readlineversion
+version_in_tex "sed-version" sedversion
+version_in_tex "tar-version" tarversion
+version_in_tex "unzip-version" unzipversion
+version_in_tex "wget-version" wgetversion
+version_in_tex "which-version" whichversion
+version_in_tex "xz-version" xzversion
+version_in_tex "zip-version" zipversion
+version_in_tex "zlib-version" zlibversion
+
+# Special libraries.
+version_in_tex "bzip2-version" bziptwoversion
+#version_in_tex "lapack-version" lapackversion
+version_in_tex "libgit2-version" libgittwoversion
+version_in_tex "wcslib-version" wcslibversion
+
+# Python modules.
+version_in_tex "asn1crypto-version" asncryptoversion
+version_in_tex "astroquery-version" astroqueryversion
+version_in_tex "astropy-version" astropyversion
+version_in_tex "beautifulsoup4-version" beautifulsoupversion
+version_in_tex "certifi-version" certifiversion
+version_in_tex "cffi-version" cffiversion
+version_in_tex "chardet-version" chardetversion
+version_in_tex "cryptography-version" cryptographyversion
+version_in_tex "cycler-version" cyclerversion
+version_in_tex "entrypoints-version" entrypointsversion
+version_in_tex "h5py-version" hpyversion
+version_in_tex "html5lib-version" htmlfivelibversion
+version_in_tex "idna-version" idnaversion
+version_in_tex "jeepney-version" jeepneyversion
+version_in_tex "kiwisolver-version" kiwisolverversion
+version_in_tex "keyring-version" keyringversion
+version_in_tex "matplotlib-version" matplotlibversion
+version_in_tex "mpi4py-version" mpipyversion
+version_in_tex "numpy-version" numpyversion
+#version_in_tex "pip-version" pipversion
+version_in_tex "pycparser-version" pycparserversion
+version_in_tex "pyparsing-version" pyparsingversion
+version_in_tex "python-dateutil-version" pythondateutilversion
+version_in_tex "requests-version" requestsversion
+version_in_tex "scipy-version" scipyversion
+version_in_tex "secretstorage-version" secretstorageversion
+version_in_tex "setuptools-version" setuptoolsversion
+version_in_tex "setuptools_scm-version" setuptoolsscmversion
+version_in_tex "six-version" sixversion
+version_in_tex "soupsieve-version" soupsieveversion
+version_in_tex "urllib3-version" urllibthreeversion
+#version_in_tex "virtualenv-version" virtualenvversion
+version_in_tex "webencodings-version" webencodingsversion
+
+# TeX package versions
+if [ x"$texlive_result" != x"NOT!" ]; then
+ cat $depdir/texlive-versions.tex >> $vertex
+fi
+
+
+
+
# Final step: the Makefile
# --------------------------
#
diff --git a/paper.tex b/paper.tex
index ff03836..593ce12 100644
--- a/paper.tex
+++ b/paper.tex
@@ -204,49 +204,119 @@ SUNDIAL ITN, and from the Spanish Ministry of Economy and Competitiveness
(MINECO) under grant number AYA2016-76219-P.
The following free software tools were also critical component of this
-research (in alphabetical order): ATLAS \atlasversion, Bzip2
-\bziptwoversion, CFITSIO \cfitsioversion, CMake \cmakeversion, cURL
-\curlversion, Discoteq flock \flockversion, FreeType \freetypeversion, Git
-\gitversion, GNU Astronomy Utilities \gnuastroversion, GNU AWK \gawkversion,
-GNU Bash \bashversion, GNU Coreutils \coreutilsversion, GNU Diffutils
-\diffutilsversion, GNU Findutils \findutilsversion, GNU Grep \grepversion,
-GNU Gzip \gzipversion, GNU Libtool \libtoolversion, GNU Make \makeversion,
-GNU NCURSES \ncursesversion, GNU Readline \readlineversion, GNU Sed
-\sedversion, GNU Scientific Library (GSL) \gslversion, GNU Tar \tarversion,
-GNU Wget \wgetversion, GNU Which \whichversion, Lapack \lapackversion, Lzip
-\lzipversion, GPL Ghostscript \ghostscriptversion, Libbsd \libbsdversion,
-Libgit2 \libgitwoversion, Libjpeg \libjpegversion, Libpng \libpngversion,
-Libtiff \libtiffversion, Metastore (forked) \metastoreversion, OpenSSL
-\opensslversion, Patchelf \patchelfversion, Pkg-config \pkgconfigversion,
-Unzip \unzipversion, WCSLIB \wcslibversion, XZ Utils \xzversion, Zip
-\zipversion, and ZLib \zlibversion. We use Python {\pythonversion} with the
-following packages: Asn1crypto \asncryptoversion, Astroquery
-\astroqueryversion, Astropy {\astropyversion} \citep{astropy2013,
-astropy2018}, BeautifulSoup \beautifulsoupversion, Certifi \certifiversion,
-Cffi \cffiversion, Chardet \chardetversion, Cryptography
-\cryptographyversion, Cycler \cyclerversion, EntryPoints
-\entrypointsversion, h5py \hpyversion, html5ib \htmlfivelibversion, idna
-\idnaversion, Jeepney \jeepneyversion, Kiwisolver \kiwisolverversion,
-keyring \keyringversion, Matplotlib \matplotlibversion, Numpy \numpyversion,
-pycparser \pycparserversion, PyParsing \pyparsingversion, python-dateutil
-\pythondateutilversion, Requests \requestsversion, Scipy \scipyversion,
-ScreenStorage \screenstorageversion, Setuptools \setuptoolsversion,
-Setuptools-scm \setuptoolsscmversion, Six \sixversion, SoupSieve
-\soupsieveversion, urllib3 \urllibthreeversion and webencondings
-\webencondingsversion. The final paper was produced with \TeX{} Live
-\texliveversion, using the following packages: \TeX{} \textexversion, EC
-\texecversion, NewTX \texnewtxversion, Fontaxes \texfontaxesversion, Keyval,
-\texxkeyvalversion, Etoolbox \texetoolboxversion, Xcolor \texxcolorversion,
-Setspace \texsetspaceversion, Caption \texcaptionversion, Footmisc
-\texfootmiscversion, Datetime \texdatetimeversion, Fmtcount
-\texfmtcountversion, Titlesec \textitlesecversion, Preprint
-\texpreprintversion, Ulem \texulemversion, Bib\LaTeX{} \texbiblatexversion,
-Biber \texbiberversion, Logreq \texlogreqversion, PGF/TiKZ \texpgfversion,
-PGFPlots \texpgfplotsversion, FP \texfpversion, Courier \texcourierversion,
-\TeX-gyre \textexgyreversion, TXFonts \textxfontsversion, Times
-\textimesversion. We are very grateful to all their creators for freely
-providing this necessary infrastructure. This research would not be possible
-without them.
+research (in alphabetical order):
+Bzip2 \bziptwoversion,
+CFITSIO \cfitsioversion,
+CMake \cmakeversion,
+cURL \curlversion,
+Discoteq flock \flockversion,
+FreeType \freetypeversion,
+FFTW \fftwversion,
+Git \gitversion,
+GNU Astronomy Utilities \gnuastroversion,
+GNU AWK \gawkversion,
+GNU Bash \bashversion,
+GNU Compiler Collection (GCC) \gccversion,
+GNU Coreutils \coreutilsversion,
+GNU Diffutils \diffutilsversion,
+GNU Findutils \findutilsversion,
+GNU Grep \grepversion,
+GNU Gzip \gzipversion,
+GNU Integer Set Library \islversion,
+GNU Libtool \libtoolversion,
+GNU Make \makeversion,
+GNU Multiple Precision Arithmetic Library \gmpversion,
+GNU Multiple Precision Complex arithmetc \mpcversion,
+GNU Multiple Precision Floating-Point Reliably \mpfrversion,
+GNU NCURSES \ncursesversion,
+GNU Readline \readlineversion,
+GNU Sed \sedversion,
+GNU Scientific Library (GSL) \gslversion,
+GNU Tar \tarversion,
+GNU Wget \wgetversion,
+GNU Which \whichversion,
+HDF5 library \hdffiveversion,
+Libffi \libffiversion,
+GPL Ghostscript \ghostscriptversion,
+Libbsd \libbsdversion,
+Libgit2 \libgittwoversion,
+Libjpeg \libjpegversion,
+Libpng \libpngversion,
+Libtiff \libtiffversion,
+Lzip \lzipversion,
+Metastore (forked) \metastoreversion,
+OpenBLAS \openblasversion,
+OpenMPI \openmpiversion,
+OpenSSL \opensslversion,
+Patchelf \patchelfversion,
+Pkg-config \pkgconfigversion,
+Unzip \unzipversion,
+WCSLIB \wcslibversion,
+XZ Utils \xzversion,
+Zip \zipversion,
+and
+ZLib \zlibversion.
+We also use Python {\pythonversion} with the following packages:
+Asn1crypto \asncryptoversion,
+Astroquery \astroqueryversion,
+Astropy {\astropyversion} \citep{astropy2013, astropy2018},
+BeautifulSoup \beautifulsoupversion,
+Certifi \certifiversion,
+Cffi \cffiversion,
+Chardet \chardetversion,
+Cryptography \cryptographyversion,
+Cycler \cyclerversion,
+EntryPoints \entrypointsversion,
+h5py \hpyversion,
+HTML5ib \htmlfivelibversion,
+idna \idnaversion,
+Jeepney \jeepneyversion,
+Kiwisolver \kiwisolverversion,
+keyring \keyringversion,
+Matplotlib \matplotlibversion,
+Numpy \numpyversion,
+pycparser \pycparserversion,
+PyParsing \pyparsingversion,
+python-dateutil \pythondateutilversion,
+Requests \requestsversion,
+Scipy \scipyversion,
+SecretStorage \secretstorageversion,
+Setuptools \setuptoolsversion,
+Setuptools-scm \setuptoolsscmversion,
+Six \sixversion,
+SoupSieve \soupsieveversion,
+Urllib3 \urllibthreeversion and
+Webencondings \webencodingsversion.
+The final paper was produced with \TeX{} Live \texliveversion, using the
+following packages:
+\TeX{} \textexversion,
+EC \texecversion,
+NewTX \texnewtxversion,
+Fontaxes \texfontaxesversion,
+Keyval \texxkeyvalversion,
+Etoolbox \texetoolboxversion,
+Xcolor \texxcolorversion,
+Setspace \texsetspaceversion,
+Caption \texcaptionversion,
+Footmisc \texfootmiscversion,
+Datetime \texdatetimeversion,
+Fmtcount \texfmtcountversion,
+Titlesec \textitlesecversion,
+Preprint \texpreprintversion,
+Ulem \texulemversion,
+Bib\LaTeX{} \texbiblatexversion,
+Biber \texbiberversion,
+Logreq \texlogreqversion,
+PGF/TiKZ \texpgfversion,
+PGFPlots \texpgfplotsversion,
+FP \texfpversion,
+Courier \texcourierversion,
+\TeX-gyre \textexgyreversion,
+TXFonts \textxfontsversion,
+Times \textimesversion.
+We are very grateful to all their creators for freely
+providing this necessary infrastructure. This research would not be
+possible without them.
%% Tell BibLaTeX to put the bibliography list here.
\printbibliography
diff --git a/reproduce/config/pipeline/dependency-versions.mk b/reproduce/config/pipeline/dependency-versions.mk
index 2e74a45..2af633f 100644
--- a/reproduce/config/pipeline/dependency-versions.mk
+++ b/reproduce/config/pipeline/dependency-versions.mk
@@ -19,11 +19,14 @@
# A copy of the GNU General Public License is available at
# <http://www.gnu.org/licenses/>.
-# Programs
+# C/C++ programs and libraries.
+atlas-version = 3.10.3
bash-version = 5.0
binutils-version = 2.31.1
+cfitsio-version = 3.45
cmake-version = 3.12.4
coreutils-version = 8.30
+curl-version = 7.63.0
diffutils-version = 3.7
fftw-version = 3.3.8
findutils-version = 4.6.0.199-e3fc
@@ -36,12 +39,15 @@ git-version = 2.20.1
gmp-version = 6.1.2
gnuastro-version = 0.8
grep-version = 3.3
+gsl-version = 2.5
gzip-version = 1.10
hdf5-version = 1.10.5
isl-version = 0.18
libbsd-version = 0.9.1
libffi-version = 3.2.1
+libjpeg-version = v9b
libpng-version = 1.6.36
+libtiff-version = 4.0.10
libtool-version = 2.4.6
lzip-version = 1.20
make-version = 4.2.90
@@ -49,6 +55,7 @@ metastore-version = 1.1.2-23-fa9170b
mpfr-version = 4.0.2
mpc-version = 1.1.0
ncurses-version = 6.1
+openblas-version = 0.3.5
openmpi-version = 4.0.1
openssl-version = 1.1.1a
patchelf-version = 0.9
@@ -62,15 +69,6 @@ wget-version = 1.20.1
which-version = 2.21
xz-version = 5.2.4
zip-version = 3.0
-
-# Libraries
-atlas-version = 3.10.3
-cfitsio-version = 3.45
-curl-version = 7.63.0
-gsl-version = 2.5
-libjpeg-version = v9b
-libtiff-version = 4.0.10
-openblas-version = 0.3.5
zlib-version = 1.2.11
# Special libraries
diff --git a/reproduce/src/make/initialize.mk b/reproduce/src/make/initialize.mk
index 66e7c77..3ae580a 100644
--- a/reproduce/src/make/initialize.mk
+++ b/reproduce/src/make/initialize.mk
@@ -160,8 +160,8 @@ export MPI_PYTHON3_SITEARCH :=
# option: they add too many extra checks that make it hard to find what you
# are looking for in this pipeline.
.SUFFIXES:
-$(texdir) $(lockdir): | $(BDIR); mkdir $@
-$(mtexdir) $(texbdir): | $(texdir); mkdir $@
+$(lockdir): | $(BDIR); mkdir $@
+$(texbdir): | $(texdir); mkdir $@
$(tikzdir): | $(texbdir); mkdir $@ && ln -s $(tikzdir) tex/tikz
@@ -348,96 +348,3 @@ $(mtexdir)/initialize.tex: | $(mtexdir)
# Version of the pipeline and build directory (for LaTeX inputs).
@v=$$(git describe --dirty --always);
echo "\newcommand{\pipelineversion}{$$v}" > $@
-
- # Versions of programs (same order as 'dependency-versions.mk'),
- # ordered alphabetically (by their executable name).
- echo "\newcommand{\\bashversion}{$(bash-version)}" >> $@
-# echo "\newcommand{\\bashversion}{$(binutils-version)}" >> $@
- echo "\newcommand{\\bziptwoversion}{$(bzip2-version)}" >> $@
- echo "\newcommand{\\cmakeversion}{$(cmake-version)}" >> $@
- echo "\newcommand{\\coreutilsversion}{$(coreutils-version)}" >> $@
- echo "\newcommand{\\diffutilsversion}{$(diffutils-version)}" >> $@
- echo "\newcommand{\\findutilsversion}{$(findutils-version)}" >> $@
- echo "\newcommand{\\flockversion}{$(flock-version)}" >> $@
- echo "\newcommand{\\freetypeversion}{$(freetype-version)}" >> $@
- echo "\newcommand{\\gawkversion}{$(gawk-version)}" >> $@
- echo "\newcommand{\\gccversion}{$(gcc-version)}" >> $@
- echo "\newcommand{\\ghostscriptversion}{$(ghostscript-version)}" >> $@
- echo "\newcommand{\\gitversion}{$(git-version)}" >> $@
- echo "\newcommand{\\gmpversion}{$(gmp-version)}" >> $@
- echo "\newcommand{\\gnuastroversion}{$(gnuastro-version)}" >> $@
- echo "\newcommand{\\grepversion}{$(grep-version)}" >> $@
- echo "\newcommand{\\gzipversion}{$(gzip-version)}" >> $@
- echo "\newcommand{\\islversion}{$(isl-version)}" >> $@
- echo "\newcommand{\\lzipversion}{$(lzip-version)}" >> $@
- echo "\newcommand{\\makeversion}{$(make-version)}" >> $@
- echo "\newcommand{\\metastoreversion}{$(metastore-version)}" >> $@
- echo "\newcommand{\\mpfrversion}{$(mpfr-version)}" >> $@
- echo "\newcommand{\\mpcversion}{$(mpc-version)}" >> $@
- echo "\newcommand{\\ncursesversion}{$(ncurses-version)}" >> $@
- echo "\newcommand{\\opensslversion}{$(openssl-version)}" >> $@
- echo "\newcommand{\\patchelfversion}{$(patchelf-version)}" >> $@
- echo "\newcommand{\\pkgconfigversion}{$(pkgconfig-version)}" >> $@
- echo "\newcommand{\\pythonversion}{$(python-version)}" >> $@
- echo "\newcommand{\\readlineversion}{$(readline-version)}" >> $@
- echo "\newcommand{\\sedversion}{$(sed-version)}" >> $@
- echo "\newcommand{\\swarpversion}{$(swarp-version)}" >> $@
- echo "\newcommand{\\tarversion}{$(tar-version)}" >> $@
- echo "\newcommand{\\unzipversion}{$(unzip-version)}" >> $@
- echo "\newcommand{\\wgetversion}{$(wget-version)}" >> $@
- echo "\newcommand{\\whichversion}{$(which-version)}" >> $@
- echo "\newcommand{\\xzversion}{$(xz-version)}" >> $@
- echo "\newcommand{\\zipversion}{$(zip-version)}" >> $@
-
- # Libraries.
- echo "\newcommand{\\atlasversion}{$(cfitsio-version)}" >> $@
- echo "\newcommand{\\cfitsioversion}{$(cfitsio-version)}" >> $@
- echo "\newcommand{\\curlversion}{$(curl-version)}" >> $@
- echo "\newcommand{\\gslversion}{$(gsl-version)}" >> $@
- echo "\newcommand{\\lapack}{$(lapack-version)}" >> $@
- echo "\newcommand{\\libbsdversion}{$(libbsd-version)}" >> $@
- echo "\newcommand{\\libffiversion}{$(libffi-version)}" >> $@
- echo "\newcommand{\\libgittwoversion}{$(libgit2-version)}" >> $@
- echo "\newcommand{\\libjpegversion}{$(libjpeg-version)}" >> $@
- echo "\newcommand{\\libpngversion}{$(libpng-version)}" >> $@
- echo "\newcommand{\\libtiffversion}{$(libtiff-version)}" >> $@
- echo "\newcommand{\\libtoolversion}{$(libtool-version)}" >> $@
- echo "\newcommand{\\wcslibversion}{$(wcslib-version)}" >> $@
- echo "\newcommand{\\zlibversion}{$(zlib-version)}" >> $@
-
- # Python modules.
- echo "\newcommand{\\asncryptoversion}{$(asn1crypto-version)}" >> $@
- echo "\newcommand{\\astroqueryversion}{$(astroquery-version)}" >> $@
- echo "\newcommand{\\astropyversion}{$(astropy-version)}" >> $@
- echo "\newcommand{\\beautifulsoupversion}{$(beautifulsoup4-version)}" >> $@
- echo "\newcommand{\\certifiversion}{$(certifi-version)}" >> $@
- echo "\newcommand{\\cffiversion}{$(cffi-version)}" >> $@
- echo "\newcommand{\\chardetversion}{$(chardet-version)}" >> $@
- echo "\newcommand{\\cryptographyversion}{$(cryptography-version)}" >> $@
- echo "\newcommand{\\cyclerversion}{$(cycler-version)}" >> $@
- echo "\newcommand{\\entrypointsversion}{$(entrypoints-version)}" >> $@
- echo "\newcommand{\\hpyversion}{$(h5py-version)}" >> $@
- echo "\newcommand{\\htmlfivelibversion}{$(html5lib-version)}" >> $@
- echo "\newcommand{\\idaversion}{$(idna-version)}" >> $@
- echo "\newcommand{\\jeepneyversion}{$(jeepney-version)}" >> $@
- echo "\newcommand{\\kiwisolverversion}{$(kiwisolver-version)}" >> $@
- echo "\newcommand{\\keyringversion}{$(keyring-version)}" >> $@
- echo "\newcommand{\\matplotlibversion}{$(matplotlib-version)}" >> $@
- echo "\newcommand{\\numpyversion}{$(numpy-version)}" >> $@
-# echo "\newcommand{\\pipversion}{$(pip-version)}" >> $@
- echo "\newcommand{\\pycparserversion}{$(pycparser-version)}" >> $@
- echo "\newcommand{\\pyparsingversion}{$(pyparsing-version)}" >> $@
- echo "\newcommand{\\pythondateutilversion}{$(python-dateutil-version)}" >> $@
- echo "\newcommand{\\requestsversion}{$(requests-version)}" >> $@
- echo "\newcommand{\\scipyversion}{$(scipy-version)}" >> $@
- echo "\newcommand{\\screenstorageversion}{$(secretstorage-version)}" >> $@
- echo "\newcommand{\\setuptoolsversion}{$(setuptools-version)}" >> $@
- echo "\newcommand{\\setuptoolsscmversion}{$(setuptools_scm-version)}" >> $@
- echo "\newcommand{\\sixversion}{$(six-version)}" >> $@
- echo "\newcommand{\\soupsieveversion}{$(soupsieve-version)}" >> $@
- echo "\newcommand{\\urllibthreeversion}{$(urllib3-version)}" >> $@
-# echo "\newcommand{\\virtualenvversion}{$(virtualenv-version)}" >> $@
- echo "\newcommand{\\webencodingsversion}{$(webencodings-version)}" >> $@
-
- # TeX package versions
- cat $(BDIR)/dependencies/texlive-versions.tex >> $@
diff --git a/reproduce/src/make/paper.mk b/reproduce/src/make/paper.mk
index d148c08..af9a70e 100644
--- a/reproduce/src/make/paper.mk
+++ b/reproduce/src/make/paper.mk
@@ -54,7 +54,8 @@ $(mtexdir)/pipeline.tex: $(foreach s, $(subst paper,,$(makesrc)), $(mtexdir)/$(s
if [ ! -e tex/pipeline ]; then ln -s $(texdir) tex/pipeline; fi
# Put a LaTeX input command for all the necessary macro files.
- rm -f $(mtexdir)/pipeline.tex
+ echo "\input{tex/pipeline/macros/dependency-versions.tex}" \
+ > $(mtexdir)/pipeline.tex
for t in $(subst paper,,$(makesrc)); do
echo "\input{tex/pipeline/macros/$$t.tex}" >> $(mtexdir)/pipeline.tex
done