You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2007/02/23 12:11:10 UTC
svn commit: r510904 - in /incubator/tuscany/cpp/sca: ./
runtime/extensions/ws/reference/ runtime/extensions/ws/service/ samples/
samples/AlertAggregator/httpserver/ samples/CppBigBank/bigbank.client/
Author: robbinspg
Date: Fri Feb 23 03:11:07 2007
New Revision: 510904
URL: http://svn.apache.org/viewvc?view=rev&rev=510904
Log:
linux build changes: remove --with-axis2c option
Modified:
incubator/tuscany/cpp/sca/build.sh
incubator/tuscany/cpp/sca/configure.ac
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/AlertAggregator/httpserver/startserver.sh
incubator/tuscany/cpp/sca/samples/CppBigBank/bigbank.client/Makefile.am
incubator/tuscany/cpp/sca/samples/Makefile.am
incubator/tuscany/cpp/sca/samples/build.sh
incubator/tuscany/cpp/sca/samples/configure.ac
Modified: incubator/tuscany/cpp/sca/build.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/build.sh?view=diff&rev=510904&r1=510903&r2=510904
==============================================================================
--- incubator/tuscany/cpp/sca/build.sh (original)
+++ incubator/tuscany/cpp/sca/build.sh Fri Feb 23 03:11:07 2007
@@ -22,9 +22,11 @@
if [ x$AXIS2C_HOME = x ]; then
echo "AXIS2C_HOME not set. Not building Axis2C WS binding extensions"
+ENABLE_WS=--enable-wsbinding=no
else
echo "Using Axis2C installed at $AXIS2C_HOME"
-WITH_AXIS2C=--with-axis2c
+ENABLE_SCABINDING=--enable-scabinding
+ENABLE_WS=--enable-wsbinding
fi
if [ x$TUSCANY_SDOCPP = x ]; then
@@ -75,7 +77,7 @@
export TUSCANY_SCACPP=`pwd`/deploy
fi
-./configure --prefix=${TUSCANY_SCACPP} --enable-static=no ${WITH_AXIS2C} ${ENABLE_RUBY} ${ENABLE_PYTHON} ${ENABLE_REST}
+./configure --prefix=${TUSCANY_SCACPP} --enable-static=no ${ENABLE_WS} ${ENABLE_SCABINDING} ${ENABLE_RUBY} ${ENABLE_PYTHON} ${ENABLE_REST}
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=510904&r1=510903&r2=510904
==============================================================================
--- incubator/tuscany/cpp/sca/configure.ac (original)
+++ incubator/tuscany/cpp/sca/configure.ac Fri Feb 23 03:11:07 2007
@@ -118,23 +118,6 @@
)
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]])],
[ case "${enableval}" in
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=510904&r1=510903&r2=510904
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/Makefile.am Fri Feb 23 03:11:07 2007
@@ -15,8 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-if WITH_AXIS2C
- AXIS2C_SUBDIRS = axis2c
-endif
-
-SUBDIRS = ${AXIS2C_SUBDIRS}
+SUBDIRS = axis2c
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=510904&r1=510903&r2=510904
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/service/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/service/Makefile.am Fri Feb 23 03:11:07 2007
@@ -15,7 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-if WITH_AXIS2C
- AXIS2C_SUBDIRS = axis2c
-endif
-SUBDIRS = ${AXIS2C_SUBDIRS}
+SUBDIRS = axis2c
Modified: incubator/tuscany/cpp/sca/samples/AlertAggregator/httpserver/startserver.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/AlertAggregator/httpserver/startserver.sh?view=diff&rev=510904&r1=510903&r2=510904
==============================================================================
--- incubator/tuscany/cpp/sca/samples/AlertAggregator/httpserver/startserver.sh (original)
+++ incubator/tuscany/cpp/sca/samples/AlertAggregator/httpserver/startserver.sh Fri Feb 23 03:11:07 2007
@@ -31,14 +31,20 @@
fi
echo "Using SDO installed at $TUSCANY_SDOCPP"
-export LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/python/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$AXIS2C_HOME/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$TUSCANY_SCACPP/extensions/python/lib:$TUSCANY_SCACPP/extensions/ruby/lib:$TUSCANY_SCACPP/lib:$TUSCANY_SDOCPP/lib:$LD_LIBRARY_PATH
export TUSCANY_SCACPP_ROOT=$APFULLDIR/../
export TUSCANY_SCACPP_BASE_URI=http://localhost:9090
+libsuffix=.so
+UNAME=`uname -s`
+if [ "x$UNAME" = "xDarwin" ]; then
+ libsuffix=.dylib
+fi
+
# Generate the mod_rest configuration
if [ ! -f conf/tuscany_sca_mod_rest.conf ]; then
- echo "LoadModule sca_rest_module $TUSCANY_SCACPP/extensions/rest/service/lib/libtuscany_sca_mod_rest.so.0.0.0" >conf/tuscany_sca_mod_rest.conf
+ echo "LoadModule sca_rest_module $TUSCANY_SCACPP/extensions/rest/service/lib/libtuscany_sca_mod_rest$libsuffix" >conf/tuscany_sca_mod_rest.conf
echo "TuscanyHome $TUSCANY_SCACPP" >>conf/tuscany_sca_mod_rest.conf
echo "<Location /rest>" >>conf/tuscany_sca_mod_rest.conf
echo " SetHandler sca_rest_module" >>conf/tuscany_sca_mod_rest.conf
Modified: incubator/tuscany/cpp/sca/samples/CppBigBank/bigbank.client/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/CppBigBank/bigbank.client/Makefile.am?view=diff&rev=510904&r1=510903&r2=510904
==============================================================================
--- incubator/tuscany/cpp/sca/samples/CppBigBank/bigbank.client/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/CppBigBank/bigbank.client/Makefile.am Fri Feb 23 03:11:07 2007
@@ -27,20 +27,7 @@
account_client_LDADD = -L${TUSCANY_SCACPP}/lib -ltuscany_sca \
-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
+ -L${TUSCANY_SDOCPP}/lib -ltuscany_sdo
INCLUDES = -I$(TUSCANY_SCACPP)/extensions/cpp/include \
Modified: incubator/tuscany/cpp/sca/samples/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Makefile.am?view=diff&rev=510904&r1=510903&r2=510904
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/Makefile.am Fri Feb 23 03:11:07 2007
@@ -16,19 +16,13 @@
# under the License.
if WANT_ALL_SAMPLES
- CPP_SAMPLES = CppCalculator
-if WITH_AXIS2C
- CPP_AXIS2C_SAMPLES = CppBigBank
-endif
+ CPP_SAMPLES = CppCalculator CppBigBank
PYTHON_SAMPLES = PythonCalculator PythonWeatherForecast RestCustomer AlertAggregator
RUBY_SAMPLES = RubyCalculator RubyBigBank HttpdBigBank RestCalculator
PYTHON_RUBY_SAMPLES = RestYahoo
else
if WANT_CPP_SAMPLES
- CPP_SAMPLES = CppCalculator
-if WITH_AXIS2C
- CPP_AXIS2C_SAMPLES = CppBigBank
-endif
+ CPP_SAMPLES = CppCalculator CppBigBank
endif
if WANT_PYTHON_SAMPLES
PYTHON_SAMPLES = PythonCalculator PythonWeatherForecast RestCustomer AlertAggregator
@@ -43,6 +37,6 @@
PHP_SAMPLES = PHPCalculator
endif
endif
-SUBDIRS = ${CPP_SAMPLES} ${CPP_AXIS2C_SAMPLES} ${PYTHON_SAMPLES} ${RUBY_SAMPLES} ${PYTHON_RUBY_SAMPLES} ${PHP_SAMPLES}
+SUBDIRS = ${CPP_SAMPLES} ${PYTHON_SAMPLES} ${RUBY_SAMPLES} ${PYTHON_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=510904&r1=510903&r2=510904
==============================================================================
--- incubator/tuscany/cpp/sca/samples/build.sh (original)
+++ incubator/tuscany/cpp/sca/samples/build.sh Fri Feb 23 03:11:07 2007
@@ -30,12 +30,6 @@
fi
echo "Using SDO installed at $TUSCANY_SDOCPP"
-if [ x$AXIS2C_HOME = x ]; then
-echo "AXIS2C_HOME not set. Not building Axis2C WS samples"
-else
-echo "Using Axis2C installed at $AXIS2C_HOME"
-WITH_AXIS2C=--with-axis2c
-fi
if [ x$PYTHON_LIB = x ]; then
echo "PYTHON_LIB not set. Python samples will not be built"
@@ -57,7 +51,7 @@
ENABLE_RUBY=--enable-ruby
fi
-./configure --prefix=${TUSCANY_SCACPP} --enable-static=no ${WITH_AXIS2C} ${ENABLE_RUBY} ${ENABLE_PYTHON}
+./configure --prefix=${TUSCANY_SCACPP} --enable-static=no ${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=510904&r1=510903&r2=510904
==============================================================================
--- incubator/tuscany/cpp/sca/samples/configure.ac (original)
+++ incubator/tuscany/cpp/sca/samples/configure.ac Fri Feb 23 03:11:07 2007
@@ -100,23 +100,6 @@
)
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]])],
[ case "${enableval}" in
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org