Port to Mac OS X 10.6.7.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1140690 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 27 insertions, 27 deletions

diff --git a/sca-cpp/trunk/samples/loan-python/server-test b/sca-cpp/trunk/samples/loan-python/server-test
index 1612bc59e2..fb629a6814 100755
--- a/sca-cpp/trunk/samples/loan-python/server-test
+++ b/sca-cpp/trunk/samples/loan-python/server-test
@@ -18,7 +18,7 @@
 #  under the License.
 
 echo "Testing..."
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
@@ -55,4 +55,4 @@ sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"
 fi
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/samples/store-cluster/server-test b/sca-cpp/trunk/samples/store-cluster/server-test
index 68856f530e..0a3a5ea73b 100755
--- a/sca-cpp/trunk/samples/store-cluster/server-test
+++ b/sca-cpp/trunk/samples/store-cluster/server-test
@@ -21,7 +21,7 @@
 # 127.0.0.1 sca-store.com joe.sca-store.com joe.sca-store.com
 
 echo "Testing..."
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
@@ -58,4 +58,4 @@ sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"
 fi
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/samples/store-cpp/Makefile.am b/sca-cpp/trunk/samples/store-cpp/Makefile.am
index 1a642e583c..3f9d8e87eb 100644
--- a/sca-cpp/trunk/samples/store-cpp/Makefile.am
+++ b/sca-cpp/trunk/samples/store-cpp/Makefile.am
@@ -22,19 +22,19 @@ sampledir = $(prefix)/samples/store-cpp
 nobase_dist_sample_DATA = currency-converter.cpp fruits-catalog.cpp shopping-cart.cpp store.composite htdocs/*.html
 
 sample_LTLIBRARIES = libcurrency-converter.la libfruits-catalog.la libshopping-cart.la
-noinst_DATA = libcurrency-converter.so libfruits-catalog.so libshopping-cart.so
+noinst_DATA = libcurrency-converter${libsuffix} libfruits-catalog${libsuffix} libshopping-cart${libsuffix}
 
 libcurrency_converter_la_SOURCES = currency-converter.cpp
-libcurrency-converter.so:
-	ln -s .libs/libcurrency-converter.so
+libcurrency-converter${libsuffix}:
+	ln -s .libs/libcurrency-converter${libsuffix}
 
 libfruits_catalog_la_SOURCES = fruits-catalog.cpp
-libfruits-catalog.so:
-	ln -s .libs/libfruits-catalog.so
+libfruits-catalog${libsuffix}:
+	ln -s .libs/libfruits-catalog${libsuffix}
 
 libshopping_cart_la_SOURCES = shopping-cart.cpp
-libshopping-cart.so:
-	ln -s .libs/libshopping-cart.so
+libshopping-cart${libsuffix}:
+	ln -s .libs/libshopping-cart${libsuffix}
 
 dist_noinst_SCRIPTS = server-test
 TESTS = server-test
diff --git a/sca-cpp/trunk/samples/store-cpp/server-test b/sca-cpp/trunk/samples/store-cpp/server-test
index e0d8716449..e621803f8d 100755
--- a/sca-cpp/trunk/samples/store-cpp/server-test
+++ b/sca-cpp/trunk/samples/store-cpp/server-test
@@ -18,7 +18,7 @@
 #  under the License.
 
 echo "Testing..."
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
@@ -55,4 +55,4 @@ sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"
 fi
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/samples/store-gae/server-test b/sca-cpp/trunk/samples/store-gae/server-test
index 4d42e9a5f5..8dcb444418 100755
--- a/sca-cpp/trunk/samples/store-gae/server-test
+++ b/sca-cpp/trunk/samples/store-gae/server-test
@@ -18,7 +18,7 @@
 #  under the License.
 
 echo "Testing..."
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
@@ -56,4 +56,4 @@ sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"
 fi
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/samples/store-java/server-test b/sca-cpp/trunk/samples/store-java/server-test
index 1612bc59e2..fb629a6814 100755
--- a/sca-cpp/trunk/samples/store-java/server-test
+++ b/sca-cpp/trunk/samples/store-java/server-test
@@ -18,7 +18,7 @@
 #  under the License.
 
 echo "Testing..."
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
@@ -55,4 +55,4 @@ sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"
 fi
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/samples/store-nosql/server-test b/sca-cpp/trunk/samples/store-nosql/server-test
index 1612bc59e2..fb629a6814 100755
--- a/sca-cpp/trunk/samples/store-nosql/server-test
+++ b/sca-cpp/trunk/samples/store-nosql/server-test
@@ -18,7 +18,7 @@
 #  under the License.
 
 echo "Testing..."
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
@@ -55,4 +55,4 @@ sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"
 fi
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/samples/store-python/server-test b/sca-cpp/trunk/samples/store-python/server-test
index 27490c580b..8f52543c71 100755
--- a/sca-cpp/trunk/samples/store-python/server-test
+++ b/sca-cpp/trunk/samples/store-python/server-test
@@ -18,7 +18,7 @@
 #  under the License.
 
 echo "Testing..."
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
@@ -55,4 +55,4 @@ sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"
 fi
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/samples/store-scheme/server-test b/sca-cpp/trunk/samples/store-scheme/server-test
index 1612bc59e2..fb629a6814 100755
--- a/sca-cpp/trunk/samples/store-scheme/server-test
+++ b/sca-cpp/trunk/samples/store-scheme/server-test
@@ -18,7 +18,7 @@
 #  under the License.
 
 echo "Testing..."
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
@@ -55,4 +55,4 @@ sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"
 fi
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/samples/store-sql/server-test b/sca-cpp/trunk/samples/store-sql/server-test
index 1612bc59e2..fb629a6814 100755
--- a/sca-cpp/trunk/samples/store-sql/server-test
+++ b/sca-cpp/trunk/samples/store-sql/server-test
@@ -18,7 +18,7 @@
 #  under the License.
 
 echo "Testing..."
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
@@ -55,4 +55,4 @@ sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"
 fi
-return $rc
+exit $rc
diff --git a/sca-cpp/trunk/samples/store-vhost/server-test b/sca-cpp/trunk/samples/store-vhost/server-test
index 405da2165d..dd3893948e 100755
--- a/sca-cpp/trunk/samples/store-vhost/server-test
+++ b/sca-cpp/trunk/samples/store-vhost/server-test
@@ -18,7 +18,7 @@
 #  under the License.
 
 echo "Testing..."
-here=`readlink -f $0`; here=`dirname $here`
+here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
@@ -58,4 +58,4 @@ sleep 2
 if [ "$rc" = "0" ]; then
     echo "OK"
 fi
-return $rc
+exit $rc