You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/09/16 03:43:38 UTC
svn commit: r446805 - in /incubator/tuscany/cpp: sca/ sca/runtime/core/test/
sca/samples/ sca/samples/MyValue/ sdo/ sdo/samples/
Author: jsdelfino
Date: Fri Sep 15 18:43:37 2006
New Revision: 446805
URL: http://svn.apache.org/viewvc?view=rev&rev=446805
Log:
Applied patch for JIRA TUSCANY-681 from Oisin. Port to Mac OS X. Oisin, Thanks a lot for this patch.
Modified:
incubator/tuscany/cpp/sca/GettingStarted.html
incubator/tuscany/cpp/sca/configure.ac
incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am
incubator/tuscany/cpp/sca/samples/MyValue/Makefile.am
incubator/tuscany/cpp/sca/samples/configure.ac
incubator/tuscany/cpp/sca/scatest.sh
incubator/tuscany/cpp/sdo/GettingStarted.html
incubator/tuscany/cpp/sdo/configure.ac
incubator/tuscany/cpp/sdo/samples/configure.ac
incubator/tuscany/cpp/sdo/sdotest.sh
Modified: incubator/tuscany/cpp/sca/GettingStarted.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/GettingStarted.html?view=diff&rev=446805&r1=446804&r2=446805
==============================================================================
--- incubator/tuscany/cpp/sca/GettingStarted.html (original)
+++ incubator/tuscany/cpp/sca/GettingStarted.html Fri Sep 15 18:43:37 2006
@@ -116,7 +116,7 @@
<OL>
<LI>Extract the binary tar package to a folder</LI>
<LI>Set the TUSCANY_SCACPP environment variable to point to the directory that was just extracted</LI>
- <LI>Add the *install_dir*/lib directory to the LD_LIBRARY_PATH environment variable</LI>
+ <LI>Add the *install_dir*/lib directory to the LD_LIBRARY_PATH (Linux) or DYLD_LIBRARY_PATH (MacOS X) environment variable</LI>
</OL>
<A NAME="linuxsrc"><H3>Getting Tuscany SCA for C++ working with the source release on Linux</H3></A>
<OL>
Modified: incubator/tuscany/cpp/sca/configure.ac
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/configure.ac?view=diff&rev=446805&r1=446804&r2=446805
==============================================================================
--- incubator/tuscany/cpp/sca/configure.ac (original)
+++ incubator/tuscany/cpp/sca/configure.ac Fri Sep 15 18:43:37 2006
@@ -16,6 +16,13 @@
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
+# Check for dynamic library suffixes
+AC_MSG_CHECKING([checking for dynamic library suffix])
+AC_CHECK_HEADER([sys/appleapiopts.h],
+ [AC_SUBST([libsuffix],[".dylib"]) AC_MSG_RESULT([using .dylib])],
+ [AC_SUBST([libsuffix],[".so"]) AC_MSG_RESULT([using .so])]
+)
+
# Checks for libraries.
# Checks for header files.
Modified: incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am?view=diff&rev=446805&r1=446804&r2=446805
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/core/test/Makefile.am Fri Sep 15 18:43:37 2006
@@ -33,6 +33,6 @@
install-exec-local:
- cp CustomerInfo/.libs/libCustomerInfo.so testSCASystem/packages/MyValueServiceComposite
- cp MyValue/.libs/libMyValue.so testSCASystem/packages/MyValueServiceComposite
+ cp CustomerInfo/.libs/libCustomerInfo$(libsuffix) testSCASystem/packages/MyValueServiceComposite
+ cp MyValue/.libs/libMyValue$(libsuffix) testSCASystem/packages/MyValueServiceComposite
Modified: incubator/tuscany/cpp/sca/samples/MyValue/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/MyValue/Makefile.am?view=diff&rev=446805&r1=446804&r2=446805
==============================================================================
--- incubator/tuscany/cpp/sca/samples/MyValue/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/MyValue/Makefile.am Fri Sep 15 18:43:37 2006
@@ -8,14 +8,14 @@
cp MyValueComposite/sca.composite $(deploy_composite)
cp MyValueComposite/CustomerInfo.fragment $(deploy_composite)
cp MyValueComposite/CustomerInfo/CustomerInfoImpl.componentType $(deploy_composite)/CustomerInfo
- cp MyValueComposite/CustomerInfo/.libs/libCustomerInfo.so $(deploy_composite)/CustomerInfo
+ cp MyValueComposite/CustomerInfo/.libs/libCustomerInfo$libsuffix) $(deploy_composite)/CustomerInfo
cp MyValueComposite/CustomerInfo/CustomerInfo.h $(deploy_composite)/CustomerInfo
cp MyValueComposite/CustomerInfo/CustomerInfoImpl.h $(deploy_composite)/CustomerInfo
cp MyValueComposite/MyValue/MyValueImpl.componentType $(deploy_composite)/MyValue
cp MyValueComposite/MyValue/MyValue.h $(deploy_composite)/MyValue
cp MyValueComposite/MyValue/MyValueImpl.h $(deploy_composite)/MyValue
cp MyValueComposite/MyValue/MyValueService.wsdl $(deploy_composite)/MyValue
- cp MyValueComposite/MyValue/.libs/libMyValue.so $(deploy_composite)/MyValue
+ cp MyValueComposite/MyValue/.libs/libMyValue$libsuffix) $(deploy_composite)/MyValue
cp MyValueComposite/StockQuoteService/StockQuoteService.h $(deploy_composite)/StockQuoteService
cp MyValueComposite/StockQuoteService/StockQuoteService.wsdl $(deploy_composite)/StockQuoteService
Modified: incubator/tuscany/cpp/sca/samples/configure.ac
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/configure.ac?view=diff&rev=446805&r1=446804&r2=446805
==============================================================================
--- incubator/tuscany/cpp/sca/samples/configure.ac (original)
+++ incubator/tuscany/cpp/sca/samples/configure.ac Fri Sep 15 18:43:37 2006
@@ -16,6 +16,14 @@
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
+# Check for dynamic library suffixes
+AC_MSG_CHECKING([checking for dynamic library suffix])
+AC_CHECK_HEADER([sys/appleapiopts.h],
+ [AC_SUBST([libsuffix],[".dylib"]) AC_MSG_RESULT([using .dylib])],
+ [AC_SUBST([libsuffix],[".so"]) AC_MSG_RESULT([using .so])]
+)
+
+
AC_CONFIG_FILES([Makefile
Calculator/Makefile
Calculator/sample.calculator/Makefile
Modified: incubator/tuscany/cpp/sca/scatest.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/scatest.sh?view=diff&rev=446805&r1=446804&r2=446805
==============================================================================
--- incubator/tuscany/cpp/sca/scatest.sh (original)
+++ incubator/tuscany/cpp/sca/scatest.sh Fri Sep 15 18:43:37 2006
@@ -39,7 +39,12 @@
export TUSCANY_SCACPP_SYSTEM_ROOT=$TEST_ROOT
-export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
+if [ `uname -s` = Darwin ]
+then
+ export DYLD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$DYLD_LIBRARY_PATH
+else
+ export LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
+fi
cd $TUSCANY_SCACPP/bin/test
./tuscany_sca_test
Modified: incubator/tuscany/cpp/sdo/GettingStarted.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/GettingStarted.html?view=diff&rev=446805&r1=446804&r2=446805
==============================================================================
--- incubator/tuscany/cpp/sdo/GettingStarted.html (original)
+++ incubator/tuscany/cpp/sdo/GettingStarted.html Fri Sep 15 18:43:37 2006
@@ -90,7 +90,7 @@
<A NAME="linuxbin"><H3>Getting Tuscany SDO for C++ working with the binary release on Linux</H3></A>
<OL>
<LI>Extract the binary tar package to a folder</LI>
- <LI>Add the *install_dir*/lib directory to the LD_LIBRARY_PATH environment variable</LI>
+ <LI>Add the *install_dir*/lib directory to the LD_LIBRARY_PATH (Linux) or DYLD_LIBRARY_PATH (MacOS X) environment variable</LI>
</OL>
<A NAME="linuxsrc"><H3>Getting Tuscany SDO for C++ working with the source release on Linux</H3></A>
<OL>
Modified: incubator/tuscany/cpp/sdo/configure.ac
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/configure.ac?view=diff&rev=446805&r1=446804&r2=446805
==============================================================================
--- incubator/tuscany/cpp/sdo/configure.ac (original)
+++ incubator/tuscany/cpp/sdo/configure.ac Fri Sep 15 18:43:37 2006
@@ -16,6 +16,13 @@
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
+# Check for dynamic library suffixes
+AC_MSG_CHECKING([checking for dynamic library suffix])
+AC_CHECK_HEADER([sys/appleapiopts.h],
+ [AC_SUBST([libsuffix],[".dylib"]) AC_MSG_RESULT([using .dylib])],
+ [AC_SUBST([libsuffix],[".so"]) AC_MSG_RESULT([using .so])]
+)
+
# Checks for libraries.
# Checks for header files.
Modified: incubator/tuscany/cpp/sdo/samples/configure.ac
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/samples/configure.ac?view=diff&rev=446805&r1=446804&r2=446805
==============================================================================
--- incubator/tuscany/cpp/sdo/samples/configure.ac (original)
+++ incubator/tuscany/cpp/sdo/samples/configure.ac Fri Sep 15 18:43:37 2006
@@ -16,6 +16,13 @@
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
+# Check for dynamic library suffixes
+AC_MSG_CHECKING([checking for dynamic library suffix])
+AC_CHECK_HEADER([sys/appleapiopts.h],
+ [AC_SUBST([libsuffix],[".dylib"]) AC_MSG_RESULT([using .dylib])],
+ [AC_SUBST([libsuffix],[".so"]) AC_MSG_RESULT([using .so])]
+)
+
AC_CONFIG_FILES([Makefile
misc/Makefile
])
Modified: incubator/tuscany/cpp/sdo/sdotest.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/sdotest.sh?view=diff&rev=446805&r1=446804&r2=446805
==============================================================================
--- incubator/tuscany/cpp/sdo/sdotest.sh (original)
+++ incubator/tuscany/cpp/sdo/sdotest.sh Fri Sep 15 18:43:37 2006
@@ -22,6 +22,11 @@
echo "Using SDO installed at $TUSCANY_SDOCPP"
-export LD_LIBRARY_PATH=$TUSCANY_SDOCPP/lib:$LD_LIBRARY_PATH
+if [ `uname -s` = Darwin ]
+then
+ export DYLD_LIBRARY_PATH=$TUSCANY_SDOCPP/lib:$DYLD_LIBRARY_PATH
+else
+ export LD_LIBRARY_PATH=$TUSCANY_SDOCPP/lib:$LD_LIBRARY_PATH
+fi
cd runtime/core/test
./tuscany_sdo_test
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org