Define simgrid::xbt::Path to manage file names.

[simgrid.git] / src / smpi / smpif90.in

diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index 0be13ce..22869c3 100644 (file)
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -1,22 +1,23 @@
 #! /bin/sh
 
-# Copyright (c) 2012-2014. The SimGrid Team.
+# Copyright (c) 2012-2017. 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@
+F90=@SMPI_Fortran_COMPILER@
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
 
 @SMPITOOLS_SH@
 
-list_set FFLAGS "-ff2c" "-fno-second-underscore"
-list_set LINKARGS "-lsimgrid" "-lm" "-lgfortran"
+list_set FFLAGS @SMPI_Fortran_FLAGS@
+list_set LINKARGS "-shared" "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm"
 list_set TMPFILES
 main_name=main
 
@@ -26,6 +27,14 @@ 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:]]*[pP][rR][oO][gG][rR][aA][mM][[:space:]]*\([a-zA-Z0-9\-\_]*\)/ subroutine user\_main /g;s/[[:space:]]*[uU][sS][eE][[:space:]]*[mM][pP][iI]/\include \"mpif\.h\" /g' "${ARG}" > "${TMPFILE}"
+    SRCFILE="${TMPFILE}"
+    list_add CMDLINE "${SRCFILE}"
+}
+
 list_set CMDLINE "${F90}"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
@@ -37,18 +46,29 @@ 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
             ;;
-        '-version' | '--version' | '-v')
+        *.F90)
+            TMPFILE=$(mymktemp "${ARG}" ".F90")
+            filter_and_compile
+            ;;
+        '-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
+            ;;
+        -o)
+            list_add CMDLINE "-o$1"
+            shift
+            ;;
         *)
             list_add CMDLINE "${ARG}"
             ;;