Author: robbinspg
Date: Wed Nov 29 03:33:12 2006
New Revision: 480535
URL: http://svn.apache.org/viewvc?view=rev&rev=480535
Log:
TUSCANY-681 Port to MacOSX
This makes axis2c optional
Removed:
incubator/tuscany/cpp/sca/runtime/core/test/
Modified:
incubator/tuscany/cpp/sca/build.sh
incubator/tuscany/cpp/sca/configure.ac
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Exceptions.cpp
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/Makefile.am
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/Makefile.am
incubator/tuscany/cpp/sca/samples/CppCalculator/Makefile.am
incubator/tuscany/cpp/sca/samples/CppCalculator/sample.calculator.client/Makefile.am
incubator/tuscany/cpp/sca/samples/CppCalculator/sample.calculator.client/runclient.sh
incubator/tuscany/cpp/sca/samples/Makefile.am
incubator/tuscany/cpp/sca/samples/build.sh
incubator/tuscany/cpp/sca/samples/configure.ac
incubator/tuscany/cpp/sdo/build.sh
incubator/tuscany/cpp/sdo/configure.ac
incubator/tuscany/cpp/sdo/runtime/core/Makefile.am
Modified: incubator/tuscany/cpp/sca/build.sh
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/build.sh?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sca/build.sh (original)
+++ incubator/tuscany/cpp/sca/build.sh Wed Nov 29 03:33:12 2006
@@ -20,10 +20,12 @@
TUSCANY_SCACPP_HOME=`pwd`
if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set"
-exit;
-fi
+echo "AXIS2C_HOME not set not building Axis2C WS binding extensions"
+WITH_AXIS2C=--with-axis2c=false
+else
echo "Using Axis2C installed at $AXIS2C_HOME"
+WITH_AXIS2C=--with-axis2c=true
+fi
if [ x$TUSCANY_SDOCPP = x ]; then
echo "TUSCANY_SDOCPP not set"
@@ -57,7 +59,7 @@
cd $TUSCANY_SCACPP_HOME
./autogen.sh
-./configure --prefix=${TUSCANY_SCACPP_HOME}/deploy --enable-static=no
${ENABLE_RUBY} ${ENABLE_PYTHON}
+./configure --prefix=${TUSCANY_SCACPP_HOME}/deploy --enable-static=no
${WITH_AXIS2C} ${ENABLE_RUBY} ${ENABLE_PYTHON}
make
make install
Modified: incubator/tuscany/cpp/sca/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/configure.ac?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sca/configure.ac (original)
+++ incubator/tuscany/cpp/sca/configure.ac Wed Nov 29 03:33:12 2006
@@ -20,7 +20,7 @@
AC_PREREQ(2.59)
AC_INIT(tuscany_sca_cpp, 1.0-incubator-M2)
AC_CANONICAL_SYSTEM
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(tuscany_sca_config.h)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AC_PREFIX_DEFAULT(/usr/local/tuscany/sca)
@@ -33,6 +33,16 @@
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
+# Check for running on Darwin
+AC_MSG_CHECKING([Checking if running on Darwin])
+UNAME=`uname -s`
+if test "x$UNAME" = "xDarwin"; then
+ AC_DEFINE([IS_DARWIN], [1], [Set to 1 when running on Darwin - Mac OSX])
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+
# Check for dynamic library suffixes
AC_MSG_CHECKING([checking for dynamic library suffix])
AC_CHECK_HEADER([sys/appleapiopts.h],
@@ -109,6 +119,23 @@
want_wsbinding=true ]
)
AM_CONDITIONAL([WANT_WSBINDING], [test x$want_wsbinding = xtrue])
+
+AC_MSG_CHECKING(whether to build Axis2C Web Service binding extension)
+AC_ARG_WITH(axis2c, [AS_HELP_STRING([--with-axis2c],[build Axis2C Web Service
binding extension [default=no]])],
+[ case "${withval}" in
+ yes)
+ AC_MSG_RESULT(yes)
+ with_axis2c=true
+ ;;
+ *)
+ AC_MSG_RESULT(no)
+ with_axis2c=false
+ ;;
+ esac ],
+[ AC_MSG_RESULT(no)
+ with_axis2c=false ]
+)
+AM_CONDITIONAL([WITH_AXIS2C], [test x$with_axis2c = xtrue])
AC_MSG_CHECKING(whether to build SCA default binding extension)
AC_ARG_ENABLE(scabinding, [AS_HELP_STRING([--enable-scabinding],[build SCA
default binding extension [default=no]])],
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/SCARuntime.cpp
Wed Nov 29 03:33:12 2006
@@ -29,7 +29,9 @@
#include "tuscany/sca/model/Component.h"
#if defined(WIN32) || defined (_WINDOWS)
-#include <windows.h>
+#include <windows.h>
+#else
+#include "tuscany_sca_config.h"
#endif
namespace tuscany
@@ -268,9 +270,13 @@
#if defined(WIN32) || defined (_WINDOWS)
string pattern = "*.dll";
#else
+#if defined(IS_DARWIN)
+ string pattern = "*.dylib";
+#else
string pattern = "*.so";
#endif
-
+#endif
+
Files files(extensionsRoot, pattern, true);
for (unsigned int i=0; i < files.size(); i++)
{
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Exceptions.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Exceptions.cpp?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Exceptions.cpp
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Exceptions.cpp
Wed Nov 29 03:33:12 2006
@@ -21,11 +21,17 @@
#include "tuscany/sca/util/Exceptions.h"
#include "tuscany/sca/util/Logging.h"
+
+#if defined(WIN32) || defined (_WINDOWS)
+#else
+#include "tuscany_sca_config.h"
+#endif
+
using namespace std;
#include <sstream>
-#if defined(WIN32) || defined (_WINDOWS)
+#if defined(WIN32) || defined (_WINDOWS) || defined (IS_DARWIN)
#else
#include <execinfo.h>
#endif
@@ -49,7 +55,7 @@
message_text = new char[strlen(msg_text)+1];
strcpy(message_text,msg_text);
-#if defined(WIN32) || defined (_WINDOWS)
+#if defined(WIN32) || defined (_WINDOWS) || defined (IS_DARWIN)
#else
void* array[25];
stacktrace_size = backtrace(array, 25);
@@ -81,7 +87,7 @@
strcpy(locations[i].function, c.locations[i].function);
}
-#if defined(WIN32) || defined (_WINDOWS)
+#if defined(WIN32) || defined (_WINDOWS) || defined (IS_DARWIN)
#else
void* array[25];
stacktrace_size = backtrace(array, 25);
@@ -125,7 +131,7 @@
setLocation(file, line, function);
}
-#if defined(WIN32) || defined (_WINDOWS)
+#if defined(WIN32) || defined (_WINDOWS) || defined (IS_DARWIN)
#else
void* array[25];
stacktrace_size = backtrace(array, 25);
@@ -148,7 +154,7 @@
if (locations[i].function) delete locations[i].function;
}
-#if defined(WIN32) || defined (_WINDOWS)
+#if defined(WIN32) || defined (_WINDOWS) || defined (IS_DARWIN)
#else
free(stacktrace_symbols);
#endif
@@ -273,7 +279,7 @@
}
}
}
-#if defined(WIN32) || defined (_WINDOWS)
+#if defined(WIN32) || defined (_WINDOWS) || defined (IS_DARWIN)
#else
if (stacktrace_size != 0)
{
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp
(original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/Library.cpp Wed
Nov 29 03:33:12 2006
@@ -28,6 +28,8 @@
#include "tuscany/sca/util/Exceptions.h"
#include "tuscany/sca/util/Logging.h"
+#include "tuscany_sca_config.h"
+
namespace tuscany
{
namespace sca
@@ -97,28 +99,34 @@
}
#else
int l = name.length();
- string soName;
- if (l>=3 && name.substr(l-3, 3)==".so")
+ string libName;
+#ifdef IS_DARWIN
+ string suffix = ".dylib";
+#else
+ string suffix = ".so";
+#endif
+ unsigned int suffixLength = suffix.length();
+ if (l>=suffixLength && name.substr(l-suffixLength,
suffixLength)==suffix)
{
- soName = name;
+ libName = name;
}
- else
- {
+ else
+ {
int s = name.rfind("/");
if (s == name.length())
{
- soName = name + ".so";
+ libName = name + suffix;
}
else
{
s++;
- soName = name.substr(0, s) + "lib" + name.substr(s,
name.length()-s) + ".so";
+ libName = name.substr(0, s) + "lib" + name.substr(s,
name.length()-s) + suffix;
}
}
- hDLL = dlopen(soName.c_str(), RTLD_NOW);
+ hDLL = dlopen(libName.c_str(), RTLD_NOW);
if (hDLL == NULL)
{
- msg = "Unable to load library: " + soName + ": " + dlerror();
+ msg = "Unable to load library: " + libName + ": " + dlerror();
}
#endif
if (hDLL == NULL)
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/Makefile.am?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/Makefile.am
(original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/Makefile.am Wed
Nov 29 03:33:12 2006
@@ -15,4 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-SUBDIRS = axis2c
+if WITH_AXIS2C
+ AXIS2C_SUBDIRS = axis2c
+endif
+
+SUBDIRS = ${AXIS2C_SUBDIRS}
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ws/service/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/service/Makefile.am?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/service/Makefile.am
(original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/service/Makefile.am Wed Nov
29 03:33:12 2006
@@ -15,4 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-SUBDIRS = axis2c
+if WITH_AXIS2C
+ AXIS2C_SUBDIRS = axis2c
+endif
+SUBDIRS = ${AXIS2C_SUBDIRS}
Modified: incubator/tuscany/cpp/sca/samples/CppCalculator/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/CppCalculator/Makefile.am?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sca/samples/CppCalculator/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/CppCalculator/Makefile.am Wed Nov 29
03:33:12 2006
@@ -15,7 +15,11 @@
# specific language governing permissions and limitations
# under the License.
+if WITH_AXIS2C
+ WSBINDING_SAMPLE = sample.calculator.wsclient
+endif
+
deploydir=$(prefix)/samples/CppCalculator/deploy
-SUBDIRS = sample.calculator sample.calculator.client sample.calculator.wsclient
+SUBDIRS = sample.calculator sample.calculator.client ${WSBINDING_SAMPLE}
EXTRA_DIST = *.composite README.html
deploy_DATA = *.composite
Modified:
incubator/tuscany/cpp/sca/samples/CppCalculator/sample.calculator.client/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/CppCalculator/sample.calculator.client/Makefile.am?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
---
incubator/tuscany/cpp/sca/samples/CppCalculator/sample.calculator.client/Makefile.am
(original)
+++
incubator/tuscany/cpp/sca/samples/CppCalculator/sample.calculator.client/Makefile.am
Wed Nov 29 03:33:12 2006
@@ -32,21 +32,7 @@
-L${TUSCANY_SCACPP}/extensions/cpp/lib \
-ltuscany_sca_cpp \
-L${TUSCANY_SDOCPP}/lib \
- -ltuscany_sdo \
- -ltuscany_sdo_axiom \
--L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_wsdl \
- -laxis2_engine \
- -lwoden \
- -lwoden_wsdl \
- -laxis2_xml_schema \
- -laxis2_parser \
- -laxis2_minizip \
- -lpthread \
- -laxis2_http_sender \
- -laxis2_http_receiver
+ -ltuscany_sdo
INCLUDES = \
-I$(TUSCANY_SCACPP)/extensions/cpp/include \
Modified:
incubator/tuscany/cpp/sca/samples/CppCalculator/sample.calculator.client/runclient.sh
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/CppCalculator/sample.calculator.client/runclient.sh?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
---
incubator/tuscany/cpp/sca/samples/CppCalculator/sample.calculator.client/runclient.sh
(original)
+++
incubator/tuscany/cpp/sca/samples/CppCalculator/sample.calculator.client/runclient.sh
Wed Nov 29 03:33:12 2006
@@ -33,11 +33,12 @@
if [ x$AXIS2C_HOME = x ]; then
echo "AXIS2C_HOME not set"
-exit;
-fi
+else
echo "Using Axis2C installed at $AXIS2C_HOME"
+export AXIS2C_LIB = $AXIS2C_HOME/lib:
+fi
-export
LD_LIBRARY_PATH=$TUSCANY_SCACPP/lib:$TUSCANY_SCACPP/extensions/cpp/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
+export
LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/cpp/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_LIB:$LD_LIBRARY_PATH
export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
export TUSCANY_SCACPP_COMPONENT=sample.calculator.CalculatorComponent
Modified: incubator/tuscany/cpp/sca/samples/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Makefile.am?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/Makefile.am Wed Nov 29 03:33:12 2006
@@ -16,12 +16,18 @@
# under the License.
if WANT_ALL_SAMPLES
- CPP_SAMPLES = CppCalculator CppBigBank
+ CPP_SAMPLES = CppCalculator
+if WITH_AXIS2C
+ CPP_AXIS2C_SAMPLES = CppBigBank
+endif
PYTHON_SAMPLES = PythonCalculator PythonWeatherForecast
RUBY_SAMPLES = RubyCalculator RubyBigBank HttpdBigBank RestCalculator
endif
if WANT_CPP_SAMPLES
- CPP_SAMPLES = CppCalculator CppBigBank
+ CPP_SAMPLES = CppCalculator
+if WITH_AXIS2C
+ CPP_AXIS2C_SAMPLES = CppBigBank
+endif
endif
if WANT_PYTHON_SAMPLES
PYTHON_SAMPLES = PythonCalculator PythonWeatherForecast
@@ -31,6 +37,6 @@
endif
if WANT_PHP_SAMPLES
endif
-SUBDIRS = ${CPP_SAMPLES} ${PYTHON_SAMPLES} ${RUBY_SAMPLES} ${PHP_SAMPLES}
+SUBDIRS = ${CPP_SAMPLES} ${CPP_AXIS2C_SAMPLES} ${PYTHON_SAMPLES}
${RUBY_SAMPLES} ${PHP_SAMPLES}
EXTRA_DIST = GettingStarted.html
Modified: incubator/tuscany/cpp/sca/samples/build.sh
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/build.sh?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sca/samples/build.sh (original)
+++ incubator/tuscany/cpp/sca/samples/build.sh Wed Nov 29 03:33:12 2006
@@ -31,32 +31,34 @@
echo "Using SDO installed at $TUSCANY_SDOCPP"
if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set"
-exit;
-fi
+echo "AXIS2C_HOME not set not building Axis2C WS samples"
+WITH_AXIS2C=--with-axis2c=false
+else
echo "Using Axis2C installed at $AXIS2C_HOME"
+WITH_AXIS2C=--with-axis2c=true
+fi
if [ x$PYTHON_LIB = x ]; then
-echo "PYTHON_LIB not set. Python extension will not be built"
+echo "PYTHON_LIB not set. Python samples will not be built"
elif [ x$PYTHON_INCLUDE = x ]; then
-echo "PYTHON_INCLUDE not set. Python extension will not be built"
+echo "PYTHON_INCLUDE not set. Python samples will not be built"
elif [ x$PYTHON_VERSION = x ]; then
-echo "PYTHON_VERSION not set. Python extension will not be built"
+echo "PYTHON_VERSION not set. Python samples will not be built"
else
-echo "Building PYTHON extension with Python $PYTHON_VERSION installed at
$PYTHON_LIB, $PYTHON_INCLUDE"
+echo "Building PYTHON samples with Python $PYTHON_VERSION installed at
$PYTHON_LIB, $PYTHON_INCLUDE"
ENABLE_PYTHON=--enable-python
fi
if [ x$RUBY_LIB = x ]; then
-echo "RUBY_LIB not set. Ruby extension will not be built"
+echo "RUBY_LIB not set. Ruby samples will not be built"
elif [ x$RUBY_INCLUDE = x ]; then
-echo "RUBY_INCLUDE not set. Ruby extension will not be built"
+echo "RUBY_INCLUDE not set. Ruby samples will not be built"
else
-echo "Building Ruby extension with Ruby installed at $RUBY_LIB, $RUBY_INCLUDE"
+echo "Building Ruby samples with Ruby installed at $RUBY_LIB, $RUBY_INCLUDE"
ENABLE_RUBY=--enable-ruby
fi
-./configure --prefix=${TUSCANY_SCACPP} --enable-static=no ${ENABLE_RUBY}
${ENABLE_PYTHON}
+./configure --prefix=${TUSCANY_SCACPP} --enable-static=no ${WITH_AXIS2C}
${ENABLE_RUBY} ${ENABLE_PYTHON}
make
make install
Modified: incubator/tuscany/cpp/sca/samples/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/configure.ac?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sca/samples/configure.ac (original)
+++ incubator/tuscany/cpp/sca/samples/configure.ac Wed Nov 29 03:33:12 2006
@@ -33,6 +33,16 @@
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
+# Check for running on Darwin
+AC_MSG_CHECKING([Checking if running on Darwin])
+UNAME=`uname -s`
+if test "x$UNAME" = "xDarwin"; then
+ AC_DEFINE([IS_DARWIN], [1], [Set to 1 when running on Darwin - Mac OSX])
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+
# Check for dynamic library suffixes
AC_MSG_CHECKING([checking for dynamic library suffix])
AC_CHECK_HEADER([sys/appleapiopts.h],
@@ -74,6 +84,40 @@
want_all_samples=false ]
)
AM_CONDITIONAL([WANT_ALL_SAMPLES], [test x$want_all_samples = xtrue])
+
+AC_MSG_CHECKING(whether to build WS samples)
+AC_ARG_ENABLE(wsbinding, [AS_HELP_STRING([--enable-wsbinding],[build Web
Service binding samples [default=yes]])],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ want_wsbinding=false
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ want_wsbinding=true
+ ;;
+ esac ],
+[ AC_MSG_RESULT(yes)
+ want_wsbinding=true ]
+)
+AM_CONDITIONAL([WANT_WSBINDING], [test x$want_wsbinding = xtrue])
+
+AC_MSG_CHECKING(whether to build Axis2C Web Service samples)
+AC_ARG_WITH(axis2c, [AS_HELP_STRING([--with-axis2c],[build Axis2C Web Service
samples [default=no]])],
+[ case "${withval}" in
+ yes)
+ AC_MSG_RESULT(yes)
+ with_axis2c=true
+ ;;
+ *)
+ AC_MSG_RESULT(no)
+ with_axis2c=false
+ ;;
+ esac ],
+[ AC_MSG_RESULT(no)
+ with_axis2c=false ]
+)
+AM_CONDITIONAL([WITH_AXIS2C], [test x$with_axis2c = xtrue])
AC_MSG_CHECKING(whether to build C++ samples)
AC_ARG_ENABLE(cpp, [AS_HELP_STRING([--enable-cpp],[build C++ samples
[default=yes]])],
Modified: incubator/tuscany/cpp/sdo/build.sh
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/build.sh?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sdo/build.sh (original)
+++ incubator/tuscany/cpp/sdo/build.sh Wed Nov 29 03:33:12 2006
@@ -28,10 +28,12 @@
fi
if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set"
-exit;
-fi
+echo "AXIS2C_HOME not set. not building SDO Axiom utility"
+WITH_AXIS2C=--with-axis2c=false
+else
echo "Using Axis2C installed at $AXIS2C_HOME"
+WITH_AXIS2C=--with-axis2c=true
+fi
./autogen.sh
@@ -39,6 +41,6 @@
TUSCANY_SDOCPP=`pwd`/deploy
fi
-./configure --prefix=${TUSCANY_SDOCPP} --enable-static=no
+./configure --prefix=${TUSCANY_SDOCPP} ${WITH_AXIS2C} --enable-static=no
make
make install
Modified: incubator/tuscany/cpp/sdo/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/configure.ac?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sdo/configure.ac (original)
+++ incubator/tuscany/cpp/sdo/configure.ac Wed Nov 29 03:33:12 2006
@@ -20,7 +20,7 @@
AC_PREREQ(2.59)
AC_INIT(tuscany_sdo_cpp, 1.0-incubator-M2)
AC_CANONICAL_SYSTEM
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER(tuscany_sdo_config.h)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AC_PREFIX_DEFAULT(/usr/local/tuscany/sdo)
@@ -33,6 +33,15 @@
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
+# Check for running on Darwin
+AC_MSG_CHECKING([Checking if running on Darwin])
+UNAME=`uname -s`
+if test "x$UNAME" = "xDarwin"; then
+ AC_DEFINE([IS_DARWIN], [1], [Set to 1 when running on Darwin - Mac OSX])
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
# Check for dynamic library suffixes
AC_MSG_CHECKING([checking for dynamic library suffix])
AC_CHECK_HEADER([sys/appleapiopts.h],
@@ -55,6 +64,23 @@
AC_FUNC_ERROR_AT_LINE
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([strchr strrchr])
+
+AC_MSG_CHECKING(whether to build SDO Axiom utility)
+AC_ARG_WITH(axis2c, [AS_HELP_STRING([--with-axis2c],[build SDO Axiom utility
[default=no]])],
+[ case "${withval}" in
+ yes)
+ AC_MSG_RESULT(yes)
+ with_axis2c=true
+ ;;
+ *)
+ AC_MSG_RESULT(no)
+ with_axis2c=false
+ ;;
+ esac ],
+[ AC_MSG_RESULT(no)
+ with_axis2c=false ]
+)
+AM_CONDITIONAL([WITH_AXIS2C], [test x$with_axis2c = xtrue])
AC_CONFIG_FILES([Makefile
runtime/Makefile
Modified: incubator/tuscany/cpp/sdo/runtime/core/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/Makefile.am?view=diff&rev=480535&r1=480534&r2=480535
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/Makefile.am (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/Makefile.am Wed Nov 29 03:33:12 2006
@@ -15,4 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-SUBDIRS = src test sdo_axiom sdo_axiom_test
+if WITH_AXIS2C
+ AXIOM_UTILS = sdo_axiom sdo_axiom_test
+endif
+
+SUBDIRS = src test ${AXIOM_UTILS}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
