From 3c4f1863d012ee4fefe64644c91b4a759a208e0f Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Fri, 3 Apr 2020 11:56:23 +0100 Subject: CMake updated to version 3.17.0 With this commit, CMake has been updated to its most recent version. This upgrade has been done because in the installation of XLSX I/O on macOS laptop, it crashes complaining about C compiler "not able to compile a simple test program". After a fast search, I found it could be possible to just use the most recent version of CMake to solve the problem. But it didn't work. In any case, it is good to have the most recent version of CMake included. --- reproduce/software/config/installation/versions.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'reproduce/software/config/installation/versions.conf') diff --git a/reproduce/software/config/installation/versions.conf b/reproduce/software/config/installation/versions.conf index 1b678ad..592d931 100644 --- a/reproduce/software/config/installation/versions.conf +++ b/reproduce/software/config/installation/versions.conf @@ -84,7 +84,7 @@ boost-version = 1.71.0 cairo-version = 1.16.0 cdsclient-version = 3.84 cfitsio-version = 3.47 -cmake-version = 3.15.3 +cmake-version = 3.17.0 eigen-version = 3.3.7 expat-version = 2.2.9 fftw-version = 3.3.8 -- cgit v1.2.1 From c2b36cc6b6c62b5f19745703c65df7cfa8b84cc4 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Sun, 5 Apr 2020 17:03:16 +0100 Subject: Building Minizip 1.x instead of Minizip 2.x Minizip is a dependency of XLSX I/O and until now, I was just using the most recent version I found (2.9.2), but XLSX I/O is written for the Minizip 1.x series, not 2.x. Somehow it didn't cause a crash on my computer!!! I think XLSX I/O's CMake is instructed to look into system directories by default when it doesn't find the directories in the given places. And because I had installed Minizip on my operating system, it did't complain. Upon trying the build on their systems, Yahya, Raul and Zahra reported a failure in the build of XLSX I/O which was due the to the problem above (we were installing the wrong version of Minizip!). With this commit, this has been fixed by installing the 1.x series of Minizip (whish is actually installed within zlib!). This commit was original done by Mohammad Akhlaghi. --- reproduce/software/config/installation/versions.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'reproduce/software/config/installation/versions.conf') diff --git a/reproduce/software/config/installation/versions.conf b/reproduce/software/config/installation/versions.conf index 592d931..39642d4 100644 --- a/reproduce/software/config/installation/versions.conf +++ b/reproduce/software/config/installation/versions.conf @@ -107,7 +107,6 @@ libpng-version = 1.6.37 libtiff-version = 4.0.10 libtirpc-version = 1.1.4 libxml2-version = 2.9.9 -minizip-version = 2.9.2 missfits-version = 2.8.0 openblas-version = 0.3.5 openmpi-version = 4.0.1 @@ -216,3 +215,7 @@ lapack-version = 3.8.0 libgit2-version = 0.28.2 netpbm-version = 10.86.99 wcslib-version = 6.4 + +# Minizip is installed as a part of `zlib', and they have the same version. +zlib-version = 1.2.11 +minizip-version = $(zlib-version) -- cgit v1.2.1 From 8eb0892e179b4970a9835d29b5f57dd912ca4464 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Fri, 17 Apr 2020 01:06:20 +0100 Subject: 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. --- .../software/config/installation/versions.conf | 221 --------------------- 1 file changed, 221 deletions(-) delete mode 100644 reproduce/software/config/installation/versions.conf (limited to 'reproduce/software/config/installation/versions.conf') diff --git a/reproduce/software/config/installation/versions.conf b/reproduce/software/config/installation/versions.conf deleted file mode 100644 index 39642d4..0000000 --- a/reproduce/software/config/installation/versions.conf +++ /dev/null @@ -1,221 +0,0 @@ -# Versions of the various dependencies -# -# Copyright (C) 2018-2020 Mohammad Akhlaghi -# Copyright (C) 2019-2020 Raul Infante-Sainz -# -# This Makefile is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This Makefile is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# A copy of the GNU General Public License is available at -# . - - - - - -# Basic/low-level programs and libraires (installed in any case) -# -------------------------------------------------------------- -bash-version = 5.0.11 -binutils-version = 2.32 -coreutils-version = 8.31 -curl-version = 7.65.3 -diffutils-version = 3.7 -file-version = 5.36 -findutils-version = 4.7.0 -gawk-version = 5.0.1 -gcc-version = 9.2.0 -git-version = 2.23.0 -gmp-version = 6.1.2 -grep-version = 3.3 -gzip-version = 1.10 -isl-version = 0.18 -libbsd-version = 0.9.1 -libiconv-version = 1.16 -libtool-version = 2.4.6 -lzip-version= 1.20 -m4-version = 1.4.18 -make-version = 4.3 -metastore-version = 1.1.2-23-fa9170b -mpc-version = 1.1.0 -mpfr-version = 4.0.2 -ncurses-version = 6.1 -openssl-version = 1.1.1a -patchelf-version = 0.10 -perl-version = 5.30.0 -pkgconfig-version = 0.29.2 -readline-version = 8.0 -sed-version = 4.7 -tar-version = 1.32 -texinfo-version = 6.6 -unzip-version = 6.0 -wget-version = 1.20.3 -which-version = 2.21 -xz-version = 5.2.4 -zip-version = 3.0 -zlib-version = 1.2.11 - - - - - -# Optional/high-level programs and libraries -# ------------------------------------------ -# -# These are programs and libraries that are optional, The ones in -# `reproduce/software/config/installation/TARGETS.conf' will be built as -# part of a project. To specify a software there, just remove the -# `-version' suffix from the list below. -apachelog4cxx-version = 0.10.0-603-014954db -apr-version = 1.7.0 -apr-util-version = 1.6.1 -astrometrynet-version = 0.77 -atlas-version = 3.10.3 -autoconf-version = 2.69.200-babc -automake-version = 1.16.1 -bison-version = 3.4.2 -boost-version = 1.71.0 -cairo-version = 1.16.0 -cdsclient-version = 3.84 -cfitsio-version = 3.47 -cmake-version = 3.17.0 -eigen-version = 3.3.7 -expat-version = 2.2.9 -fftw-version = 3.3.8 -flex-version = 2.6.4 -flock-version = 0.2.3 -freetype-version = 2.9 -gdb-version = 8.3 -ghostscript-version = 9.50 -gnuastro-version = 0.11 -gsl-version = 2.6 -hdf5-version = 1.10.5 -healpix-version = 3.50 -help2man-version = 1.47.11 -imagemagick-version = 7.0.8-67 -imfit-version = 1.6.1 -libffi-version = 3.2.1 -libjpeg-version = v9b -libnsl-version = 1.2.0-4a062cf -libpng-version = 1.6.37 -libtiff-version = 4.0.10 -libtirpc-version = 1.1.4 -libxml2-version = 2.9.9 -missfits-version = 2.8.0 -openblas-version = 0.3.5 -openmpi-version = 4.0.1 -openssh-version = 8.0p1 -pixman-version = 0.38.0 -python-version = 3.7.4 -R-version = 3.6.2 -rpcsvc-proto-version = 1.4 -scamp-version = 2.6.7 -scons-version = 3.0.5 -sextractor-version = 2.25.0 -swarp-version = 2.38.0 -swig-version = 3.0.12 -tides-version = 2.0 -xlsxio-version = 0.2.21 -yaml-version = 0.2.2 - - - - - -# Python packages -# --------------- -# -# Similar to optional programs and libraries above. -# -# IMPORTANT: If you intend to change the version of any of the Python -# modules/libraries below, please fix the hash strings of the respective -# URL in `reproduce/software/make/python.mk'. -asn1crypto-version = 0.24.0 -asteval-version = 0.9.16 -astropy-version = 4.0 -astroquery-version = 0.4 -beautifulsoup4-version = 4.7.1 -certifi-version = 2018.11.29 -cffi-version = 1.12.2 -chardet-version = 3.0.4 -corner-version = 2.0.1 -cryptography-version = 2.6.1 -cycler-version = 0.10.0 -cython-version = 0.29.6 -eigency-version = 1.77 -emcee-version = 3.0.1 -entrypoints-version = 0.3 -esutil-version = 0.6.4 -flake8-version = 3.7.8 -future-version = 0.18.1 -galsim-version = 2.2.1 -h5py-version = 2.9.0 -healpy-version = installed-with-healpix -html5lib-version = 1.0.1 -idna-version = 2.8 -jeepney-version = 0.4 -keyring-version = 18.0.0 -kiwisolver-version = 1.0.1 -lmfit-version = 0.9.14 -lsstdesccoord-version = 1.2.0 -matplotlib-version = 3.1.1 -mpi4py-version = 3.0.2 -mpmath-version = 1.1.0 -numpy-version = 1.17.2 -pexpect-version = 4.7.0 -pip-version = 19.0.2 -pycodestyle-version = 2.5.0 -pycparser-version = 2.19 -pyflakes-version = 2.1.1 -pybind11-version = 2.4.3 -pyparsing-version = 2.3.1 -pypkgconfig-version = 1.5.1 -python-dateutil-version = 2.8.0 -pyyaml-version = 5.1 -requests-version = 2.21.0 -scipy-version = 1.3.1 -secretstorage-version = 3.1.1 -setuptools-version = 41.6.0 -setuptools_scm-version = 3.3.3 -sip_tpv-version = 1.1 -six-version = 1.12.0 -soupsieve-version = 1.8 -sympy-version = 1.4 -uncertainties-version = 3.1.2 -urllib3-version = 1.24.1 -virtualenv-version = 16.4.0 -webencodings-version = 0.5.1 - - - - - -# Special programs and libraries -# ------------------------------ -# -# When updating the version of these libraries, please look into the build -# rule first: In one way or another, the version string becomes necessary -# during their build and must be accounted for. -# -# Special notes: -# - `netpbm' questions in the configure steps maybe change with different -# or new versions. - -# Basic/low-level -bzip2-version = 1.0.6 - -# Optional/high-level -lapack-version = 3.8.0 -libgit2-version = 0.28.2 -netpbm-version = 10.86.99 -wcslib-version = 6.4 - -# Minizip is installed as a part of `zlib', and they have the same version. -zlib-version = 1.2.11 -minizip-version = $(zlib-version) -- cgit v1.2.1