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

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

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 54e63ee..1c6308d 100644 (file)
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -6,18 +6,12 @@
 # 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@"
 
-prefix="@exec_prefix@"
-smpicc="$prefix/bin/smpicc"
-smpif2c="$prefix/bin/smpif2c"
-=======
 F77=@GFORTRAN_EXE@
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
->>>>>>> 167177a9f2980982c1bb3f89ec90fc1937395cd5
 
 @SMPITOOLS_SH@
 
@@ -28,10 +22,13 @@ main_name=main
 
 cleanup () {
     eval $(list_get TMPFILES)
-   # rm -f "$@"
+    rm -f "$@"
 }
 trap 'cleanup' EXIT
 
+
+NEEDS_OUTPUT=1
+
 list_set CMDLINE "${F77}"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
@@ -48,20 +45,31 @@ while [ $# -gt 0 ]; do
             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}"
+            ORIGFILE="${ARG}"
             SRCFILE="${TMPFILE}"
             list_add CMDLINE "${SRCFILE}"
             ;;
-        '-version' | '--version' | '-v')
-            # -e is not recognised by MS-DOS...
-            echo -e $SIMGRID_VERSION
+        '-version' | '--version')
+            printf '%b\n' "$SIMGRID_VERSION"
             exit 0
-            ;;           
+            ;;
+        '-compiler-version' | '--compiler-version')
+            ${F77} --version
+            ;;
+        -o)
+            NEEDS_OUTPUT=0
+            list_add CMDLINE "-o"   
+            ;;        
         *)
             list_add CMDLINE "${ARG}"
             ;;
     esac
 done
 
+if [ $NEEDS_OUTPUT -ne 0 ]; then
+   list_add CMDLINE "-o${ORIGFILE%.f}.o"     
+fi
+
 list_add_not_empty CMDLINE ${INCLUDEARGS}
 list_add_not_empty CMDLINE ${CMAKE_LINKARGS}
 list_add_not_empty CMDLINE "${LINKARGS}"