From 7d1960b1675f7764ef0b48776f995e191c99b695 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Mon, 27 May 2019 10:32:29 +0100 Subject: Adding SCons into the project MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With this commit, SCons has been included into the project. As in the official webpage of this program says: SCons is an Open Source software construction tool—that is, a next-generation build tool. Think of SCons as an improved, cross-platform substitute for the classic Make utility with integrated functionality similar to autoconf/automake and compiler caches such as ccache. In short, SCons is an easier, more reliable and faster way to build software. The motivation for including this software into the project is because there are some software that use this system for the installation. In particular, the necessity of installing it comes from Imfit. This is an astronomical software that uses this system so that is why it has been included into the project. In principle it is simple, and I have tested it on Mac OS sytem without any problem. --- reproduce/software/config/installation/TARGETS.mk | 2 +- reproduce/software/config/installation/versions.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'reproduce/software/config') diff --git a/reproduce/software/config/installation/TARGETS.mk b/reproduce/software/config/installation/TARGETS.mk index b9157f1..5bccf97 100644 --- a/reproduce/software/config/installation/TARGETS.mk +++ b/reproduce/software/config/installation/TARGETS.mk @@ -36,7 +36,7 @@ # Programs and libraries. -top-level-programs = gnuastro +top-level-programs = gnuastro scons # Python libraries/modules. top-level-python = astropy diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk index 7019ee4..fa3c5e8 100644 --- a/reproduce/software/config/installation/versions.mk +++ b/reproduce/software/config/installation/versions.mk @@ -93,6 +93,7 @@ openmpi-version = 4.0.1 pixman-version = 0.38.0 python-version = 3.7.3 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 -- cgit v1.2.1 From 69313eb17ed6e57c1cebe448cd2947665b89b783 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Mon, 27 May 2019 13:29:29 +0100 Subject: Added Imfit into the project With this commit, `imfit' has been included into the project. As described in the official webpage (http://www.mpe.mpg.de/~erwin/code/imfit/): Imfit is a program for fitting astronomical images -- especially images of galaxies, though it can in principle be used for fitting other sources. This program uses the `scons' program to build itself (not the traditional GNU `configure' and `make' system). I have tested it by using an example that can be found in the `examples' directory of the decompressed tarball. It works fine without any error on my Mac OS system. --- reproduce/software/config/installation/TARGETS.mk | 2 +- reproduce/software/config/installation/versions.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'reproduce/software/config') diff --git a/reproduce/software/config/installation/TARGETS.mk b/reproduce/software/config/installation/TARGETS.mk index 5bccf97..2b61109 100644 --- a/reproduce/software/config/installation/TARGETS.mk +++ b/reproduce/software/config/installation/TARGETS.mk @@ -36,7 +36,7 @@ # Programs and libraries. -top-level-programs = gnuastro scons +top-level-programs = gnuastro imfit # Python libraries/modules. top-level-python = astropy diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk index fa3c5e8..0783a5f 100644 --- a/reproduce/software/config/installation/versions.mk +++ b/reproduce/software/config/installation/versions.mk @@ -82,6 +82,7 @@ gnuastro-version = 0.9 gsl-version = 2.5 hdf5-version = 1.10.5 imagemagick-version = 7.0.8-46 +imfit-version = 1.6.1 libffi-version = 3.2.1 libjpeg-version = v9b libpng-version = 1.6.37 -- cgit v1.2.1 From 6fa2c4f35f56420dea960099fed35f5a1f98bfd3 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Fri, 31 May 2019 17:44:15 +0100 Subject: Fixing rpath problem in CFITSIO installation `cfitsio' was recently updated and it cames up with a problem when trying to build shared libraries (on Mac OS system laptop). This is because the `configure' script for building `cfitsio' include by default `rpath'. With this commit, this issue is fixed by modifying the installation of `cfitsio'. Using `sed', each ocurrence of `@rpath' in `configure' is replaced by `$(ildir)'. Once it has been done, the installation of `cfitsio' goes as normal. In this commit, the version of the `cfitsio' has been also updated to the most recent one. --- reproduce/software/config/installation/versions.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'reproduce/software/config') diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk index 0783a5f..18a4a2e 100644 --- a/reproduce/software/config/installation/versions.mk +++ b/reproduce/software/config/installation/versions.mk @@ -72,7 +72,7 @@ astrometrynet-version = 0.77 atlas-version = 3.10.3 cairo-version = 1.16.0 cdsclient-version = 3.84 -cfitsio-version = 3.45 +cfitsio-version = 3.47 cmake-version = 3.14.2 fftw-version = 3.3.8 flock-version = 0.2.3 -- cgit v1.2.1 From 880379181a36e949a05724229879ea4576a51b29 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Fri, 31 May 2019 18:35:36 +0100 Subject: Modified Imfit installation to not consider default and host paths Until this commit, 'imfit' was installed using proper flags in order to use our own libraries. However, it looks first of all to the default system. As a consecuence, `imfit' program was linked to the host system libraries, even when we told to use our own libraries!! With this commit, the installation of `imfit' has been modified in order to remove the default paths already set in the `SConstruct' script. By doing this, only our paths are take into account for compiling the program. It has been tested on Mac OS laptop and it works fine. Test on GNU/Linux systems remain before merge into the main project branch. --- reproduce/software/config/installation/TARGETS.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'reproduce/software/config') diff --git a/reproduce/software/config/installation/TARGETS.mk b/reproduce/software/config/installation/TARGETS.mk index 2b61109..b9157f1 100644 --- a/reproduce/software/config/installation/TARGETS.mk +++ b/reproduce/software/config/installation/TARGETS.mk @@ -36,7 +36,7 @@ # Programs and libraries. -top-level-programs = gnuastro imfit +top-level-programs = gnuastro # Python libraries/modules. top-level-python = astropy -- cgit v1.2.1