tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajbor...@apache.org
Subject svn commit: r454399 - in /incubator/tuscany/cpp/sca: projectsvc7/tuscany_sca/tuscany_sca_python/ projectsvc7/tuscany_sca/tuscany_sca_ruby/ runtime/extensions/ruby/src/tuscany/sca/ruby/model/ samples/RubyBank/bigbank.client/
Date Mon, 09 Oct 2006 14:58:15 GMT
Author: ajborley
Date: Mon Oct  9 07:58:14 2006
New Revision: 454399

URL: http://svn.apache.org/viewvc?view=rev&rev=454399
Log:
Fixed windows build/run issues for VC7 release version of Ruby & Python extensions

Modified:
    incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj
    incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
    incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.bat

Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj?view=diff&rev=454399&r1=454398&r2=454399
==============================================================================
--- incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj
(original)
+++ incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_python/tuscany_sca_python.vcproj
Mon Oct  9 07:58:14 2006
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../runtime/extensions/python/src,../../../deploy/include,
$(TUSCANY_SDOCPP)/include, $(PYTHON_HOME)/include, $(TUSCANY_SCACPP)/extensions/cpp/include"
+				AdditionalIncludeDirectories="../../../runtime/extensions/python/src,../../../deploy/include,
$(TUSCANY_SDOCPP)/include, $(PYTHON_HOME)/include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_PYTHON_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -32,7 +32,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="tuscany_sca.lib tuscany_sdo.lib python24.lib"
+				AdditionalDependencies="tuscany_sca.lib tuscany_sdo.lib"
 				OutputFile="$(OutDir)/tuscany_sca_python.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="$(TUSCANY_SCACPP)/lib, $(TUSCANY_SDOCPP)/lib, $(PYTHON_HOME)/libs,"
@@ -71,6 +71,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../../runtime/extensions/python/src,../../../deploy/include,
$(TUSCANY_SDOCPP)/include, $(PYTHON_HOME)/include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_PYTHON_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -81,8 +82,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="tuscany_sca.lib tuscany_sdo.lib"
 				OutputFile="$(OutDir)/tuscany_sca_python.dll"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(TUSCANY_SCACPP)/lib, $(TUSCANY_SDOCPP)/lib, $(PYTHON_HOME)/libs"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
 				OptimizeReferences="2"

Modified: incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj?view=diff&rev=454399&r1=454398&r2=454399
==============================================================================
--- incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
(original)
+++ incubator/tuscany/cpp/sca/projectsvc7/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
Mon Oct  9 07:58:14 2006
@@ -71,7 +71,8 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_RUBY_EXPORTS"
+				AdditionalIncludeDirectories="../../../runtime/extensions/ruby/src;$(TUSCANY_SCACPP)/include;&quot;$(TUSCANY_SDOCPP)/include&quot;;&quot;$(RUBY_HOME)/lib/ruby/1.8/i386-mswin32&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_RUBY_EXPORTS;_MSC_VER=1200"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -81,8 +82,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="tuscany_sca.lib tuscany_sdo.lib msvcrt-ruby18.lib"
 				OutputFile="$(OutDir)/tuscany_sca_ruby.dll"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(TUSCANY_SCACPP)/lib, $(TUSCANY_SDOCPP)/lib, $(RUBY_HOME)/lib,"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -93,7 +96,7 @@
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="..\..\..\runtime\extensions\cpp\deploy.bat ..\..\..\ Release"/>
+				CommandLine="..\..\..\runtime\extensions\ruby\deploy.bat ..\..\..\ Release"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp?view=diff&rev=454399&r1=454398&r2=454399
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
(original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/model/RubyImplementation.cpp
Mon Oct  9 07:58:14 2006
@@ -75,8 +75,17 @@
                 // Load the specified Ruby script
                 if (script != "")
                 {
+                    // Convert any windows slashes \ in the root path to unix slashes /
+                    // otherwise the ruby interpreter throws an error
+                    string rootpath = getComposite()->getRoot();
+                    int pos = 0;
+                    while((pos = rootpath.find('\\', pos)) != string::npos)
+                    {
+                        rootpath = rootpath.replace(pos, 1, "/");
+                    }
+
                     // Use rb_eval_string for now as it provides better error reporting
-                    string path = "require(\"" + getComposite()->getRoot() + "/" + script
+"\")";
+                    string path = "require(\"" + rootpath + "/" + script +"\")";
                     //rb_require((char *)path.c_str());
                     rb_eval_string(path.c_str());
                 }

Modified: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.bat?view=diff&rev=454399&r1=454398&r2=454399
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.bat (original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/runclient.bat Mon Oct  9 07:58:14
2006
@@ -45,7 +45,7 @@
 set PATH=%TUSCANY_SCACPP%\bin;%TUSCANY_SDOCPP%\bin;%AXIS2C_HOME%\lib;%PATH%
 
 cd %TUSCANY_SCACPP_SYSTEM_ROOT%\bigbank.client
-ruby -I%TUSCANY_SCACPP%\extensions\ruby\lib AccountClient.rb
+ruby -I%TUSCANY_SCACPP%\extensions\ruby\bin AccountClient.rb
 
 :end
 endlocal



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message