Author: ajborley
Date: Wed Oct 18 09:15:08 2006
New Revision: 465288
URL: http://svn.apache.org/viewvc?view=rev&rev=465288
Log:
Fix for TUSCANY-868 for the Python extension. Renames the libraries once built
and provides a script to change the name back
Added:
incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.cmd
incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.sh (with
props)
Modified:
incubator/tuscany/cpp/sca/doc/PythonExtension.html
incubator/tuscany/cpp/sca/runtime/extensions/python/deploy.bat
incubator/tuscany/cpp/sca/runtime/extensions/python/src/Makefile.am
Modified: incubator/tuscany/cpp/sca/doc/PythonExtension.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/doc/PythonExtension.html?view=diff&rev=465288&r1=465287&r2=465288
==============================================================================
--- incubator/tuscany/cpp/sca/doc/PythonExtension.html (original)
+++ incubator/tuscany/cpp/sca/doc/PythonExtension.html Wed Oct 18 09:15:08 2006
@@ -81,12 +81,14 @@
<TD><B>Download Link</B></TD>
</TR>
<TR CLASS="b">
- <TD>Python version 2.3.4 or higher</TD>
+ <TD>Python version 2.4</TD>
<TD>
<A HREF="http://www.python.org/download/";
TARGET="_blank">http://www.python.org/download/</A><BR/>
- 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>
</TBODY>
@@ -101,6 +103,12 @@
<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>Add the
<tuscany_sca_install_dir>/extensions/python/lib directory to the
PYTHONPATH 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 Python Extension
working with the source release on Linux</H3></A>
<OL>
@@ -127,6 +135,8 @@
</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 Python Extension working
with the binary release on Windows</H3></A>
@@ -135,6 +145,12 @@
<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>Add the
<tuscany_sca_install_dir>\extensions\python\bin directory to the
PYTHONPATH 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.cmd</LI>
+ </UL>
+ </LI>
</OL>
<A NAME="winsrc"><H3>Getting the Tuscany SCA Python Extension working
with the source release on Windows</H3></A>
<OL>
@@ -158,6 +174,8 @@
in Visual Studio 6 or at at
<tuscany_sca_install_dir>/projectsvc7/tuscany_sca/tuscany_sca.sln
in Visual Studio 7.1 - you can build projects individually
<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/deploy.bat
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/python/deploy.bat?view=diff&rev=465288&r1=465287&r2=465288
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/deploy.bat (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/deploy.bat Wed Oct 18
09:15:08 2006
@@ -56,10 +56,11 @@
#copy %srcdir%\tuscany\sca\python\*.h %pythonextdir%\include\tuscany\sca\python
#copy %srcdir%\tuscany\sca\python\model\*.h
%pythonextdir%\include\tuscany\sca\python\model
+copy %srcdir%\deploy.cmd %pythonextdir%
copy %srcdir%\..\xsd\*.* %pythonextdir%\xsd
copy %inpath%\tuscany_sca_python.lib %pythonextdir%\lib
-copy %inpath%\tuscany_sca_python.dll %pythonextdir%\bin
+copy %inpath%\tuscany_sca_python.dll
%pythonextdir%\bin\tuscany_sca_python.dll.disabled
if exist %inpath%\tuscany_sca_python.pdb copy %inpath%\tuscany_sca_python.pdb
%pythonextdir%\bin
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=465288&r1=465287&r2=465288
==============================================================================
--- 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:15:08 2006
@@ -19,11 +19,19 @@
lib_LTLIBRARIES = libtuscany_sca_python.la
install-exec-hook:
- cd $(libdir); ln -s -f libtuscany_sca_python.so sca.so
+ 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;
pydir=$(prefix)/extensions/python/lib
py_DATA = tuscany/sca/python/sca_proxy.py
EXTRA_DIST = tuscany/sca/python/sca_proxy.py
+
+rootdir=$(prefix)/extensions/python
+root_SCRIPTS = deploy.sh
noinst_HEADERS = \
tuscany/sca/python/*.h \
Added: 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=auto&rev=465288
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.cmd (added)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.cmd Wed Oct
18 09:15:08 2006
@@ -0,0 +1,27 @@
[EMAIL PROTECTED] off
[EMAIL PROTECTED] Licensed to the Apache Software Foundation (ASF) under one
[EMAIL PROTECTED] or more contributor license agreements. See the NOTICE file
[EMAIL PROTECTED] distributed with this work for additional information
[EMAIL PROTECTED] regarding copyright ownership. The ASF licenses this file
[EMAIL PROTECTED] to you under the Apache License, Version 2.0 (the
[EMAIL PROTECTED] "License"); you may not use this file except in compliance
[EMAIL PROTECTED] with the License. You may obtain a copy of the License at
[EMAIL PROTECTED]
[EMAIL PROTECTED] http://www.apache.org/licenses/LICENSE-2.0
[EMAIL PROTECTED]
[EMAIL PROTECTED] Unless required by applicable law or agreed to in writing,
[EMAIL PROTECTED] software distributed under the License is distributed on an
[EMAIL PROTECTED] "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
[EMAIL PROTECTED] KIND, either express or implied. See the License for the
[EMAIL PROTECTED] specific language governing permissions and limitations
[EMAIL PROTECTED] under the License.
+
+
+setlocal
+set currentPath=%~d0%~p0
+
+echo Enabling the Tuscany Python extension
+rename %currentPath%\bin\tuscany_sca_python.dll.disabled tuscany_sca_python.dll
+
+:end
+endlocal
Added: 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=auto&rev=465288
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.sh (added)
+++ incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.sh Wed Oct
18 09:15:08 2006
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+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
+
+
Propchange: incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/tuscany/cpp/sca/runtime/extensions/python/src/deploy.sh
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
