Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 54e63ee..7ab9413 100644 (file)
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -1,23 +1,18 @@
 #! /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.
 
-<<<<<<< HEAD
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
+SIMGRID_GITHASH="@SIMGRID_GITHASH@"
 
-prefix="@exec_prefix@"
-smpicc="$prefix/bin/smpicc"
-smpif2c="$prefix/bin/smpif2c"
-=======
-F77=@GFORTRAN_EXE@
+F77=@SAVED_Fortran_COMPILER@
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
->>>>>>> 167177a9f2980982c1bb3f89ec90fc1937395cd5
 
 @SMPITOOLS_SH@
 
@@ -28,10 +23,24 @@ main_name=main
 
 cleanup () {
     eval $(list_get TMPFILES)
-   # rm -f "$@"
+    rm -f "$@"
 }
 trap 'cleanup' EXIT
 
+filter_and_compile() {
+    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][[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /g;s/[[:space:]]*[uU][sS][eE][[:space:]]*[mM][pP][iI]/\include \"mpif\.h\" /g' "${ARG}" >> "${TMPFILE}"
+    SRCFILE="${TMPFILE}"
+    list_add CMDLINE "${SRCFILE}"
+}
+TRACE_CALL_LOCATION=0
+NEEDS_OUTPUT=1
+
 list_set CMDLINE "${F77}"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
@@ -43,25 +52,48 @@ while [ $# -gt 0 ]; do
             LINKARGS=""
             list_add CMDLINE "-c"
             ;;
-        *.f|*.F)
+        *.f)
             TMPFILE=$(mymktemp "${ARG}" ".f")
-            list_add TMPFILES "${TMPFILE}"
-      #replace "program main_name by subroutine user\_main (and the end clause as well)"
-            sed 's/[[:space:]]\{6\}[[:space:]]*\(end \)\{0,1\}program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" > "${TMPFILE}"
-            SRCFILE="${TMPFILE}"
-            list_add CMDLINE "${SRCFILE}"
+            ORIGFILE="${ARG%.f}"
+            filter_and_compile
+            ;;
+        *.F)
+            TMPFILE=$(mymktemp "${ARG}" ".F")
+            ORIGFILE="${ARG%.F}"
+            filter_and_compile
+            ;;
+        '-version' | '--version')
+            printf '%b\n' "$SIMGRID_VERSION"
+            exit 0
             ;;
-        '-version' | '--version' | '-v')
-            # -e is not recognised by MS-DOS...
-            echo -e $SIMGRID_VERSION
+        "-git-version" | "--git-version")
+            printf '%b\n' "$SIMGRID_GITHASH"
             exit 0
-            ;;           
+            ;;
+        '-compiler-version' | '--compiler-version')
+            ${F77} --version
+            ;;
+        '-trace-call-location')
+            TRACE_CALL_LOCATION=1
+            # This should be list_add FFLAGS but it's not possible
+            # anymore: FFLAGS was already moved into CMDLINE above.
+            list_add_not_empty CMDLINE "-ffixed-line-length-none" "-cpp"
+            ;;
+        -o)
+            NEEDS_OUTPUT=0
+            list_add CMDLINE "-o$1"
+            shift
+            ;;        
         *)
             list_add CMDLINE "${ARG}"
             ;;
     esac
 done
 
+if [ $NEEDS_OUTPUT -ne 0 ]; then
+   list_add CMDLINE "-o${ORIGFILE}.o"     
+fi
+
 list_add_not_empty CMDLINE ${INCLUDEARGS}
 list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
 list_add_not_empty CMDLINE "${LINKARGS}"