X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1775441d2553edf1c37f5295fd282c41cbbc81f5..e9f0018b823e34405847177b25a85d3facc30ae1:/src/smpi/smpif90.in

diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index 0be13cee5b..1b61608847 100644
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -1,12 +1,13 @@
 #! /bin/sh
 
-# Copyright (c) 2012-2014. The SimGrid Team.
+# Copyright (c) 2012-2015. The SimGrid Team.
 # All rights reserved.
 
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the license (GNU LGPL) which comes with this package.
 
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
+SIMGRID_GITHASH="@SIMGRID_GITHASH@"
 
 F90=@GFORTRAN_EXE@
 
@@ -26,6 +27,15 @@ cleanup () {
 }
 trap 'cleanup' EXIT
 
+filter_and_compile() {
+    list_add TMPFILES "${TMPFILE}"
+#replace "program main_name by subroutine user\_main (and the end clause as well)"
+    sed 's/[[:space:]]*program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/ subroutine user\_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" > "${TMPFILE}"
+    SRCFILE="${TMPFILE}"
+    list_add CMDLINE "${SRCFILE}"
+}
+
+
 list_set CMDLINE "${F90}"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
@@ -37,18 +47,25 @@ while [ $# -gt 0 ]; do
             LINKARGS=""
             list_add CMDLINE "-c"
             ;;
-        *.f90|*.F90)
+        *.f90)
             TMPFILE=$(mymktemp "${ARG}" ".f90")
-            list_add TMPFILES "${TMPFILE}"
-      #replace "program main_name by subroutine user\_main (and the end clause as well)"
-            sed 's/[[:space:]]*program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/ subroutine user\_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" > "${TMPFILE}"
-            SRCFILE="${TMPFILE}"
-            list_add CMDLINE "${SRCFILE}"
+            filter_and_compile
+            ;;
+        *.F90)
+            TMPFILE=$(mymktemp "${ARG}" ".F90")
+            filter_and_compile
             ;;
-        '-version' | '--version' | '-v')
+        '-version' | '--version')
             printf '%b\n' "$SIMGRID_VERSION"
             exit 0
-            ;;           
+            ;;
+        "-git-version" | "--git-version")
+            printf '%b\n' "$SIMGRID_GITHASH"
+            exit 0
+            ;;
+        '-compiler-version' | '--compiler-version')
+            ${F90} --version
+            ;;
         *)
             list_add CMDLINE "${ARG}"
             ;;