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 15:56:36 UTC
svn commit: r510969 - in /incubator/tuscany/cpp/sca: builddist.sh
configure.ac makebindist.sh samples/PHPCalculator/Makefile.am
samples/RestCustomer/sample.customer/Makefile.am
Author: robbinspg
Date: Fri Feb 23 06:56:35 2007
New Revision: 510969
URL: http://svn.apache.org/viewvc?view=rev&rev=510969
Log:
linux M3 package build
Modified:
incubator/tuscany/cpp/sca/builddist.sh
incubator/tuscany/cpp/sca/configure.ac
incubator/tuscany/cpp/sca/makebindist.sh
incubator/tuscany/cpp/sca/samples/PHPCalculator/Makefile.am
incubator/tuscany/cpp/sca/samples/RestCustomer/sample.customer/Makefile.am
Modified: incubator/tuscany/cpp/sca/builddist.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/builddist.sh?view=diff&rev=510969&r1=510968&r2=510969
==============================================================================
--- incubator/tuscany/cpp/sca/builddist.sh (original)
+++ incubator/tuscany/cpp/sca/builddist.sh Fri Feb 23 06:56:35 2007
@@ -21,10 +21,14 @@
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"
+
+ENABLE_WS=--enable-wsbinding=no
+else
echo "Using Axis2C installed at $AXIS2C_HOME"
+ENABLE_SCABINDING=--enable-scabinding
+ENABLE_WS=--enable-wsbinding
+fi
if [ x$TUSCANY_SDOCPP = x ]; then
echo "TUSCANY_SDOCPP not set"
@@ -32,37 +36,46 @@
fi
echo "Using SDO installed at $TUSCANY_SDOCPP"
-if [ x$PYTHON_INCLUDE = x ]; then
-echo "PYTHON_INCLUDE not set"
-exit;
-fi
if [ x$PYTHON_LIB = x ]; then
-echo "PYTHON_LIB not set"
-exit;
-fi
-if [ x$PYTHON_VERSION = x ]; then
-echo "PYTHON_VERSION not set"
-exit;
-fi
+echo "PYTHON_LIB not set. Python extension will not be built"
+elif [ x$PYTHON_INCLUDE = x ]; then
+echo "PYTHON_INCLUDE not set. Python extension will not be built"
+elif [ x$PYTHON_VERSION = x ]; then
+echo "PYTHON_VERSION not set. Python extension will not be built"
+else
echo "Building PYTHON extension with Python $PYTHON_VERSION installed at $PYTHON_LIB, $PYTHON_INCLUDE"
-
-if [ x$RUBY_INCLUDE = x ]; then
-echo "RUBY_INCLUDE not set"
-exit;
+ENABLE_PYTHON=--enable-python
fi
+
if [ x$RUBY_LIB = x ]; then
-echo "RUBY_LIB not set"
-exit;
-fi
+echo "RUBY_LIB not set. Ruby extension will not be built"
+elif [ x$RUBY_INCLUDE = x ]; then
+echo "RUBY_INCLUDE not set. Ruby extension will not be built"
+else
echo "Building Ruby extension with Ruby installed at $RUBY_LIB, $RUBY_INCLUDE"
+ENABLE_RUBY=--enable-ruby
+fi
+
+if [ x$CURL_LIB = x ]; then
+echo "CURL_LIB not set. REST extension will not be built"
+elif [ x$CURL_INCLUDE = x ]; then
+echo "CURL_INCLUDE not set. REST extension will not be built"
+elif [ x$HTTPD_INCLUDE = x ]; then
+echo "HTTPD_INCLUDE not set. REST extension will not be built"
+elif [ x$APR_INCLUDE = x ]; then
+echo "APR_INCLUDE not set. REST extension will not be built"
+else
+echo "Building REST extension using HTTPD from $HTTPD_INCLUDE, APR from $APR_INCLUDE and libCURL from $CURL_LIB"
+ENABLE_REST=--enable-restbinding
+fi
cd ${TUSCANY_SCACPP_HOME}/samples
./autogen.sh
-./configure --prefix=${TUSCANY_SCACPP_HOME}/deploy --enable-static=no --enable-python=yes --enable-ruby=yes
+./configure --prefix=${TUSCANY_SCACPP} --enable-static=no ${ENABLE_RUBY} ${ENABLE_PYTHON}
cd $TUSCANY_SCACPP_HOME
./autogen.sh
-./configure --prefix=${TUSCANY_SCACPP_HOME}/deploy --enable-static=no --enable-python=yes --enable-ruby=yes
+./configure --prefix=${TUSCANY_SCACPP} --enable-static=no ${ENABLE_WS} ${ENABLE_SCABINDING} ${ENABLE_RUBY} ${ENABLE_PYTHON} ${ENABLE_REST}
make bindist
Modified: incubator/tuscany/cpp/sca/configure.ac
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/configure.ac?view=diff&rev=510969&r1=510968&r2=510969
==============================================================================
--- incubator/tuscany/cpp/sca/configure.ac (original)
+++ incubator/tuscany/cpp/sca/configure.ac Fri Feb 23 06:56:35 2007
@@ -18,7 +18,7 @@
dnl run autogen.sh to generate the configure script.
AC_PREREQ(2.59)
-AC_INIT(tuscany_sca_cpp, 1.0-incubator-M2)
+AC_INIT(tuscany_sca_cpp, 1.0-incubator-M3)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(tuscany_sca_config.h)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
Modified: incubator/tuscany/cpp/sca/makebindist.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/makebindist.sh?view=diff&rev=510969&r1=510968&r2=510969
==============================================================================
--- incubator/tuscany/cpp/sca/makebindist.sh (original)
+++ incubator/tuscany/cpp/sca/makebindist.sh Fri Feb 23 06:56:35 2007
@@ -20,10 +20,14 @@
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"
+
+ENABLE_WS=--enable-wsbinding=no
+else
echo "Using Axis2C installed at $AXIS2C_HOME"
+ENABLE_SCABINDING=--enable-scabinding
+ENABLE_WS=--enable-wsbinding
+fi
if [ x$TUSCANY_SDOCPP = x ]; then
echo "TUSCANY_SDOCPP not set"
@@ -51,8 +55,21 @@
ENABLE_RUBY=--enable-ruby
fi
+if [ x$CURL_LIB = x ]; then
+echo "CURL_LIB not set. REST extension will not be built"
+elif [ x$CURL_INCLUDE = x ]; then
+echo "CURL_INCLUDE not set. REST extension will not be built"
+elif [ x$HTTPD_INCLUDE = x ]; then
+echo "HTTPD_INCLUDE not set. REST extension will not be built"
+elif [ x$APR_INCLUDE = x ]; then
+echo "APR_INCLUDE not set. REST extension will not be built"
+else
+echo "Building REST extension using HTTPD from $HTTPD_INCLUDE, APR from $APR_INCLUDE and libCURL from $CURL_LIB"
+ENABLE_REST=--enable-restbinding
+fi
+
cd $TUSCANY_SCACPP_HOME
-./configure --prefix=${TUSCANY_SCACPP_HOME}/deploy --enable-static=no ${ENABLE_RUBY} ${ENABLE_PYTHON}
+./configure --prefix=${TUSCANY_SCACPP_HOME}/deploy --enable-static=no ${ENABLE_WS} ${ENABLE_SCABINDING} ${ENABLE_RUBY} ${ENABLE_PYTHON} ${ENABLE_REST}
make
make install
Modified: incubator/tuscany/cpp/sca/samples/PHPCalculator/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PHPCalculator/Makefile.am?view=diff&rev=510969&r1=510968&r2=510969
==============================================================================
--- incubator/tuscany/cpp/sca/samples/PHPCalculator/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/PHPCalculator/Makefile.am Fri Feb 23 06:56:35 2007
@@ -22,5 +22,5 @@
deploydir=$(prefix)/samples/PHPCalculator/deploy
# SUBDIRS = sample.calculator sample.calculator.client ${WSBINDING_SAMPLE}
SUBDIRS = sample.calculator
-EXTRA_DIST = *.php *.composite README.html
+EXTRA_DIST = *.php *.composite
deploy_DATA = *.composite
Modified: incubator/tuscany/cpp/sca/samples/RestCustomer/sample.customer/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RestCustomer/sample.customer/Makefile.am?view=diff&rev=510969&r1=510968&r2=510969
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RestCustomer/sample.customer/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/samples/RestCustomer/sample.customer/Makefile.am Fri Feb 23 06:56:35 2007
@@ -19,4 +19,4 @@
compositedir=$(deploydir)/sample.customer
composite_DATA = *.composite *.py *.xsd *.xml
-EXTRA_DIST = *.composite *.py runwsserver.sh *.xsd *.xml
+EXTRA_DIST = *.composite *.py *.xsd *.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org