Author: ajborley
Date: Tue Oct 17 05:00:58 2006
New Revision: 464910
URL: http://svn.apache.org/viewvc?view=rev&rev=464910
Log:
Make sure the Python and Ruby extensions/samples are built in a distribution.
Also enable sample building to check for and build Ruby & Python samples if the
approproate env variables are set
Modified:
incubator/tuscany/cpp/sca/makedist.sh
incubator/tuscany/cpp/sca/samples/build.sh
incubator/tuscany/cpp/sdo/makedist.sh
Modified: incubator/tuscany/cpp/sca/makedist.sh
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/makedist.sh?view=diff&rev=464910&r1=464909&r2=464910
==============================================================================
--- incubator/tuscany/cpp/sca/makedist.sh (original)
+++ incubator/tuscany/cpp/sca/makedist.sh Tue Oct 17 05:00:58 2006
@@ -32,13 +32,37 @@
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 "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;
+fi
+if [ x$RUBY_LIB = x ]; then
+echo "RUBY_LIB not set"
+exit;
+fi
+echo "Building Ruby extension with Ruby installed at $RUBY_LIB, $RUBY_INCLUDE"
+
cd ${TUSCANY_SCACPP_HOME}/samples
./autogen.sh
-./configure --prefix=${TUSCANY_SCACPP_HOME}/deploy --enable-static=no
+./configure --prefix=${TUSCANY_SCACPP_HOME}/deploy --enable-static=no
--enable-python=yes --enable-ruby=yes
cd $TUSCANY_SCACPP_HOME
./autogen.sh
-./configure --prefix=${TUSCANY_SCACPP_HOME}/deploy --enable-static=no
+./configure --prefix=${TUSCANY_SCACPP_HOME}/deploy --enable-static=no
--enable-python=yes --enable-ruby=yes
make bindist
Modified: incubator/tuscany/cpp/sca/samples/build.sh
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/build.sh?view=diff&rev=464910&r1=464909&r2=464910
==============================================================================
--- incubator/tuscany/cpp/sca/samples/build.sh (original)
+++ incubator/tuscany/cpp/sca/samples/build.sh Tue Oct 17 05:00:58 2006
@@ -36,7 +36,27 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
-./configure --prefix=${TUSCANY_SCACPP} --enable-static=no
+if [ x$PYTHON_LIB = x ]; then
+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"
+ENABLE_PYTHON=--enable-python
+fi
+
+if [ x$RUBY_LIB = x ]; then
+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
+
+./configure --prefix=${TUSCANY_SCACPP} --enable-static=no ${ENABLE_RUBY}
${ENABLE_PYTHON}
make
make install
Modified: incubator/tuscany/cpp/sdo/makedist.sh
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/makedist.sh?view=diff&rev=464910&r1=464909&r2=464910
==============================================================================
--- incubator/tuscany/cpp/sdo/makedist.sh (original)
+++ incubator/tuscany/cpp/sdo/makedist.sh Tue Oct 17 05:00:58 2006
@@ -25,6 +25,16 @@
fi
echo "Using Axis2C installed at $AXIS2C_HOME"
+if [ x$LIBXML2_INCLUDE = x ]; then
+echo "LIBXML2_INCLUDE not set"
+exit;
+fi
+if [ x$LIBXML2_LIB = x ]; then
+echo "LIBXML2_LIB not set"
+exit;
+fi
+echo "Using libxml2 installed at $LIBXML2_LIB, $LIBXML2_INCLUDE"
+
cd ${TUSCANY_SDOCPP_HOME}/samples
./autogen.sh
./configure --prefix=${TUSCANY_SDOCPP_HOME}/deploy --enable-static=no
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]