From 45ca7cd8209e37df676794c7f11c4b87d50f3ab2 Mon Sep 17 00:00:00 2001
From: genaud <genaud@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 1 Jul 2009 14:30:25 +0000
Subject: [PATCH] adaptations for MacOSX: - basename replacement, no hardcoded
 path for readlink - consecutive numbers generation hand-made if seq
 unavailable

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6426 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 src/smpi/smpicc.in  |  6 ++++--
 src/smpi/smpirun.in | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index 0d873b4d7a..c72e180cf4 100755
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -11,7 +11,9 @@ TMPDIR="$(mktemp -d tmpXXXXXXX)"
 
 function modsource {
   SOURCE="$1"
-  SOURCEFILE="$(basename ${SOURCE})"
+  ## basename is not available on MAcOSX : SOURCEFILE="$(basename ${SOURCE})"
+  SOURCEFILE="`echo ${SOURCE} | egrep -o '[^/]+$'`"
+
   SOURCEDIR="${SOURCE%${SOURCEFILE}}"
   if [ -n "${SOURCEDIR}" ]; then
     mkdir -p ${TMPDIR}${SOURCEDIR}
@@ -52,7 +54,7 @@ while [ -n "$1" ]; do
   elif [ "${ARG%.c}" != "${ARG}" ]; then
     INCLUDEARGS="${INCLUDEARGS} -I . -I .. -I ../include -I @includedir@ "
 #    SRCFILE="$(realpath ${ARG})"
-    SRCFILE="$(/bin/readlink -f ${ARG})"
+    SRCFILE="$(readlink -f ${ARG})"
     modsource ${SRCFILE}
     CMDLINE="${CMDLINE} ${TMPDIR}${SRCFILE} "
   else
diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index c5a4b17383..278a49eca4 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -140,9 +140,22 @@ fi
 ##  hostfile has less than i lines.
 ##----------------------------------------------------------
 
+HAVE_SEQ="`which seq`"
+HAVE_JOT="`which jot`"
+
+if [ -n "${HAVE_SEQ}" ]; then
+	SEQ=`${HAVE_SEQ} 0 $((${NUMPROCS}-1))`
+else
+      cnt=0
+	while (( $cnt < ${NUMPROCS} )) ; do
+	    SEQ="$SEQ $cnt"
+	    cnt=$((cnt + 1));
+	done
+fi
+
 ##---- generate <process> tags------------------------------
 
-for i in `seq 0 $((${NUMPROCS}-1))` 
+for i in ${SEQ} 
 do
   if [ -n "${HOSTFILE}" ]; then
 	j=$(( $i % ${NUMHOSTS} ))
-- 
2.20.1