reduce the undue differences between smpiff and smpif90

diff --git a/src/smpi/smpif90.in b/src/smpi/smpif90.in
index 98459db..1a327da 100644 (file)
--- a/src/smpi/smpif90.in
+++ b/src/smpi/smpif90.in
@@ -8,7 +8,7 @@
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 SIMGRID_GITHASH="@SIMGRID_GITHASH@"
 
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 SIMGRID_GITHASH="@SIMGRID_GITHASH@"
 

-F90=@SMPI_Fortran_COMPILER@
+REAL_FORTRAN_COMPILER=@SMPI_Fortran_COMPILER@

 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"


@@ -28,7 +28,7 @@ trap 'cleanup' EXIT
 
 filter_and_compile() {
     list_add TMPFILES "${TMPFILE}"
 
 filter_and_compile() {
     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)"

     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}"
     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}"


@@ -36,7 +36,7 @@ filter_and_compile() {
 
 NEEDS_OUTPUT=1
 
 
 NEEDS_OUTPUT=1
 

-list_set CMDLINE "${F90}"
+list_set CMDLINE "${REAL_FORTRAN_COMPILER}"

 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
     ARG="$1"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
     ARG="$1"


@@ -68,7 +68,7 @@ while [ $# -gt 0 ]; do
             exit 0
             ;;
         '-compiler-version' | '--compiler-version')
             exit 0
             ;;
         '-compiler-version' | '--compiler-version')

-            ${F90} --version
+            ${REAL_FORTRAN_COMPILER} --version

             ;;
         -o)
             list_add CMDLINE "-o$1"
             ;;
         -o)
             list_add CMDLINE "-o$1"


@@ -81,7 +81,6 @@ while [ $# -gt 0 ]; do
     esac
 done
 
     esac
 done
 

-

 if [ $NEEDS_OUTPUT -ne 0 ]; then
    list_add CMDLINE "-o${ORIGFILE}.o"
 fi
 if [ $NEEDS_OUTPUT -ne 0 ]; then
    list_add CMDLINE "-o${ORIGFILE}.o"
 fi

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 0ab2d28..5db3443 100644 (file)
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -1,7 +1,6 @@
 #!/usr/bin/env sh
 
 #!/usr/bin/env sh
 

-# Copyright (c) 2012-2017. The SimGrid Team.
-# All rights reserved.
+# Copyright (c) 2012-2018. 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.
 
 # 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@"
 
 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@"
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"


@@ -41,7 +40,7 @@ filter_and_compile() {
 TRACE_CALL_LOCATION=0
 NEEDS_OUTPUT=1
 
 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"
 list_add_not_empty CMDLINE "${FFLAGS}"
 while [ $# -gt 0 ]; do
     ARG="$1"


@@ -73,7 +72,7 @@ while [ $# -gt 0 ]; do
             exit 0
             ;;
         '-compiler-version' | '--compiler-version')
             exit 0
             ;;
         '-compiler-version' | '--compiler-version')

-            ${F77} --version
+            ${REAL_FORTRAN_COMPILER} --version

             ;;
         '-trace-call-location')
             TRACE_CALL_LOCATION=1
             ;;
         '-trace-call-location')
             TRACE_CALL_LOCATION=1


@@ -82,10 +81,10 @@ while [ $# -gt 0 ]; do
             list_add_not_empty CMDLINE "-ffixed-line-length-none" "-cpp"
             ;;
         -o)
             list_add_not_empty CMDLINE "-ffixed-line-length-none" "-cpp"
             ;;
         -o)

-            NEEDS_OUTPUT=0

             list_add CMDLINE "-o$1"
             list_add CMDLINE "-o$1"

+            NEEDS_OUTPUT=0

             shift
             shift

-            ;;        
+            ;;

         *)
             list_add CMDLINE "${ARG}"
             ;;
         *)
             list_add CMDLINE "${ARG}"
             ;;


@@ -93,7 +92,7 @@ while [ $# -gt 0 ]; do
 done
 
 if [ $NEEDS_OUTPUT -ne 0 ]; then
 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}
 fi
 
 list_add_not_empty CMDLINE ${INCLUDEARGS}