From 0c882a44e43a95761ffecdeebb57f2709e6f96e5 Mon Sep 17 00:00:00 2001
From: Raul Infante-Sainz <infantesainz@gmail.com>
Date: Mon, 14 Sep 2020 15:49:24 +0100
Subject: Checking Xcode installation for macOS systems

Until now, during the configure step it was checked if the host Operative
System were GNU/Linux, and if not, we assumed it is macOS.  However, it can
be any other different OS! With this commit, now we explicity check if the
system is GNU/Linux or Darwin (macOS). If it is not any of them, a warning
message says to the user that the host system is different from which we
have checked so far (and invite to contact us if there is any problem).

In addition to this, if the system is macOS, now it checks if Xcode is
already installed in the host system. If it is not installed, a warning
message informs the user to do that in case a problem/crash in the
configure step occurs. We have found that it is convenient to have Xcode
installed in order to avoid some problems.
---
 reproduce/software/shell/configure.sh | 61 ++++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

(limited to 'reproduce/software/shell')

diff --git a/reproduce/software/shell/configure.sh b/reproduce/software/shell/configure.sh
index bc43540..8a30f1a 100755
--- a/reproduce/software/shell/configure.sh
+++ b/reproduce/software/shell/configure.sh
@@ -212,13 +212,31 @@ if [ x$kernelname = xLinux ]; then
     # Don't forget to add the respective C++ compiler below (leave 'cc' in
     # the end).
     c_compiler_list="gcc clang cc"
-else
+elif [ x$kernelname = xDarwin ]; then
     host_cc=1
     on_mac_os=yes
 
     # Don't forget to add the respective C++ compiler below (leave 'cc' in
     # the end).
     c_compiler_list="clang gcc cc"
+else
+    on_mac_os=no
+    cat <<EOF
+______________________________________________________
+!!!!!!!                 WARNING                !!!!!!!
+
+Maneage has been tested on GNU/Linux and Darwin (macOS) systems. But, it
+seems that the current system is not GNU/Linux or Darwin (macOS). If you
+notice any problem during the configure phase, please contact us with this
+web-form:
+
+    https://savannah.nongnu.org/support/?func=additem&group=reproduce
+
+The configuration will continue in 10 seconds...
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+EOF
+    sleep 10
 fi
 
 
@@ -281,6 +299,47 @@ fi
 
 
 
+# Check for Xcode in macOS systems
+# --------------------------------
+#
+# When trying to build Maneage on macOS systems, there are some problems
+# related with the Xcode and Command Line Tools. As a consequnce, in order to
+# avoid these error it is highly recommended to install Xcode in the host
+# system.  Here, it is checked that this is the case, and if not, warn the user
+# about not having Xcode already installed.
+if [ x$on_mac_os = xyes ]; then
+  xcode=$(which xcodebuild)
+  if [ x$xcode != x ]; then
+    xcode_version=$(xcodebuild -version | grep Xcode)
+    echo "                                              "
+    echo "$xcode_version already installed in the system"
+    echo "                                              "
+  else
+    cat <<EOF
+______________________________________________________
+!!!!!!!                 WARNING                !!!!!!!
+
+Maneage has been tested Darwin (macOS) systems with host Xcode
+installation.  However, Xcode cannot be found in this system. As a
+consequence, the configure step may fail at some point. If this is the
+case, please install Xcode and try to run again the configure step. If the
+problem still persist after installing Xcode, please contact us with this
+web-form:
+
+    https://savannah.nongnu.org/support/?func=additem&group=reproduce
+
+The configuration will continue in 5 seconds ...
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+EOF
+    sleep 5
+  fi
+fi
+
+
+
+
+
 # Check for C/C++ compilers
 # -------------------------
 #
-- 
cgit v1.2.1


From ee8c6be24166c16df9cd7fb1912503e25bdfde85 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Thu, 24 Sep 2020 02:15:40 +0100
Subject: Gnuastro's analysis configuration files removed

Until now, the core Maneage branch included some configuration files for
Gnuastro's programs. This was actually a remnant of the distant past when
Maneage didn't actually build its own software and we had to rely on the
host's software versions. This file contained the configuration files
specific to Gnuastro for this project and also had a feature to avoid
checking the host's own configuration files.

However, we now build all our software ourselves with fixed configuration
files (for the version that is being installed and its version is
stored). So those extra configuration files were just extra and caused
confusion and problems in some scenarios. With this commit, those extra
files are now removed.

Also, two small issues are also addressed in parallel with this commit:

 - When running './project make clean', the 'hardware-parameters.tex' macro
   file (which is created by './project configure' is not deleted.

 - The project title is now written into the default output's PDF's
   properties (through 'hypersetup' in 'tex/src/preamble-header.tex')
   through the LaTeX macro.

All these issues were found and fixed with the help of Samane Raji.
---
 reproduce/software/shell/configure.sh | 1 -
 1 file changed, 1 deletion(-)

(limited to 'reproduce/software/shell')

diff --git a/reproduce/software/shell/configure.sh b/reproduce/software/shell/configure.sh
index 8a30f1a..646f101 100755
--- a/reproduce/software/shell/configure.sh
+++ b/reproduce/software/shell/configure.sh
@@ -1257,7 +1257,6 @@ ln -s "$tikzdir" tex/tikz
 
 # --------- Delete for no Gnuastro ---------
 rm -f .gnuastro
-ln -s "$topdir"/reproduce/analysis/config/gnuastro .gnuastro
 # ------------------------------------------
 
 
-- 
cgit v1.2.1