From 54953f6e6f4c645cdc653f693b753be83ff96264 Mon Sep 17 00:00:00 2001
From: Evan Ramos <evan@hpccharm.com>
Date: Wed, 7 Nov 2018 16:29:39 -0600
Subject: [PATCH] Route ampif77 and ampif90 through ampiCC, factoring out
 duplicated code

Change-Id: I89430b1833d0cda8d3875e6b6a2142158701b3c4
---
 src/libs/ck-libs/ampi/ampiCC  | 19 +++++++++++++------
 src/libs/ck-libs/ampi/ampif77 | 23 ++---------------------
 src/libs/ck-libs/ampi/ampif90 | 39 ++++++++++-----------------------------
 3 files changed, 25 insertions(+), 56 deletions(-)
 rewrite src/libs/ck-libs/ampi/ampif90 (74%)

diff --git a/src/libs/ck-libs/ampi/ampiCC b/src/libs/ck-libs/ampi/ampiCC
index 3cb2fa40af..db173a1b12 100755
--- a/src/libs/ck-libs/ampi/ampiCC
+++ b/src/libs/ck-libs/ampi/ampiCC
@@ -1,6 +1,7 @@
 #!/bin/sh
 CHARMBIN=`dirname $0`
 
+[ -z "$AMPICC_MODE" ] && AMPICC_MODE='ampi'
 STANDALONE=""
 
 processArgs() {
@@ -24,27 +25,33 @@ done
 
 eval processArgs "$@"
 
-charmarch=$(cat $CHARMBIN/../tmp/.gdir)
-
 AMPICC_EXTRA_OPTIONS=""
 
-if test "$charmarch" = "mpi"
+if test "$AMPICC_MODE" = 'ampi'
 then
+  charmarch=$(cat $CHARMBIN/../tmp/.gdir)
+
+  if test "$charmarch" = "mpi"
+  then
     dirName=ampicc.inc.$$
     mkdir $dirName
     cp -n $CHARMBIN/../include/mpi.h $dirName/mpi.h   2>/dev/null
-    AMPICC_EXTRA_OPTIONS="-I./$dirName"
+    AMPICC_EXTRA_OPTIONS="$AMPICC_EXTRA_OPTIONS -I./$dirName"
+  fi
 fi
 
 [ -f $CHARMBIN/../lib/libampiromio.a -a -z "$STANDALONE" ] && ROMIO=-lampiromio
 
-$CHARMBIN/charmc -language ampi -default-to-aout $AMPICC_EXTRA_OPTIONS $@ $ROMIO
+$CHARMBIN/charmc -language $AMPICC_MODE -default-to-aout $AMPICC_EXTRA_OPTIONS $@ $ROMIO
 status=$?
 
-if test "$charmarch" = "mpi"
+if test "$AMPICC_MODE" = 'ampi'
 then
+  if test "$charmarch" = "mpi"
+  then
     /bin/rm -f $dirName/mpi.h 2>/dev/null
     rmdir $dirName
+  fi
 fi
 
 # Copy ampirun, but do not overwrite it if it already exists.
diff --git a/src/libs/ck-libs/ampi/ampif77 b/src/libs/ck-libs/ampi/ampif77
index bfa9f3efe8..d7aa22891e 100755
--- a/src/libs/ck-libs/ampi/ampif77
+++ b/src/libs/ck-libs/ampi/ampif77
@@ -1,25 +1,6 @@
 #!/bin/sh
 CHARMBIN=`dirname $0`
 
-STANDALONE=""
+export AMPICC_MODE='ampif'
 
-processArgs() {
-while [ ! $# -eq 0 ]
-do
-  arg="$1"
-  case "$arg" in
-  -standalone)
-     STANDALONE="true"
-     ;;
-  *)
-     ;;
-  esac
-  shift
-done
-}
-
-eval processArgs "$@"
-
-[ -f $CHARMBIN/../lib/libampiromio.a -a -z "$STANDALONE" ] && ROMIO=-lampiromio
-
-$CHARMBIN/charmc -language ampif -default-to-aout $@ $ROMIO
+$CHARMBIN/ampiCC $@
diff --git a/src/libs/ck-libs/ampi/ampif90 b/src/libs/ck-libs/ampi/ampif90
dissimilarity index 74%
index 545835a939..de07ae9ecd 100755
--- a/src/libs/ck-libs/ampi/ampif90
+++ b/src/libs/ck-libs/ampi/ampif90
@@ -1,29 +1,10 @@
-#!/bin/sh
-CHARMBIN=`dirname $0`
-
-STANDALONE=""
-
-processArgs() {
-while [ ! $# -eq 0 ]
-do
-  arg="$1"
-  case "$arg" in
-  -standalone)
-     STANDALONE="true"
-     ;;
-  *)
-     ;;
-  esac
-  shift
-done
-}
-
-eval processArgs "$@"
-
-[ -f $CHARMBIN/../lib/libampiromio.a -a -z "$STANDALONE" ] && ROMIO=-lampiromio
-
-cp -n $CHARMBIN/../include/mpif.h .
-$CHARMBIN/charmc -language ampif -default-to-aout $@ $ROMIO
-status=$?
-/bin/rm -f mpif.h
-exit $status
+#!/bin/sh
+CHARMBIN=`dirname $0`
+
+export AMPICC_MODE='ampif'
+
+cp -n $CHARMBIN/../include/mpif.h .
+$CHARMBIN/ampiCC $@
+status=$?
+/bin/rm -f mpif.h
+exit $status
-- 
2.11.4.GIT