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. --- .file-metadata | Bin 7813 -> 7874 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to '.file-metadata') diff --git a/.file-metadata b/.file-metadata index 0daa3df..9a732fa 100644 Binary files a/.file-metadata and b/.file-metadata differ -- 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. --- .file-metadata | Bin 7874 -> 7946 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to '.file-metadata') diff --git a/.file-metadata b/.file-metadata index 9a732fa..aa6d61e 100644 Binary files a/.file-metadata and b/.file-metadata differ -- cgit v1.2.1 From 7201b0f0daf484ee326dcd13f3c1348b3f96f626 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Sun, 5 Apr 2020 17:38:07 +0100 Subject: Including version number of Minizip in its installation target Until this commit, only the word `Minizip' was written into the Minizip installation target (without the version number of Minizip). With this commit, this minor bug has been fixed by using the appropiate Make variable: `$(minizip-version)'. --- .file-metadata | Bin 7946 -> 7946 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to '.file-metadata') diff --git a/.file-metadata b/.file-metadata index aa6d61e..e0dba35 100644 Binary files a/.file-metadata and b/.file-metadata differ -- cgit v1.2.1 From a4e2ec81d57eae3ec88c6f5af2f801f3b94bea24 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Sun, 5 Apr 2020 17:54:39 +0100 Subject: The build of M4 and XLSX I/O on macOS has been fixed Until now, the M4 that was built on macOS had internal problems (as discussed in #1): it would simply print `Abort trap: 6' in the output and abort. After looking at the build of Homebrew, I noticed that they apply a patch (correct one line) to fix this problem. To be able to apply that patch on macOS systems, I had fully open up the build recipe of M4 and atleast on the testing system, it was built successfully. Also, after successfully building M4, and thus Autoconf and thus Minizip, we were able to build XLSX I/O on a macOS and found out that the internal library's full address wasn't being put in the libraries and executables. With this commit, we now use macOS's `install_name_tool' to correct the positions of the two `libxlsxio_*' libraries in all its executables. This commit was originally written by Mohammad Akhlaghi --- .file-metadata | Bin 7946 -> 7946 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to '.file-metadata') diff --git a/.file-metadata b/.file-metadata index e0dba35..5b28e1d 100644 Binary files a/.file-metadata and b/.file-metadata differ -- cgit v1.2.1 From 647ce436871b5b692fa07ff166b731f72dff8bf8 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Sun, 5 Apr 2020 17:59:57 +0100 Subject: Commenting version numbers with an underscore for LaTeX Until now we would simply return the version numbers as they were written into the separate files and situations can happen where the version numbers contain an underscore (`_'). However, this character is a methematical character in LaTeX, causing LaTeX to complain and abort. With this commit, a step has been added at the end of the configure script to convert any possible `_' to `\_'. Once it is commented (a backslash is put behind it), the underscore will be printed as it is in the final PDF. This commit was originally written by Mohammad Akhlaghi --- .file-metadata | Bin 7946 -> 7946 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to '.file-metadata') diff --git a/.file-metadata b/.file-metadata index 5b28e1d..0559dea 100644 Binary files a/.file-metadata and b/.file-metadata differ -- cgit v1.2.1 From d0a51f78d4705c2496c42a02c49b0bc70e931cf7 Mon Sep 17 00:00:00 2001 From: Raul Infante-Sainz Date: Mon, 6 Apr 2020 09:12:47 +0100 Subject: Astropy now depending on the Expat library to fix internal conflict Until now, Astropy was instructed to build its own internal copy of the Expat library. However, with the recent commits before, Maneage now includes an installation of Expat and Astropy can't keep the two (its internal version and the project's version) separate, so they conflict and don't let Astropy get built. With this commit, the problem is fixed by setting the Expat library as an explicit dependency of Astropy and asking Astropy to ignore its internal copy. While doing this, I recognized that it is much easier and elegant to add steps in various stages of the `pybuild' function through hooks instead of variables. So the fifth argument of the `pybuild' function was removed and now it actually checks if hooks are defined as functions and if so, they will be called. The `pyhook_after' function was also implemented in the installation of `pybind11' (which needed it, given that the 5th argument of `pybuild' was removed) and after doing a test-build, I noticed that two lines were not ending with a `\' in `boost' (a dependency of `pybind11'). Commit written originally by Mohammad Akghlaghi --- .file-metadata | Bin 7946 -> 7874 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to '.file-metadata') diff --git a/.file-metadata b/.file-metadata index 0559dea..1cea790 100644 Binary files a/.file-metadata and b/.file-metadata differ -- cgit v1.2.1