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 2006/06/29 13:02:14 UTC
svn commit: r418002 - in /incubator/tuscany/cpp: ./
sca/projects/tuscany_sca/ sca/projects/tuscany_sca/tuscany_sca_test/
sca/samples/Calculator/Client/ sca/samples/Calculator/WSClient/
sca/samples/ides/devstudio6/projects/Calculator/
Author: robbinspg
Date: Thu Jun 29 04:02:12 2006
New Revision: 418002
URL: http://svn.apache.org/viewvc?rev=418002&view=rev
Log:
TUSCANY-458 Restructure Calculator sample for distribution build
Added:
incubator/tuscany/cpp/sca/samples/Calculator/WSClient/runwsclient.cmd (with props)
Removed:
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/runwsclient.cmd
Modified:
incubator/tuscany/cpp/build_tuscany_sca.bat
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.ncb
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.opt
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp
incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak
incubator/tuscany/cpp/sca/samples/Calculator/Client/runclient.cmd
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd
Modified: incubator/tuscany/cpp/build_tuscany_sca.bat
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/build_tuscany_sca.bat?rev=418002&r1=418001&r2=418002&view=diff
==============================================================================
--- incubator/tuscany/cpp/build_tuscany_sca.bat (original)
+++ incubator/tuscany/cpp/build_tuscany_sca.bat Thu Jun 29 04:02:12 2006
@@ -17,6 +17,7 @@
echo "AXIS2C_HOME not set"
goto end
)
+echo using Axis2C: %AXIS2C_HOME%"
if "%TUSCANY_SDOCPP%" == "" (
echo "TUSCANY_SDOCPP not set"
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.ncb
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.ncb?rev=418002&r1=418001&r2=418002&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.opt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca.opt?rev=418002&r1=418001&r2=418002&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp?rev=418002&r1=418001&r2=418002&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp (original)
+++ incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.dsp Thu Jun 29 04:02:12 2006
@@ -83,7 +83,7 @@
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tuscany_sca.lib tuscany_sdo.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\deploy\lib" /libpath:"$(TUSCANY_SDOCPP)\lib"
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy ..\tuscany_sca_test_MyValue\Debug\MyValue.dll testSCASystem\modules\MyValueServiceModule copy ..\tuscany_sca_test_MyValue\Debug\MyValue.pdb testSCASystem\modules\MyValueServiceModule copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.dll testSCASystem\modules\MyValueServiceModule copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\modules\MyValueServiceModule copy..\tuscany_sca\Debug\*.dll Debug copy..\tuscany_sca\Debug\*.pdb Debug copy $(TUSCANY_SDOCPP)\bin\*.dll Debug copy $(TUSCANY_SDOCPP)\bin\*.pdb Debug
+PostBuild_Cmds=copy ..\tuscany_sca_test_MyValue\Debug\MyValue.dll testSCASystem\modules\MyValueServiceModule copy ..\tuscany_sca_test_MyValue\Debug\MyValue.pdb testSCASystem\modules\MyValueServiceModule copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.dll testSCASystem\modules\MyValueServiceModule copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\modules\MyValueServiceModule copy..\tuscany_sca\Debug\*.dll Debug copy..\tuscany_sca\Debug\*.pdb Debug
# End Special Build Tool
!ENDIF
Modified: incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak?rev=418002&r1=418001&r2=418002&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak (original)
+++ incubator/tuscany/cpp/sca/projects/tuscany_sca/tuscany_sca_test/tuscany_sca_test.mak Thu Jun 29 04:02:12 2006
@@ -222,8 +222,6 @@
copy ..\tuscany_sca_test_CustomerInfo\Debug\CustomerInfo.pdb testSCASystem\modules\MyValueServiceModule
copy..\tuscany_sca\Debug\*.dll Debug
copy..\tuscany_sca\Debug\*.pdb Debug
- copy D:\tuscanysvn\cpp\sdo\deploy\bin\*.dll Debug
- copy D:\tuscanysvn\cpp\sdo\deploy\bin\*.pdb Debug
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ENDIF
Modified: incubator/tuscany/cpp/sca/samples/Calculator/Client/runclient.cmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/Client/runclient.cmd?rev=418002&r1=418001&r2=418002&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/Client/runclient.cmd (original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/Client/runclient.cmd Thu Jun 29 04:02:12 2006
@@ -2,13 +2,32 @@
rem Runs the client after setting the SCA environment variables to use the
rem CalculatorSubsystem
setlocal
-set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\..\runtime
+
+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
+)
+echo using TUSCANY_SDOCPP: %TUSCANY_SDOCPP%
+
+if "%TUSCANY_SCACPP%" == "" (
+echo "TUSCANY_SCACPP not set"
+goto end
+)
+echo using TUSCANY_SCACPP: %TUSCANY_SCACPP%
+
+set TUSCANY_SCACPP_SYSTEM_ROOT=%~d0%~p0\..\
rem Only need to specify the subsystem (and not the moduleComponent as well) because
rem there is only one moduleComponent in the subsystem - it is a very simple sample.
set TUSCANY_SCACPP_DEFAULT_MODULE=CalculatorSubsystem
rem Run the client
-%~d0%~p0\debug\Client.exe %*
+Client.exe %*
endlocal
Added: incubator/tuscany/cpp/sca/samples/Calculator/WSClient/runwsclient.cmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/WSClient/runwsclient.cmd?rev=418002&view=auto
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/WSClient/runwsclient.cmd (added)
+++ incubator/tuscany/cpp/sca/samples/Calculator/WSClient/runwsclient.cmd Thu Jun 29 04:02:12 2006
@@ -0,0 +1 @@
+WSClient\Debug\WSClient div 22 7
\ No newline at end of file
Propchange: incubator/tuscany/cpp/sca/samples/Calculator/WSClient/runwsclient.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.ncb?rev=418002&r1=418001&r2=418002&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.opt?rev=418002&r1=418001&r2=418002&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd?rev=418002&r1=418001&r2=418002&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd Thu Jun 29 04:02:12 2006
@@ -12,23 +12,25 @@
)
if not exist %destinationPath%\modules mkdir %destinationPath%\modules
-if not exist %destinationPath%\modules\Calculator mkdir %destinationPath%\modules\Calculator
+if not exist %destinationPath%\modules\CalculatorModule mkdir %destinationPath%\modules\CalculatorModule
-copy %sourcePath%\CalculatorModule\*.componentType %destinationPath%\modules\Calculator
-copy %sourcePath%\CalculatorModule\sca.module %destinationPath%\modules\Calculator
-copy %sourcePath%\CalculatorModule\Calculator.h %destinationPath%\modules\Calculator
-copy %sourcePath%\CalculatorModule\CalculatorImpl.h %destinationPath%\modules\Calculator
-copy %sourcePath%\CalculatorModule\Tuscany-model.config %destinationPath%\modules\Calculator
-copy %sourcePath%\CalculatorModule\Calculator.wsdl %destinationPath%\modules\Calculator
-copy %currentPath%\Calculator\debug\Calculator.dll %destinationPath%\modules\Calculator
+copy %sourcePath%\CalculatorModule\*.componentType %destinationPath%\modules\CalculatorModule
+copy %sourcePath%\CalculatorModule\sca.module %destinationPath%\modules\CalculatorModule
+copy %sourcePath%\CalculatorModule\Calculator.h %destinationPath%\modules\CalculatorModule
+copy %sourcePath%\CalculatorModule\CalculatorImpl.h %destinationPath%\modules\CalculatorModule
+copy %sourcePath%\CalculatorModule\Tuscany-model.config %destinationPath%\modules\CalculatorModule
+copy %sourcePath%\CalculatorModule\Calculator.wsdl %destinationPath%\modules\CalculatorModule
+copy %currentPath%\Calculator\debug\Calculator.dll %destinationPath%\modules\CalculatorModule
-copy %currentPath%\Client\Debug\Calc.exe %destinationPath%\modules\Calculator
-copy %currentPath%\Client\Debug\Calc.pdb %destinationPath%\modules\Calculator
+if not exist %destinationPath%\bin mkdir %destinationPath%\bin
+copy %currentPath%\Client\Debug\Calc.exe %destinationPath%\bin
+copy %currentPath%\Client\Debug\Calc.pdb %destinationPath%\bin
+copy %sourcePath%\Client\runclient.cmd %destinationPath%\bin
if not exist %destinationPath%\subsystems mkdir %destinationPath%\subsystems
-if not exist %destinationPath%\subsystems\Calculator mkdir %destinationPath%\subsystems\Calculator
+if not exist %destinationPath%\subsystems\CalculatorSubsystem mkdir %destinationPath%\subsystems\CalculatorSubsystem
-copy %sourcePath%\CalculatorSubsystem\sca.subsystem %destinationPath%\subsystems\Calculator
+copy %sourcePath%\CalculatorSubsystem\sca.subsystem %destinationPath%\subsystems\CalculatorSubsystem
endlocal
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org