You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2007/03/13 11:59:29 UTC
svn commit: r517643 - in /incubator/tuscany/cpp/sca: ./
VSExpress/tuscany_sca/tuscany_sca_rest_mod_rest/
VSExpress/tuscany_sca/tuscany_sca_rest_reference/
VSExpress/tuscany_sca/tuscany_sca_rest_service/
VSExpress/tuscany_sca/tuscany_sca_ruby/
Author: robbinspg
Date: Tue Mar 13 03:59:27 2007
New Revision: 517643
URL: http://svn.apache.org/viewvc?view=rev&rev=517643
Log:
Conditionally build extensions on windows
Modified:
incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_mod_rest/tuscany_sca_rest_mod_rest.vcproj
incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_reference/tuscany_sca_rest_reference.vcproj
incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_service/tuscany_sca_rest_service.vcproj
incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
incubator/tuscany/cpp/sca/build.bat
incubator/tuscany/cpp/sca/builddist.bat
Modified: incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_mod_rest/tuscany_sca_rest_mod_rest.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_mod_rest/tuscany_sca_rest_mod_rest.vcproj?view=diff&rev=517643&r1=517642&r2=517643
==============================================================================
--- incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_mod_rest/tuscany_sca_rest_mod_rest.vcproj (original)
+++ incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_mod_rest/tuscany_sca_rest_mod_rest.vcproj Tue Mar 13 03:59:27 2007
@@ -49,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="$(HTTPD_HOME)/include,../../../runtime/extensions/rest/interface/src,../../../runtime/extensions/rest/service/httpd/src,../../../runtime/core/src,$(TUSCANY_SDOCPP)/include"
+ AdditionalIncludeDirectories=""$(HTTPD_HOME)/include";../../../runtime/extensions/rest/interface/src;../../../runtime/extensions/rest/service/httpd/src;../../../runtime/core/src;"$(TUSCANY_SDOCPP)/include""
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_REST_MOD_REST_EXPORTS"
StringPooling="true"
RuntimeLibrary="2"
@@ -78,7 +78,7 @@
OutputFile=".\Release/tuscany_sca_mod_rest.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="..\..\..\deploy\extensions\rest\interface\lib,..\..\..\deploy\extensions\rest\service\lib,..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib,$(HTTPD_HOME)\lib"
+ AdditionalLibraryDirectories=""$(HTTPD_HOME)\lib";..\..\..\deploy\extensions\rest\interface\lib;..\..\..\deploy\extensions\rest\service\lib;..\..\..\deploy\lib;"$(TUSCANY_SDOCPP)\lib";$(NOINHERIT)"
ProgramDatabaseFile=".\Release/tuscany_sca_mod_rest.pdb"
ImportLibrary=".\Release/tuscany_sca_mod_rest.lib"
TargetMachine="1"
@@ -145,7 +145,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(HTTPD_HOME)/include,../../../runtime/extensions/rest/interface/src,../../../runtime/extensions/rest/service/httpd/src,../../../runtime/core/src,$(TUSCANY_SDOCPP)/include"
+ AdditionalIncludeDirectories=""$(HTTPD_HOME)/include";../../../runtime/extensions/rest/interface/src;../../../runtime/extensions/rest/service/httpd/src;../../../runtime/core/src;"$(TUSCANY_SDOCPP)/include""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TUSCANY_SCA_REST_MOD_REST_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -175,7 +175,7 @@
OutputFile=".\Debug/tuscany_sca_mod_rest.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="$(HTTPD_HOME)\lib,..\..\..\deploy\extensions\rest\interface\lib,..\..\..\deploy\extensions\rest\service\lib,..\..\..\deploy\lib,$(TUSCANY_SDOCPP)\lib"
+ AdditionalLibraryDirectories=""$(HTTPD_HOME)\lib";..\..\..\deploy\extensions\rest\interface\lib;..\..\..\deploy\extensions\rest\service\lib;..\..\..\deploy\lib;"$(TUSCANY_SDOCPP)\lib";$(NOINHERIT)"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/tuscany_sca_mod_rest.pdb"
ImportLibrary=".\Debug/tuscany_sca_mod_rest.lib"
Modified: incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_reference/tuscany_sca_rest_reference.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_reference/tuscany_sca_rest_reference.vcproj?view=diff&rev=517643&r1=517642&r2=517643
==============================================================================
--- incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_reference/tuscany_sca_rest_reference.vcproj (original)
+++ incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_reference/tuscany_sca_rest_reference.vcproj Tue Mar 13 03:59:27 2007
@@ -74,7 +74,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcurl_imp.lib tuscany_sca_rest_interface.lib tuscany_sdo_axiom.lib tuscany_sca.lib tuscany_sdo.lib $(NOINHERIT)"
+ AdditionalDependencies="libcurl_imp.lib tuscany_sca_rest_interface.lib tuscany_sca.lib tuscany_sdo.lib $(NOINHERIT)"
OutputFile=".\Debug/tuscany_sca_rest_reference.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -172,7 +172,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcurl_imp.lib tuscany_sca_rest_interface.lib tuscany_sdo_axiom.lib tuscany_sca.lib tuscany_sdo.lib $(NOINHERIT)"
+ AdditionalDependencies="libcurl_imp.lib tuscany_sca_rest_interface.lib tuscany_sca.lib tuscany_sdo.lib $(NOINHERIT)"
OutputFile=".\Release/tuscany_sca_rest_reference.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
Modified: incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_service/tuscany_sca_rest_service.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_service/tuscany_sca_rest_service.vcproj?view=diff&rev=517643&r1=517642&r2=517643
==============================================================================
--- incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_service/tuscany_sca_rest_service.vcproj (original)
+++ incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_rest_service/tuscany_sca_rest_service.vcproj Tue Mar 13 03:59:27 2007
@@ -74,7 +74,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="tuscany_sdo_axiom.lib tuscany_sca.lib tuscany_sdo.lib $(NOINHERIT)"
+ AdditionalDependencies="tuscany_sca.lib tuscany_sdo.lib $(NOINHERIT)"
OutputFile=".\Release/tuscany_sca_rest_service.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -171,7 +171,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="tuscany_sdo_axiom.lib tuscany_sca.lib tuscany_sdo.lib $(NOINHERIT)"
+ AdditionalDependencies="tuscany_sca.lib tuscany_sdo.lib $(NOINHERIT)"
OutputFile=".\Debug/tuscany_sca_rest_service.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
Modified: incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj?view=diff&rev=517643&r1=517642&r2=517643
==============================================================================
--- incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj (original)
+++ incubator/tuscany/cpp/sca/VSExpress/tuscany_sca/tuscany_sca_ruby/tuscany_sca_ruby.vcproj Tue Mar 13 03:59:27 2007
@@ -108,7 +108,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="..\..\..\runtime\extensions\ruby\xtension\deploy.bat ..\..\..\ Release"
+ CommandLine="..\..\..\runtime\extensions\ruby\extension\deploy.bat ..\..\..\ Release"
/>
</Configuration>
<Configuration
Modified: incubator/tuscany/cpp/sca/build.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/build.bat?view=diff&rev=517643&r1=517642&r2=517643
==============================================================================
--- incubator/tuscany/cpp/sca/build.bat (original)
+++ incubator/tuscany/cpp/sca/build.bat Tue Mar 13 03:59:27 2007
@@ -34,12 +34,6 @@
)
echo using LIBXML2: %LIBXML2_HOME%
-if "%AXIS2C_HOME%" == "" (
-echo "AXIS2C_HOME not set"
-goto end
-)
-echo using Axis2C: %AXIS2C_HOME%"
-
if "%TUSCANY_SDOCPP%" == "" (
echo "TUSCANY_SDOCPP not set"
goto end
@@ -47,15 +41,20 @@
echo using Tuscany SDOCPP: %TUSCANY_SDOCPP%
call vcvars32
-echo building Tuscany SCA C++ core + cpp and ws extensions
+
+echo building Tuscany Native core
cd vsexpress\tuscany_sca
-call vcbuild tuscany_sca.sln "%config%|Win32"
+call vcbuild tuscany_sca\tuscany_sca.vcproj "%config%|Win32"
+
+echo building Tuscany Native cpp extension
+call vcbuild tuscany_sca_cpp\tuscany_sca_cpp.vcproj "%config%|Win32"
+
if "%PYTHON_HOME%" == "" (
echo PYTHON_HOME not set. Skipping build of Python extension
goto pythonend
)
-echo building Python extension
+echo building Python extension using Python %PYTHON_HOME%
call vcbuild tuscany_sca_python\tuscany_sca_python.vcproj "%config%|Win32"
:pythonend
@@ -63,9 +62,46 @@
echo RUBY_HOME not set. Skipping build of Ruby extension
goto rubyend
)
-echo building Ruby extension
+echo building Ruby extension using Ruby %RUBY_HOME
+call vcbuild tuscany_sca_ruby_lang\tuscany_sca_ruby_lang.vcproj "%config%|Win32"
call vcbuild tuscany_sca_ruby\tuscany_sca_ruby.vcproj "%config%|Win32"
:rubyend
+
+if "%AXIS2C_HOME%" == "" (
+echo AXIS2C_HOME not set. Skipping build of ws and sca extensions
+goto wsend
+)
+echo using Axis2C: %AXIS2C_HOME%"
+echo building Tuscany Native ws extension
+call vcbuild tuscany_sca_ws_reference\tuscany_sca_ws_reference.vcproj "%config%|Win32"
+call vcbuild tuscany_sca_ws_service\tuscany_sca_ws_service.vcproj "%config%|Win32"
+call vcbuild tuscany_sca_ws_dispatcher\tuscany_sca_ws_dispatcher.vcproj "%config%|Win32"
+
+
+call vcbuild tuscany_sca_scabinding_reference\tuscany_sca_scabinding_reference.vcproj "%config%|Win32"
+call vcbuild tuscany_sca_scabinding_service\tuscany_sca_scabinding_service.vcproj "%config%|Win32"
+
+:wsend
+
+if "%HTTPD_HOME%" == "" (
+echo HTTPD_HOME not set. Skipping build of REST extension
+goto restend
+)
+if "%LIBCURL_HOME%" == "" (
+echo LIBCURL_HOME not set. Skipping build of REST extension
+goto restend
+)
+
+echo building REST extension using HTTPD %HTTPD_HOME% and CURL %LIBCURL_HOME%
+call vcbuild tuscany_sca_rest_interface\tuscany_sca_rest_interface.vcproj "%config%|Win32"
+call vcbuild tuscany_sca_rest_reference\tuscany_sca_rest_reference.vcproj "%config%|Win32"
+call vcbuild tuscany_sca_rest_service\tuscany_sca_rest_service.vcproj "%config%|Win32"
+call vcbuild tuscany_sca_rest_mod_rest\tuscany_sca_rest_mod_rest.vcproj "%config%|Win32"
+
+
+:restend
+
+
:end
Modified: incubator/tuscany/cpp/sca/builddist.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/builddist.bat?view=diff&rev=517643&r1=517642&r2=517643
==============================================================================
--- incubator/tuscany/cpp/sca/builddist.bat (original)
+++ incubator/tuscany/cpp/sca/builddist.bat Tue Mar 13 03:59:27 2007
@@ -146,12 +146,10 @@
echo Building SCA....
-set TUSCANY_SCACPP=%FROM_DIR%\deploy
-cd %FROM_DIR%
-call build
+set TUSCANY_SCACPP=%TO_SRC%%SRC_PACKAGE%\deploy
-copy %FROM_DIR%\tools\scagen\bld\scagen.jar %FROM_DIR%\deploy\bin
-copy %FROM_DIR%\tools\scagen\bld\scagen.bat %FROM_DIR%\deploy\bin
+cd %TO_SRC%%SRC_PACKAGE%
+call build
echo Installing SCA....
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org