diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-05-21 23:35:42 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-05-21 23:35:42 +0100 |
| commit | 10587c040309cf4d745782f438b81bc770119f3a (patch) | |
| tree | 03c0f16058bc01a2973d933bc08e2ec612b764e7 | |
| parent | 11d92ef6148db6cf9499409ff862662ede9297d6 (diff) | |
| parent | e80bb66527089db74c04481fe6e3646e8a0910f4 (diff) | |
Imported Matplotlib installation, no conflicts
There weren't any conflicts in this merge.
| -rw-r--r-- | .file-metadata | bin | 6092 -> 6092 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | reproduce/analysis/make/top.mk | 0 | ||||
| -rw-r--r-- | reproduce/software/config/installation/versions.mk | 1 | ||||
| -rw-r--r-- | reproduce/software/make/high-level.mk | 12 | ||||
| -rw-r--r-- | reproduce/software/make/python.mk | 1 |
5 files changed, 14 insertions, 0 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex c026f09..e448006 100644 --- a/.file-metadata +++ b/.file-metadata diff --git a/reproduce/analysis/make/top.mk b/reproduce/analysis/make/top.mk index b753979..b753979 100644..100755 --- a/reproduce/analysis/make/top.mk +++ b/reproduce/analysis/make/top.mk diff --git a/reproduce/software/config/installation/versions.mk b/reproduce/software/config/installation/versions.mk index caeae5a..510e50d 100644 --- a/reproduce/software/config/installation/versions.mk +++ b/reproduce/software/config/installation/versions.mk @@ -81,6 +81,7 @@ ghostscript-version = 9.26 gnuastro-version = 0.9 gsl-version = 2.5 hdf5-version = 1.10.5 +imagemagick-version = 7.0.8-46 libffi-version = 3.2.1 libjpeg-version = v9b libpng-version = 1.6.37 diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 6054a48..b2d9d7e 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -118,6 +118,7 @@ tarballs = $(foreach t, astrometry.net-$(astrometrynet-version).tar.gz \ gnuastro-$(gnuastro-version).tar.lz \ gsl-$(gsl-version).tar.gz \ hdf5-$(hdf5-version).tar.gz \ + imagemagick-$(imagemagick-version).tar.xz \ install-tl-unx.tar.gz \ jpegsrc.$(libjpeg-version).tar.gz \ lapack-$(lapack-version).tar.gz \ @@ -176,6 +177,9 @@ $(tarballs): $(tdir)/%: | $(lockdir) elif [ $$n = ghostscript ]; then w=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs926 elif [ $$n = gnuastro ]; then w=http://ftp.gnu.org/gnu/gnuastro elif [ $$n = gsl ]; then w=http://ftp.gnu.org/gnu/gsl + elif [ $$n = imagemagick ]; then + mergenames=0 + w=https://www.imagemagick.org/download/releases/ImageMagick-$(imagemagick-version).tar.xz elif [ $$n = install ]; then w=http://mirror.ctan.org/systems/texlive/tlnet elif [ $$n = jpegsrc ]; then w=http://ijg.org/files elif [ $$n = lapack ]; then w=http://www.netlib.org/lapack @@ -590,6 +594,14 @@ endif && cp $(dtexdir)/gnuastro.tex $(ictdir)/ \ && echo "GNU Astronomy Utilities $(gnuastro-version) \citep{gnuastro}" > $@ +$(ibidir)/imagemagick: $(tdir)/imagemagick-$(imagemagick-version).tar.xz \ + $(ibidir)/libjpeg \ + $(ibidir)/libtiff \ + $(ibidir)/zlib + $(call gbuild, $<, ImageMagick-$(imagemagick-version), static, \ + --without-x --disable-openmp, V=1) \ + && echo "ImageMagick $(imagemagick-version)" > $@ + # Netpbm is a prerequisite of Astrometry-net, it contains a lot of programs. # This program has a crazy dialogue installation which is override using the # printf statment. Each `\n' is a new question that the installation process diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk index 1a7be56..ef42c87 100644 --- a/reproduce/software/make/python.mk +++ b/reproduce/software/make/python.mk @@ -389,6 +389,7 @@ $(ipydir)/kiwisolver: $(tdir)/kiwisolver-$(kiwisolver-version).tar.gz \ $(ipydir)/matplotlib: $(tdir)/matplotlib-$(matplotlib-version).tar.gz \ $(ipydir)/python-dateutil \ + $(ibidir)/imagemagick \ $(ipydir)/kiwisolver \ $(ipydir)/pyparsing \ $(ibidir)/freetype \ |