X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40ff80e56a57386d702617d101c049335f540eac..2d37e348a09783cda723c7019640ee69de168324:/src/smpi/smpiff.in

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 0ab2d2877a..ea270a4c31 100644
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -1,7 +1,6 @@
 #!/usr/bin/env sh
 
-# Copyright (c) 2012-2017. The SimGrid Team.
-# All rights reserved.
+# Copyright (c) 2012-2019. 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.
@@ -9,7 +8,7 @@
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 SIMGRID_GITHASH="@SIMGRID_GITHASH@"
 
-F77=@SMPI_Fortran_COMPILER@
+REAL_FORTRAN_COMPILER=@SMPI_Fortran_COMPILER@
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
@@ -17,7 +16,12 @@ CMAKE_LINKARGS="-L@libdir@"
 @SMPITOOLS_SH@
 
 list_set FFLAGS @SMPI_Fortran_FLAGS@
-list_set LINKARGS "-shared" "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm"
+list_set LINKARGS "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm"
+if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
+   list_add LINKARGS "-shared"
+else
+   echo "Warning: smpiff pretends to be a regular compiler (SMPI_PRETEND_CC is set). Produced binaries will not be usable in SimGrid."
+fi
 list_set TMPFILES
 main_name=main
 
@@ -27,21 +31,32 @@ cleanup () {
 }
 trap 'cleanup' EXIT
 
-filter_and_compile() {
+filter_and_compile_f77() {
+    list_add TMPFILES "${TMPFILE}"
+    #replace "program main_name by subroutine user_main (and the end clause as well)"
+    if [ $TRACE_CALL_LOCATION -gt 0 ]; then
+      echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
+      echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
+    fi
+    sed 's/^[[:space:]]\{6\}[[:space:]]*\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][^a-zA-Z0-9]*\([a-zA-Z0-9_]*\)/      \1subroutine user_main /g' "${ARG}" >> "${TMPFILE}"
+    SRCFILE="${TMPFILE}"
+    list_add CMDLINE "${SRCFILE}"
+}
+filter_and_compile_f90() {
     list_add TMPFILES "${TMPFILE}"
-    #replace "program main_name by subroutine user\_main (and the end clause as well)"
+    #replace "program main_name by subroutine user_main (and the end clause as well)"
     if [ $TRACE_CALL_LOCATION -gt 0 ]; then
       echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
-    echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
+      echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
     fi
-    sed 's/[[:space:]]\{6\}[[:space:]]*\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /g;s/[[:space:]]*[uU][sS][eE][[:space:]]*[mM][pP][iI]/\include \"mpif\.h\" /g' "${ARG}" >> "${TMPFILE}"
+    sed 's/^\([[:space:]]*\)\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][^a-zA-Z0-9]*\([a-zA-Z0-9_]*\)/\1\2subroutine user_main /g' "${ARG}" >> "${TMPFILE}"
     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }
 TRACE_CALL_LOCATION=0
 NEEDS_OUTPUT=1
 
-list_set CMDLINE "${F77}"
+list_set CMDLINE "${REAL_FORTRAN_COMPILER}"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
     ARG="$1"
@@ -56,13 +71,25 @@ while [ $# -gt 0 ]; do
             FILENAME=`basename ${ARG}`
             TMPFILE=$(mymktemp "${ARG}" ".f")
             ORIGFILE="${FILENAME%.f}"
-            filter_and_compile
+            filter_and_compile_f77
             ;;
         *.F)$
             FILENAME=`basename ${ARG}`
             TMPFILE=$(mymktemp "${ARG}" ".F")
             ORIGFILE="${FILENAME%.F}"
-            filter_and_compile
+            filter_and_compile_f77
+            ;;
+        *.f90)
+            FILENAME=`basename ${ARG}`
+            TMPFILE=$(mymktemp "${ARG}" ".f90")
+            ORIGFILE="${FILENAME%.f90}"
+            filter_and_compile_f90
+            ;;
+        *.F90)$
+            FILENAME=`basename ${ARG}`
+            TMPFILE=$(mymktemp "${ARG}" ".F90")
+            ORIGFILE="${FILENAME%.F90}"
+            filter_and_compile_f90
             ;;
         '-version' | '--version')
             printf '%b\n' "$SIMGRID_VERSION"
@@ -73,7 +100,7 @@ while [ $# -gt 0 ]; do
             exit 0
             ;;
         '-compiler-version' | '--compiler-version')
-            ${F77} --version
+            ${REAL_FORTRAN_COMPILER} --version
             ;;
         '-trace-call-location')
             TRACE_CALL_LOCATION=1
@@ -82,10 +109,10 @@ while [ $# -gt 0 ]; do
             list_add_not_empty CMDLINE "-ffixed-line-length-none" "-cpp"
             ;;
         -o)
-            NEEDS_OUTPUT=0
             list_add CMDLINE "-o$1"
+            NEEDS_OUTPUT=0
             shift
-            ;;        
+            ;;
         *)
             list_add CMDLINE "${ARG}"
             ;;
@@ -93,7 +120,7 @@ while [ $# -gt 0 ]; do
 done
 
 if [ $NEEDS_OUTPUT -ne 0 ]; then
-   list_add CMDLINE "-o${ORIGFILE}.o"     
+   list_add CMDLINE "-o${ORIGFILE}.o"
 fi
 
 list_add_not_empty CMDLINE ${INCLUDEARGS}