You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by aj...@apache.org on 2006/10/18 18:42:54 UTC
svn commit: r465294 - in /incubator/tuscany/cpp/sca: ./ doc/
runtime/extensions/python/src/ runtime/extensions/ruby/
runtime/extensions/ruby/src/
Author: ajborley
Date: Wed Oct 18 09:42:52 2006
New Revision: 465294
URL: http://svn.apache.org/viewvc?view=rev&rev=465294
Log:
Fix for TUSCANY-868 for the Python & Ruby extensions. Renames the libraries once built and provides a script to change the name back
Modified:
incubator/tuscany/cpp/sca/GettingStarted.html
incubator/tuscany/cpp/sca/doc/RubyExtension.html
incubator/tuscany/cpp/sca/runtime/extensions/python/src/Makefile.am
incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.cmd
incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.sh
incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat
incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am
Modified: incubator/tuscany/cpp/sca/GettingStarted.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/GettingStarted.html?view=diff&rev=465294&r1=465293&r2=465294
==============================================================================
--- incubator/tuscany/cpp/sca/GettingStarted.html (original)
+++ incubator/tuscany/cpp/sca/GettingStarted.html Wed Oct 18 09:42:52 2006
@@ -135,25 +135,28 @@
</TD>
</TR>
<TR CLASS="a">
- <TD><STRONG>Optional:</STRONG> Python version 2.3.4 or later</TD>
+ <TD><STRONG>Optional:</STRONG> Python version 2.4</TD>
<TD>
<A HREF="http://www.python.org/download/"
TARGET="_blank">http://www.python.org/download/</A><BR/>
This is required for building or running the Tuscany SCA Python extension
(see <A HREF="#extensions">below</A>).
- Please download and follow the installation instructions
+ Please download and follow the installation instructions. You can build
+ the Tuscany SCA Python Extension with other versions of Python - versions 2.3.4
+ and higher have been tested.
</TD>
</TR>
<TR CLASS="b">
- <TD><STRONG>Optional:</STRONG> Ruby version 1.8.4 or later</TD>
+ <TD><STRONG>Optional:</STRONG> Ruby version 1.8.x</TD>
<TD>
<A HREF="http://www.ruby-lang.org"
TARGET="_blank">http://www.ruby-lang.org</A><BR/>
This is required for building or running the Tuscany SCA Ruby extension
(see <A HREF="#extensions">below</A>).
- Please download and follow the installation instructions
+ Please download and follow the installation instructions. You should
+ be able to build the Tuscany SCA Ruby Extension with other versions of Ruby.
</TD>
</TR>
</TBODY>
@@ -288,6 +291,7 @@
<A HREF="doc/PythonExtension.html">Python</A>
</TD>
<TD>Provides a Python SCA client API and enables Python component implementations.
+ This extension is disabled by default and must be enabled to be used.
See the <A HREF="doc/PythonExtension.html">Python extension documentation</A> for
more details.
</TD>
@@ -297,8 +301,9 @@
<A HREF="doc/RubyExtension.html">Ruby</A>
</TD>
<TD>Provides a Ruby SCA client API and enables Ruby component implementations.
+ This extension is disabled by default and must be enabled to be used.
See the <A HREF="doc/RubyExtension.html">Ruby extension documentation</A> for
- more details.
+ more details.
</TD>
</TR>
</TBODY>
Modified: incubator/tuscany/cpp/sca/doc/RubyExtension.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/doc/RubyExtension.html?view=diff&rev=465294&r1=465293&r2=465294
==============================================================================
--- incubator/tuscany/cpp/sca/doc/RubyExtension.html (original)
+++ incubator/tuscany/cpp/sca/doc/RubyExtension.html Wed Oct 18 09:42:52 2006
@@ -82,12 +82,13 @@
<TD><B>Download Link</B></TD>
</TR>
<TR CLASS="b">
- <TD>Ruby version 1.8.4 or higher</TD>
+ <TD>Ruby version 1.8.x</TD>
<TD>
<A HREF="http://www.ruby-lang.org"
TARGET="_blank">http://www.ruby-lang.org</A><BR/>
- Please download and follow the installation instructions
+ Please download and follow the installation instructions. You should
+ be able to build the Tuscany SCA Ruby Extension with other versions of Ruby.
</TD>
</TR>
</TBODY>
@@ -101,6 +102,13 @@
<LI>Extract the binary tar package to a folder</LI>
<LI>Set the TUSCANY_SCACPP environment variable to point to the directory that was just extracted</LI>
<LI>Add the <tuscany_sca_install_dir>/lib directory to the LD_LIBRARY_PATH <!--(Linux) or DYLD_LIBRARY_PATH (MacOS X)--> environment variable</LI>
+ <LI>Use the following command sequence to enable the extension:
+ <UL>
+ <LI>cd <tuscany_sca_install_dir>/extensions/python</LI>
+ <LI>./deploy.sh</LI>
+ </UL>
+ </LI>
+
</OL>
<A NAME="linuxsrc"><H3>Getting the Tuscany SCA Ruby Extension working with the source release on Linux</H3></A>
<OL>
@@ -125,6 +133,9 @@
</UL>
NOTE: If you don't provide a --prefix configure option, it will by default install into
/usr/local/tuscany/sca</LI>
+ <LI>You will now need to follow the <A HREF="#linuxbin">instructions above</A> to enable
+ and use the extension.</LI>
+
</OL>
<A NAME="winbin"><H3>Getting the Tuscany SCA Ruby Extension working with the binary release on Windows</H3></A>
@@ -132,6 +143,12 @@
<LI>Unzip the supplied zip file to a folder</LI>
<LI>Set the TUSCANY_SCACPP environment variable to point to the directory that was just unzipped</LI>
<LI>Add the <tuscany_sca_install_dir>\bin directory to the PATH environment variable</LI>
+ <LI>Use the following command sequence to enable the extension:
+ <UL>
+ <LI>cd <tuscany_sca_install_dir>\extensions\ruby</LI>
+ <LI>deploy.cmd</LI>
+ </UL>
+ </LI>
</OL>
<A NAME="winsrc"><H3>Getting the Tuscany SCA Ruby Extension working with the source release on Windows</H3></A>
<OL>
@@ -156,6 +173,9 @@
in Visual Studio 7.1 - you can build projects individually
or build the samples to rebuild all the projects</LI>
<LI>Set the TUSCANY_SCACPP environment variable to point to the 'deploy' directory that was just created</LI>
+ <LI>You will now need to follow the <A HREF="#winbin">instructions above</A> to enable
+ and use the extension.</LI>
+
</OL>
</DIV>
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/Makefile.am?view=diff&rev=465294&r1=465293&r2=465294
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/Makefile.am Wed Oct 18 09:42:52 2006
@@ -21,10 +21,7 @@
install-exec-hook:
cd $(libdir); \
ln -s -f libtuscany_sca_python.so sca.so; \
- mv libtuscany_sca_python.so.0.0.0 libtuscany_sca_python.so.0.0.0.disabled; \
- mv libtuscany_sca_python.so.0.0 libtuscany_sca_python.so.0.0.disabled; \
- mv libtuscany_sca_python.so.0 libtuscany_sca_python.so.0.disabled; \
- mv libtuscany_sca_python.so libtuscany_sca_python.so.disabled;
+ for i in lib/libtuscany_sca_python.*; do mv $i $i.disabled; done
pydir=$(prefix)/extensions/python/lib
py_DATA = tuscany/sca/python/sca_proxy.py
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.cmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.cmd?view=diff&rev=465294&r1=465293&r2=465294
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.cmd (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.cmd Wed Oct 18 09:42:52 2006
@@ -24,4 +24,5 @@
rename %currentPath%\bin\tuscany_sca_python.dll.disabled tuscany_sca_python.dll
:end
+echo Done
endlocal
Modified: incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.sh?view=diff&rev=465294&r1=465293&r2=465294
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.sh (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.sh Wed Oct 18 09:42:52 2006
@@ -20,9 +20,7 @@
APFULLDIR=`pwd`
echo "Enabling the Tuscany Python extension"
-mv $APFULLDIR/lib/libtuscany_sca_python.so.0.0.0.disabled $APFULLDIR/lib/libtuscany_sca_python.so.0.0.0
-mv $APFULLDIR/lib/libtuscany_sca_python.so.0.0.disabled $APFULLDIR/lib/libtuscany_sca_python.so.0.0
-mv $APFULLDIR/lib/libtuscany_sca_python.so.0.disabled $APFULLDIR/lib/libtuscany_sca_python.so.0
-mv $APFULLDIR/lib/libtuscany_sca_python.so.disabled $APFULLDIR/lib/libtuscany_sca_python.so
+for i in lib/*.disabled; do x=${i%.disabled}; mv $i $x; done
+echo "Done"
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat?view=diff&rev=465294&r1=465293&r2=465294
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat Wed Oct 18 09:42:52 2006
@@ -59,7 +59,7 @@
copy %srcdir%\..\xsd\*.* %rubyextdir%\xsd
copy %inpath%\tuscany_sca_ruby.lib %rubyextdir%\lib
-copy %inpath%\tuscany_sca_ruby.dll %rubyextdir%\bin
+copy %inpath%\tuscany_sca_ruby.dll %rubyextdir%\bin\tuscany_sca_ruby.dll.rename-me
if exist %inpath%\tuscany_sca_ruby.pdb copy %inpath%\tuscany_sca_ruby.pdb %rubyextdir%\bin
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am?view=diff&rev=465294&r1=465293&r2=465294
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/Makefile.am Wed Oct 18 09:42:52 2006
@@ -19,7 +19,12 @@
lib_LTLIBRARIES = libtuscany_sca_ruby.la
install-exec-hook:
- cd $(libdir); ln -s -f libtuscany_sca_ruby.so tuscany_sca_ruby.so
+ cd $(libdir); \
+ ln -s -f libtuscany_sca_ruby.so tuscany_sca_ruby.so; \
+ for i in lib/libtuscany_sca_ruby.*; do mv $i $i.disabled; done
+
+rootdir=$(prefix)/extensions/ruby
+root_SCRIPTS = deploy.sh
noinst_HEADERS = \
tuscany/sca/ruby/*.h \
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org