Return-Path: Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org Received: (qmail 32547 invoked from network); 9 Oct 2006 13:45:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Oct 2006 13:45:42 -0000 Received: (qmail 83473 invoked by uid 500); 9 Oct 2006 13:45:42 -0000 Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org Received: (qmail 83444 invoked by uid 500); 9 Oct 2006 13:45:42 -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 83435 invoked by uid 99); 9 Oct 2006 13:45:42 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Oct 2006 06:45:42 -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; Mon, 09 Oct 2006 06:45:40 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C4A7F1A981A; Mon, 9 Oct 2006 06:45:19 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r454380 - in /incubator/tuscany/cpp/sca: projectsvc7/tuscany_sca/ projectsvc7/tuscany_sca/tuscany_sca/ projectsvc7/tuscany_sca/tuscany_sca_cpp/ projectsvc7/tuscany_sca/tuscany_sca_python/ projectsvc7/tuscany_sca/tuscany_sca_ruby/ projectsvc... Date: Mon, 09 Oct 2006 13:45:19 -0000 To: tuscany-commits@ws.apache.org From: ajborley@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061009134519.C4A7F1A981A@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: Mon Oct 9 06:45:18 2006 New Revision: 454380 URL: http://svn.apache.org/viewvc?view=rev&rev=454380 Log: Added Windows VC7 Ruby extension build & updated all VC7 builds to use new deploy scripts Added: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ruby/ incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj (with props) incubator/tuscany/cpp/sca/runtime/extensions/python/deploy.bat (with props) incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat (with props) Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca.sln incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_cpp/tuscany_sca_cpp.vcproj incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_reference/tuscany_sca_ws_reference.vcproj incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_service/tuscany_sca_ws_service.vcproj incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp 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/samples/RubyCalculator/sample.calculator.client/runclient.bat Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca.sln URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca.sln?view=diff&rev=454380&r1=454379&r2=454380 ============================================================================== --- incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca.sln (original) +++ incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca.sln Mon Oct 9 06:45:18 2006 @@ -26,6 +26,11 @@ ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tuscany_sca_ruby", "tuscany_sca_ruby\tuscany_sca_ruby.vcproj", "{68D0C3C2-BBB8-470F-936B-5C91C318BF13}" + ProjectSection(ProjectDependencies) = postProject + {02DBB555-DFF3-448A-BC35-569640FE73D9} = {02DBB555-DFF3-448A-BC35-569640FE73D9} + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -56,6 +61,10 @@ {639AFB7F-A88C-4BCE-A2FC-A4E60CA5BCF5}.Debug.Build.0 = Debug|Win32 {639AFB7F-A88C-4BCE-A2FC-A4E60CA5BCF5}.Release.ActiveCfg = Release|Win32 {639AFB7F-A88C-4BCE-A2FC-A4E60CA5BCF5}.Release.Build.0 = Release|Win32 + {68D0C3C2-BBB8-470F-936B-5C91C318BF13}.Debug.ActiveCfg = Debug|Win32 + {68D0C3C2-BBB8-470F-936B-5C91C318BF13}.Debug.Build.0 = Debug|Win32 + {68D0C3C2-BBB8-470F-936B-5C91C318BF13}.Release.ActiveCfg = Release|Win32 + {68D0C3C2-BBB8-470F-936B-5C91C318BF13}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj?view=diff&rev=454380&r1=454379&r2=454380 ============================================================================== --- incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj (original) +++ incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca/tuscany_sca.vcproj Mon Oct 9 06:45:18 2006 @@ -21,7 +21,7 @@ + CommandLine="..\..\..\runtime\core\deploy.bat ..\..\..\ Debug"/> + CommandLine="..\..\..\runtime\core\deploy.bat ..\..\..\ Release"/> + CommandLine="..\..\..\runtime\extensions\cpp\deploy.bat ..\..\..\ Release"/> + CommandLine="..\..\..\runtime\extensions\cpp\deploy.bat ..\..\..\ Debug"/> + CommandLine="..\..\..\runtime\extensions\python\deploy.bat ..\..\..\ Debug"/> + CommandLine="..\..\..\runtime\extensions\python\deploy.bat ..\..\..\ Release"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj ------------------------------------------------------------------------------ svn:eol-style = CRLF Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj?view=diff&rev=454380&r1=454379&r2=454380 ============================================================================== --- incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj (original) +++ incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ws_dispatcher/tuscany_sca_ws_dispatcher.vcproj Mon Oct 9 06:45:18 2006 @@ -44,11 +44,7 @@ Name="VCMIDLTool"/> + CommandLine="..\..\..\runtime\extensions\ws\service\deploymodule.bat ..\..\..\ Debug"/> + Name="VCPostBuildEventTool" + CommandLine="..\..\..\runtime\extensions\ws\service\deploymodule.bat ..\..\..\ Release"/> + CommandLine="..\..\..\runtime\extensions\ws\reference\deploy.bat ..\..\..\ Debug"/> + CommandLine="..\..\..\runtime\extensions\ws\reference\deploy.bat ..\..\..\ Release"/> + CommandLine="..\..\..\runtime\extensions\ws\service\deploy.bat ..\..\..\ Release"/> + CommandLine="..\..\..\runtime\extensions\ws\service\deploy.bat ..\..\..\ Debug"/> +:end + +endlocal Propchange: incubator/tuscany/cpp/sca/runtime/extensions/python/deploy.bat ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/cpp/sca/runtime/extensions/python/deploy.bat ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: 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=auto&rev=454380 ============================================================================== --- incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat (added) +++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat Mon Oct 9 06:45:18 2006 @@ -0,0 +1,71 @@ +@echo off + +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. + + +setlocal + +if . == .%1 ( +echo sca root not specified +goto usage +) +set rootdir=%1 +set deploydir=%rootdir%\deploy +set extdir=%deploydir%\extensions +set rubyextdir=%extdir%\ruby +set srcdir=%rootdir%\runtime\extensions\ruby\src + +if . == .%2 ( +echo input directory not specified +goto usage +) +set inpath=%2 +echo %inpath% + + +if not exist %deploydir% mkdir %deploydir% +if not exist %extdir% mkdir %extdir% +if not exist %rubyextdir% mkdir %rubyextdir% +if not exist %rubyextdir%\bin mkdir %rubyextdir%\bin +if not exist %rubyextdir%\lib mkdir %rubyextdir%\lib +if not exist %rubyextdir%\include mkdir %rubyextdir%\include +if not exist %rubyextdir%\include\tuscany mkdir %rubyextdir%\include\tuscany +if not exist %rubyextdir%\include\tuscany\sca mkdir %rubyextdir%\include\tuscany\sca +if not exist %rubyextdir%\include\tuscany\sca\ruby mkdir %rubyextdir%\include\tuscany\sca\ruby +if not exist %rubyextdir%\include\tuscany\sca\ruby\model mkdir %rubyextdir%\include\tuscany\sca\ruby\model +if not exist %rubyextdir%\xsd mkdir %rubyextdir%\xsd + +del %rubyextdir%\bin\tuscany_sca_ruby.* +del %rubyextdir%\lib\*.lib + +copy %srcdir%\tuscany\sca\ruby\*.h %rubyextdir%\include\tuscany\sca\ruby +copy %srcdir%\tuscany\sca\ruby\model\*.h %rubyextdir%\include\tuscany\sca\ruby\model + +copy %srcdir%\..\xsd\*.* %rubyextdir%\xsd + +copy %inpath%\tuscany_sca_ruby.lib %rubyextdir%\lib +copy %inpath%\tuscany_sca_ruby.dll %rubyextdir%\bin + +if exist %inpath%\tuscany_sca_ruby.pdb copy %inpath%\tuscany_sca_ruby.pdb %rubyextdir%\bin + +goto end +:usage +echo Usage: deploy +:end + +endlocal Propchange: incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/tuscany/cpp/sca/runtime/extensions/ruby/deploy.bat ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp?view=diff&rev=454380&r1=454379&r2=454380 ============================================================================== --- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp (original) +++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyCompositeContext.cpp Mon Oct 9 06:45:18 2006 @@ -35,7 +35,7 @@ { // Implement the Sca::locateService module function - SCA_API VALUE tuscany_sca_ruby_locateService(VALUE module, VALUE value) + SCA_RUBY_API VALUE tuscany_sca_ruby_locateService(VALUE module, VALUE value) { // Get the default component @@ -61,7 +61,7 @@ } // Initialize the Ruby extension - SCA_API void Init_tuscany_sca_ruby() + SCA_RUBY_API void Init_tuscany_sca_ruby() { // Define the Sca::locateService() function @@ -70,7 +70,7 @@ } - SCA_API void Init_libtuscany_sca_ruby() + SCA_RUBY_API void Init_libtuscany_sca_ruby() { Init_tuscany_sca_ruby(); } Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp?view=diff&rev=454380&r1=454379&r2=454380 ============================================================================== --- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp (original) +++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp Mon Oct 9 06:45:18 2006 @@ -40,7 +40,7 @@ { // Initialize a Ruby proxy - SCA_API VALUE tuscany_sca_ruby_proxy_initialize(VALUE self, VALUE serviceProxy) + SCA_RUBY_API VALUE tuscany_sca_ruby_proxy_initialize(VALUE self, VALUE serviceProxy) { rb_iv_set(self, "@cppProxy", serviceProxy); return self; @@ -48,7 +48,7 @@ // Handle a method_missing message and dispatch to // our C++ proxy - SCA_API VALUE tuscany_sca_ruby_proxy_method_missing(int argc, VALUE* argv, VALUE self) + SCA_RUBY_API VALUE tuscany_sca_ruby_proxy_method_missing(int argc, VALUE* argv, VALUE self) { VALUE proxy = rb_iv_get(self, "@cppProxy"); 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=454380&r1=454379&r2=454380 ============================================================================== --- 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 Mon Oct 9 06:45:18 2006 @@ -22,7 +22,7 @@ #ifndef tuscany_sca_ruby_rubyserviceproxy_h #define tuscany_sca_ruby_rubyserviceproxy_h -#include "tuscany/sca/export.h" +#include "tuscany/sca/ruby/export.h" #include "tuscany/sca/core/ServiceProxy.h" #include "tuscany/sca/core/ServiceWrapper.h" #include "tuscany/sca/model/Component.h" 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=454380&r1=454379&r2=454380 ============================================================================== --- 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 Mon Oct 9 06:45:18 2006 @@ -22,12 +22,12 @@ #ifndef tuscany_sca_ruby_rubyservicewrapper_h #define tuscany_sca_ruby_rubyservicewrapper_h -#include "tuscany/sca/export.h" #include "tuscany/sca/core/ServiceWrapper.h" #include "tuscany/sca/core/Operation.h" #include "tuscany/sca/model/Component.h" #include "tuscany/sca/model/Interface.h" #include "tuscany/sca/ruby/model/RubyImplementation.h" +#include "tuscany/sca/ruby/export.h" #include @@ -48,7 +48,7 @@ * An instance of this class wraps the actual component implementation which * has been written by a developer of an SCA application. */ - class SCA_API RubyServiceWrapper : public ServiceWrapper + class SCA_RUBY_API RubyServiceWrapper : public ServiceWrapper { public: Modified: incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat?view=diff&rev=454380&r1=454379&r2=454380 ============================================================================== --- incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat (original) +++ incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/runclient.bat Mon Oct 9 06:45:18 2006 @@ -43,7 +43,7 @@ set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH% cd %TUSCANY_SCACPP_SYSTEM_ROOT%\sample.calculator.client -ruby -I%TUSCANY_SCACPP%\extensions\ruby\lib CalculatorClient.rb +ruby -I%TUSCANY_SCACPP%\extensions\ruby\bin CalculatorClient.rb :end endlocal --------------------------------------------------------------------- To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org For additional commands, e-mail: tuscany-commits-help@ws.apache.org