From: scastelli <stephane.castelli@inria.fr>
Date: Wed, 4 Jun 2014 18:27:06 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
X-Git-Tag: v3_12~1005
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c3890db8638c24b07758f57081aed4932379b5de

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

Conflicts:
	src/smpi/smpiff.in
---

c3890db8638c24b07758f57081aed4932379b5de
diff --cc src/smpi/smpiff.in
index be2b2f43bb,e97d6c2518..54e63ee7fb
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@@ -6,11 -6,10 +6,18 @@@
  # 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@
  
@@@ -22,23 -30,21 +38,26 @@@ while [ $# -gt 0 ]; d
      ARG="$1"
      shift
      case "${ARG}" in
-         *.f)
-             SRCFILE="$(readlink -f ${ARG} 2>/dev/null)"
-             if [ -z "$SRCFILE" ] ; then
-                 SRCFILE="$ARG"
-             fi
-             list_add SRCFILES "${SRCFILE}"
+         -c)
+             CMAKE_LINKARGS=""
+             LINKARGS=""
+             list_add CMDLINE "-c"
+             ;;
+         *.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}"
              ;;
 +        '-version' | '--version' | '-v')
 +            # -e is not recognised by MS-DOS...
 +            echo -e $SIMGRID_VERSION
 +            exit 0
 +            ;;           
          *)
-             if [ "${ARG}" = "-c" ]; then
-                 LINKARGS=""
-             fi
-             list_add ARGS "${ARG}"
+             list_add CMDLINE "${ARG}"
              ;;
      esac
  done