Return-Path: Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org Received: (qmail 17278 invoked from network); 18 Oct 2006 16:43:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 Oct 2006 16:43:21 -0000 Received: (qmail 2627 invoked by uid 500); 18 Oct 2006 16:43:21 -0000 Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org Received: (qmail 2605 invoked by uid 500); 18 Oct 2006 16:43:21 -0000 Mailing-List: contact tuscany-commits-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: tuscany-dev@ws.apache.org Delivered-To: mailing list tuscany-commits@ws.apache.org Received: (qmail 2591 invoked by uid 99); 18 Oct 2006 16:43:21 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Oct 2006 09:43:21 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Oct 2006 09:43:17 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 99ACB1A981A; Wed, 18 Oct 2006 09:42:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r465294 - in /incubator/tuscany/cpp/sca: ./ doc/ runtime/extensions/python/src/ runtime/extensions/ruby/ runtime/extensions/ruby/src/ Date: Wed, 18 Oct 2006 16:42:54 -0000 To: tuscany-commits@ws.apache.org From: ajborley@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061018164257.99ACB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ - Optional: Python version 2.3.4 or later + Optional: Python version 2.4 http://www.python.org/download/
This is required for building or running the Tuscany SCA Python extension (see below). - 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. - Optional: Ruby version 1.8.4 or later + Optional: Ruby version 1.8.x http://www.ruby-lang.org
This is required for building or running the Tuscany SCA Ruby extension (see below). - 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. @@ -288,6 +291,7 @@ Python 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 Python extension documentation for more details. @@ -297,8 +301,9 @@ Ruby 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 Ruby extension documentation for - more details. + more details. 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 @@ Download Link - Ruby version 1.8.4 or higher + Ruby version 1.8.x http://www.ruby-lang.org
- 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. @@ -101,6 +102,13 @@

Extract the binary tar package to a folder

Set the TUSCANY_SCACPP environment variable to point to the directory that was just extracted

Add the <tuscany_sca_install_dir>/lib directory to the LD_LIBRARY_PATH environment variable

Use the following command sequence to enable the extension: +

cd <tuscany_sca_install_dir>/extensions/python
./deploy.sh

Getting the Tuscany SCA Ruby Extension working with the source release on Linux

You will now need to follow the instructions above to enable + and use the extension.

Getting the Tuscany SCA Ruby Extension working with the binary release on Windows

@@ -132,6 +143,12 @@

Unzip the supplied zip file to a folder

Set the TUSCANY_SCACPP environment variable to point to the directory that was just unzipped

Add the <tuscany_sca_install_dir>\bin directory to the PATH environment variable

Use the following command sequence to enable the extension: +

cd <tuscany_sca_install_dir>\extensions\ruby
deploy.cmd

Getting the Tuscany SCA Ruby Extension working with the source release on Windows

Set the TUSCANY_SCACPP environment variable to point to the 'deploy' directory that was just created
You will now need to follow the instructions above to enable + and use the extension.

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