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 2006/10/10 14:50:56 UTC
svn commit: r454724 - in /incubator/tuscany/cpp/sca: ./
runtime/extensions/ruby/src/tuscany/sca/ruby/
runtime/extensions/ruby/src/tuscany/sca/ruby/model/
Author: robbinspg
Date: Tue Oct 10 05:50:56 2006
New Revision: 454724
URL: http://svn.apache.org/viewvc?view=rev&rev=454724
Log:
TUSCANY-783 - intelligent build of extensions
+ fix header name in Ruby
Modified:
incubator/tuscany/cpp/sca/build.sh
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
Modified: incubator/tuscany/cpp/sca/build.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/build.sh?view=diff&rev=454724&r1=454723&r2=454724
==============================================================================
--- incubator/tuscany/cpp/sca/build.sh (original)
+++ incubator/tuscany/cpp/sca/build.sh Tue Oct 10 05:50:56 2006
@@ -31,13 +31,31 @@
fi
echo "Using SDO installed at $TUSCANY_SDOCPP"
+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"
+else
+echo "Building PYTHON extension with Python 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
+
cd ${TUSCANY_SCACPP_HOME}/samples
./autogen.sh
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_RUBY} ${ENABLE_PYTHON}
make
make install
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h?view=diff&rev=454724&r1=454723&r2=454724
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.h Tue Oct 10 05:50:56 2006
@@ -31,7 +31,7 @@
using namespace tuscany::sca::model;
-#include "tuscany/sca/ruby/ruby.h"
+#include "tuscany/sca/ruby/Ruby.h"
namespace tuscany
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h?view=diff&rev=454724&r1=454723&r2=454724
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.h Tue Oct 10 05:50:56 2006
@@ -29,7 +29,7 @@
#include "tuscany/sca/ruby/model/RubyImplementation.h"
#include "tuscany/sca/ruby/export.h"
-#include "tuscany/sca/ruby/ruby.h"
+#include "tuscany/sca/ruby/Ruby.h"
using namespace tuscany::sca::model;
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h?view=diff&rev=454724&r1=454723&r2=454724
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.h Tue Oct 10 05:50:56 2006
@@ -29,7 +29,7 @@
#include <string>
using std::string;
-#include "tuscany/sca/ruby/ruby.h"
+#include "tuscany/sca/ruby/Ruby.h"
using namespace tuscany::sca::model;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org