Add an option to get the compiler version, change the manpages accordingly

diff --git a/doc/manpage/smpicc.1 b/doc/manpage/smpicc.1
index b7debd8..5ba493d 100644 (file)
--- a/doc/manpage/smpicc.1
+++ b/doc/manpage/smpicc.1
@@ -4,9 +4,9 @@ smpicc \- SMPI C wrapper compiler
 .SH SYNOPSIS
 smpicc …
 .SH DESCRIPTION
 .SH SYNOPSIS
 smpicc …
 .SH DESCRIPTION

-smpicc is just a wrapper around the C compiler used to build simgrid, adding the right flags in order to use the simgrid library and SMPI, the MPI implementation within it. Any arguments filled to smpicc will be passed to the underlying compiler directly, of which the \fB\-\-version\fR argument should give the name and the version. Please refer to its documentation in case of trouble.
+smpicc is a wrapper around the C compiler defined when building SimGrid, adding the right flags in order to use the SimGrid library and SMPI, the MPI implementation within it. Most of the arguments filled to smpicc will be passed to the underlying compiler directly, except for \fB\-\-version\fR which gives the SimGrid library version, and \fB\-\-compiler-version\fR which gives the C compiler version. Please refer to the latter documentation in case of trouble.

 .SH ENVIRONMENT VARIABLES
 .SH ENVIRONMENT VARIABLES

-All environment variables taken into account by the underlying compiler will be used, but note that the compiler can not be modified.
+All environment variables taken into account by the underlying compiler will be used by it, but note that the compiler can not be modified.

 .SH AUTHORS
 The SimGrid team (simgrid-devel@lists.gforge.inria.fr)
 .SH COPYRIGHT AND LICENCE
 .SH AUTHORS
 The SimGrid team (simgrid-devel@lists.gforge.inria.fr)
 .SH COPYRIGHT AND LICENCE

diff --git a/doc/manpage/smpicxx.1 b/doc/manpage/smpicxx.1
index b8414cc..68d2cf3 100644 (file)
--- a/doc/manpage/smpicxx.1
+++ b/doc/manpage/smpicxx.1
@@ -4,9 +4,9 @@ smpicxx \- SMPI C++ wrapper compiler
 .SH SYNOPSIS
 smpicxx …
 .SH DESCRIPTION
 .SH SYNOPSIS
 smpicxx …
 .SH DESCRIPTION

-smpicxx is just a wrapper around the C++ compiler used to build simgrid, adding the right flags in order to use the simgrid library and SMPI, the MPI implementation within it. Any arguments filled to smpicxx will be passed to the underlying compiler directly, of which the \fB\-\-version\fR argument should give the name and the version. Please refer to its documentation in case of trouble.
+smpicxx is a wrapper around the C++ compiler defined when building SimGrid, adding the right flags in order to use the SimGrid library and SMPI, the MPI implementation within it. Most of the arguments filled to smpicxx will be passed to the underlying compiler directly, except for \fB\-\-version\fR which gives the SimGrid library version, and \fB\-\-compiler-version\fR which gives the C++ compiler version. Please refer to the latter documentation in case of trouble.

 .SH ENVIRONMENT VARIABLES
 .SH ENVIRONMENT VARIABLES

-All environment variables taken into account by the underlying compiler will be used, but note that the compiler can not be modified.
+All environment variables taken into account by the underlying compiler will be used by it, but note that the compiler can not be modified.

 .SH AUTHORS
 The SimGrid team (simgrid-devel@lists.gforge.inria.fr)
 .SH COPYRIGHT AND LICENCE
 .SH AUTHORS
 The SimGrid team (simgrid-devel@lists.gforge.inria.fr)
 .SH COPYRIGHT AND LICENCE

diff --git a/doc/manpage/smpif90.1 b/doc/manpage/smpif90.1
index 271073c..8bfda66 100644 (file)
--- a/doc/manpage/smpif90.1
+++ b/doc/manpage/smpif90.1
@@ -1,12 +1,12 @@
 .TH smpif90 1
 .SH NAME
 .TH smpif90 1
 .SH NAME

-smpif90 \- SMPI fortran 90 wrapper compiler
+smpif90 \- SMPI Fortran 90 wrapper compiler

 .SH SYNOPSIS
 smpif90 …
 .SH DESCRIPTION
 .SH SYNOPSIS
 smpif90 …
 .SH DESCRIPTION

-smpif90 is just a wrapper around the Fortran 90 compiler used when building simgrid, adding the right flags in order to use the simgrid library and SMPI, the MPI implementation within it. Any arguments filled to smpiff will be passed to the underlying compiler directly, of which the \fB\-\-version\fR argument should give the name and the version. Please refer to its documentation in case of trouble.
+smpif90 is a wrapper around the Fortran 90 compiler defined when building SimGrid, adding the right flags in order to use the SimGrid library and SMPI, the MPI implementation within it.  Most of the arguments filled to smpif90 will be passed to the underlying compiler directly, except for \fB\-\-version\fR which gives the SimGrid library version, and \fB\-\-compiler-version\fR which gives the F90 compiler version. Please refer to the latter documentation in case of trouble.

 .SH ENVIRONMENT VARIABLES
 .SH ENVIRONMENT VARIABLES

-All environment variables taken into account by the underlying compiler will be used, but note that the compiler can not be modified.
+All environment variables taken into account by the underlying compiler will be used by it, but note that the compiler can not be modified.

 .SH AUTHORS
 The SimGrid team (simgrid-devel@lists.gforge.inria.fr)
 .SH COPYRIGHT AND LICENCE
 .SH AUTHORS
 The SimGrid team (simgrid-devel@lists.gforge.inria.fr)
 .SH COPYRIGHT AND LICENCE

diff --git a/doc/manpage/smpiff.1 b/doc/manpage/smpiff.1
index 90f35ea..9f6a3a8 100644 (file)
--- a/doc/manpage/smpiff.1
+++ b/doc/manpage/smpiff.1
@@ -1,10 +1,10 @@
 .TH smpiff 1
 .SH NAME
 .TH smpiff 1
 .SH NAME

-smpiff \- SMPI fortran 77 wrapper compiler
+smpiff \- SMPI Fortran 77 wrapper compiler

 .SH SYNOPSIS
 smpiff …
 .SH DESCRIPTION
 .SH SYNOPSIS
 smpiff …
 .SH DESCRIPTION

-smpiff is just a wrapper around the Fortran 77 compiler used when building simgrid, adding the right flags in order to use the simgrid library and SMPI, the MPI implementation within it. Any arguments filled to smpiff will be passed to the underlying compiler directly, of which the \fB\-\-version\fR argument should give the name and the version. Please refer to its documentation in case of trouble.
+smpiff is a wrapper around the Fortran 77 compiler defined when building SimGrid, adding the right flags in order to use the SimGrid library and SMPI, the MPI implementation within it.  Most of the arguments filled to smpiff will be passed to the underlying compiler directly, except for \fB\-\-version\fR which gives the SimGrid library version, and \fB\-\-compiler-version\fR which gives the F77 compiler version. Please refer to the latter documentation in case of trouble.

 .SH ENVIRONMENT VARIABLES
 All environment variables taken into account by the underlying compiler will be used, but note that the compiler can not be modified.
 .SH AUTHORS
 .SH ENVIRONMENT VARIABLES
 All environment variables taken into account by the underlying compiler will be used, but note that the compiler can not be modified.
 .SH AUTHORS

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index 0d50597..6902a25 100755 (executable)
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -42,10 +42,13 @@ while [ $# -gt 0 ]; do
             fi
             list_add CMDARGS "${SRCFILE}"
             ;;
             fi
             list_add CMDARGS "${SRCFILE}"
             ;;

-        '-version' | '--version' | '-v')
+        '-version' | '--version')

             printf '%b\n' "$SIMGRID_VERSION"
             exit 0
             printf '%b\n' "$SIMGRID_VERSION"
             exit 0

-            ;;           
+            ;;
+        '-compiler-version' | '--compiler-version')
+            ${CC} --version
+            ;;

         *)
             list_add CMDARGS "${ARG}"
             ;;
         *)
             list_add CMDARGS "${ARG}"
             ;;

diff --git a/src/smpi/smpicxx.in b/src/smpi/smpicxx.in
index 5bd4b1a..b23a274 100755 (executable)
--- a/src/smpi/smpicxx.in
+++ b/src/smpi/smpicxx.in
@@ -42,10 +42,13 @@ while [ $# -gt 0 ]; do
             fi
             list_add CMDARGS "${SRCFILE}"
             ;;
             fi
             list_add CMDARGS "${SRCFILE}"
             ;;

-        "-version" | "--version" | "-v")
+        '-version' | '--version')

             printf '%b\n' "$SIMGRID_VERSION"
             exit 0
             ;;
             printf '%b\n' "$SIMGRID_VERSION"
             exit 0
             ;;

+        '-compiler-version' | '--compiler-version')
+            ${CXX} --version
+            ;;

         *)
             list_add CMDARGS "${ARG}"
       ;;
         *)
             list_add CMDARGS "${ARG}"
       ;;

diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index 0be13ce..1a33ba1 100644 (file)
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -45,10 +45,13 @@ while [ $# -gt 0 ]; do
             SRCFILE="${TMPFILE}"
             list_add CMDLINE "${SRCFILE}"
             ;;
             SRCFILE="${TMPFILE}"
             list_add CMDLINE "${SRCFILE}"
             ;;

-        '-version' | '--version' | '-v')
+        '-version' | '--version')

             printf '%b\n' "$SIMGRID_VERSION"
             exit 0
             printf '%b\n' "$SIMGRID_VERSION"
             exit 0

-            ;;           
+            ;;
+        '-compiler-version' | '--compiler-version')
+            ${F90} --version
+            ;;

         *)
             list_add CMDLINE "${ARG}"
             ;;
         *)
             list_add CMDLINE "${ARG}"
             ;;

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 8bb046e..1c6308d 100644 (file)
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -49,10 +49,13 @@ while [ $# -gt 0 ]; do
             SRCFILE="${TMPFILE}"
             list_add CMDLINE "${SRCFILE}"
             ;;
             SRCFILE="${TMPFILE}"
             list_add CMDLINE "${SRCFILE}"
             ;;

-        '-version' | '--version' | '-v')
+        '-version' | '--version')

             printf '%b\n' "$SIMGRID_VERSION"
             exit 0
             ;;
             printf '%b\n' "$SIMGRID_VERSION"
             exit 0
             ;;

+        '-compiler-version' | '--compiler-version')
+            ${F77} --version
+            ;;

         -o)
             NEEDS_OUTPUT=0
             list_add CMDLINE "-o"   
         -o)
             NEEDS_OUTPUT=0
             list_add CMDLINE "-o"