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/10/06 16:46:56 UTC
svn commit: r453618 [2/2] - in /incubator/tuscany/cpp/sca:
projects/tuscany_sca/ projects/tuscany_sca/Build/
projects/tuscany_sca/tuscany_sca/ projects/tuscany_sca/tuscany_sca_cpp/
projects/tuscany_sca/tuscany_sca_ws_dispatcher/ projects/tuscany_sca/tu...
Propchange: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.dsp
------------------------------------------------------------------------------
svn:eol-style = CRLF
Added: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.mak
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.mak?view=auto&rev=453618
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.mak (added)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.mak Fri Oct 6 07:46:55 2006
@@ -0,0 +1,152 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on Build.dsp
+!IF "$(CFG)" == ""
+CFG=Build - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to Build - Win32 Debug.
+!ENDIF
+
+!IF "$(CFG)" != "Build - Win32 Release" && "$(CFG)" != "Build - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "Build.mak" CFG="Build - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Build - Win32 Release" (based on "Win32 (x86) Generic Project")
+!MESSAGE "Build - Win32 Debug" (based on "Win32 (x86) Generic Project")
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+!IF "$(RECURSE)" == "0"
+
+ALL :
+
+!ELSE
+
+ALL : "WSClient - Win32 Release" "Client - Win32 Release" "Calculator - Win32 Release"
+
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"Calculator - Win32 ReleaseCLEAN" "Client - Win32 ReleaseCLEAN" "WSClient - Win32 ReleaseCLEAN"
+!ELSE
+CLEAN :
+!ENDIF
+ -@erase
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+MTL=midl.exe
+
+!IF "$(CFG)" == "Build - Win32 Release"
+
+!ELSEIF "$(CFG)" == "Build - Win32 Debug"
+
+!ENDIF
+
+MTL_PROJ=
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("Build.dep")
+!INCLUDE "Build.dep"
+!ELSE
+!MESSAGE Warning: cannot find "Build.dep"
+!ENDIF
+!ENDIF
+
+
+!IF "$(CFG)" == "Build - Win32 Release" || "$(CFG)" == "Build - Win32 Debug"
+
+!IF "$(CFG)" == "Build - Win32 Release"
+
+"Calculator - Win32 Release" :
+ cd "..\Calculator"
+ $(MAKE) /$(MAKEFLAGS) /F .\Calculator.mak CFG="Calculator - Win32 Release"
+ cd "..\Build"
+
+"Calculator - Win32 ReleaseCLEAN" :
+ cd "..\Calculator"
+ $(MAKE) /$(MAKEFLAGS) /F .\Calculator.mak CFG="Calculator - Win32 Release" RECURSE=1 CLEAN
+ cd "..\Build"
+
+!ELSEIF "$(CFG)" == "Build - Win32 Debug"
+
+"Calculator - Win32 Debug" :
+ cd "..\Calculator"
+ $(MAKE) /$(MAKEFLAGS) /F .\Calculator.mak CFG="Calculator - Win32 Debug"
+ cd "..\Build"
+
+"Calculator - Win32 DebugCLEAN" :
+ cd "..\Calculator"
+ $(MAKE) /$(MAKEFLAGS) /F .\Calculator.mak CFG="Calculator - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\Build"
+
+!ENDIF
+
+!IF "$(CFG)" == "Build - Win32 Release"
+
+"Client - Win32 Release" :
+ cd "..\Client"
+ $(MAKE) /$(MAKEFLAGS) /F .\Client.mak CFG="Client - Win32 Release"
+ cd "..\Build"
+
+"Client - Win32 ReleaseCLEAN" :
+ cd "..\Client"
+ $(MAKE) /$(MAKEFLAGS) /F .\Client.mak CFG="Client - Win32 Release" RECURSE=1 CLEAN
+ cd "..\Build"
+
+!ELSEIF "$(CFG)" == "Build - Win32 Debug"
+
+"Client - Win32 Debug" :
+ cd "..\Client"
+ $(MAKE) /$(MAKEFLAGS) /F .\Client.mak CFG="Client - Win32 Debug"
+ cd "..\Build"
+
+"Client - Win32 DebugCLEAN" :
+ cd "..\Client"
+ $(MAKE) /$(MAKEFLAGS) /F .\Client.mak CFG="Client - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\Build"
+
+!ENDIF
+
+!IF "$(CFG)" == "Build - Win32 Release"
+
+"WSClient - Win32 Release" :
+ cd "..\WSClient"
+ $(MAKE) /$(MAKEFLAGS) /F .\WSClient.mak CFG="WSClient - Win32 Release"
+ cd "..\Build"
+
+"WSClient - Win32 ReleaseCLEAN" :
+ cd "..\WSClient"
+ $(MAKE) /$(MAKEFLAGS) /F .\WSClient.mak CFG="WSClient - Win32 Release" RECURSE=1 CLEAN
+ cd "..\Build"
+
+!ELSEIF "$(CFG)" == "Build - Win32 Debug"
+
+"WSClient - Win32 Debug" :
+ cd "..\WSClient"
+ $(MAKE) /$(MAKEFLAGS) /F .\WSClient.mak CFG="WSClient - Win32 Debug"
+ cd "..\Build"
+
+"WSClient - Win32 DebugCLEAN" :
+ cd "..\WSClient"
+ $(MAKE) /$(MAKEFLAGS) /F .\WSClient.mak CFG="WSClient - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\Build"
+
+!ENDIF
+
+
+!ENDIF
+
Added: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/BuildInstructions.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/BuildInstructions.txt?view=auto&rev=453618
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/BuildInstructions.txt (added)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/BuildInstructions.txt Fri Oct 6 07:46:55 2006
@@ -0,0 +1,93 @@
+
+These sample projects will build:
+
+A basic calculator SCA service.
+A client to test that service.
+A WSClient to test the service as exposed by AXIS2C as a web service.
+
+The sample depdends on the current versions of Tuscany SDO and Tuscany SCA, which in turn
+depend on axis2c version 0.92, and libxml2. See the SCA and SDO project installation
+details.
+
+The sample already has the pre-generated proxy and wrapper code in it, but should
+you need to regenerate these, you will need the command line tool "scagen" which is
+part of the Tuscany SCA project.
+
+The projects expect to following environment variables to be set:
+TUSCANY_SCACPP:
+The directory in which the sca runtime is deployed - probably something ending in sca/deploy.
+
+TUSCANY_SDOCPP:
+The directory where the sdo runtime is deployed - probably something ending in sdo/deploy.
+
+TUSCANY_SCACPP_DEFAULT_COMPONENT=CalculatorSubsystem
+This is the default composite to be loaded by SCA. It consists of <subsystem>/<component>
+
+TUSCANY_SCACPP_SYSTEM_ROOT
+This is the point from which SCA will start looking for composites to load. Again this is
+set programmatically by the sample.
+
+AXIS2C_HOME:
+This is where axis2c is deployed- this is only required by the WSClient project.
+
+The Calculator project contains a simple calculator service, and the descriptive files
+which help the runtime to find the service.
+
+
+Rebuilding the proxy and wrapper classes
+========================================
+
+If required, go to the Calculator sample main directory, and
+type:
+"scagen -dir CalculatorComposite -output CalculatorComposite"
+
+The generated code is put into the CalculatorComposite subdirectory.
+
+Building the Client project
+===========================
+
+Set the active project to be "Client", and then build all.
+This will re-build Calculator, then rebuild the Client,
+The final step of the build will call a batch file "deploy.cmd",
+which copies all the required files to the directory samples/Calculator/deploy
+
+Use Project..Settings..Debug and check the path to the executable, check also the
+path to the working directory. Alter these to match your configuration.
+
+Run the project, and your SCA service should be called.
+
+Building the WSClient project
+=============================
+
+Modify the services.xml file, and make the SCA system root defined
+within it comply with your SCA system root.
+
+Set the active project to WSClient and build all.
+
+The last step of the build will run a wsdeploy script, which
+tries to use the environment variable AXIS2C_HOME, to create
+a services/Calculator directory, and deploy the services.xml file.
+The dll which resolves SCA services is called
+tuscany_sca_ws_service.dll - this will be copied to the axis
+tree by the same script file.
+
+To run the axis2 http server, go to the %AXIS2C_HOME%/bin
+directory, and launch the executable.
+
+Now verify that the path to the WSClient executable makes sense
+in your project settings, and run the project.
+
+
+Note
+====
+
+It can be quite hard to debug services which are invoked through axis, as the
+dll including the service is loaded on call. One useful technique is to
+load the axis http server in visual studio (create an empty project and make
+the executable path point to axis2_http_server.exe).
+Now use the Project..Settings..Debug..Addition DLLs option and add
+services/Calculator/tuscany_sca_ws_service.dll.
+You will now be able to set breakpoints in the dll (Axis2EntryPointService_invoke
+is a good place - in Axis2EntryPointService_skeleton.cpp).
+Run your WSclient from another debugger, and the server debugger will break
+on the service code.
Propchange: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/BuildInstructions.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.dsw
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.dsw?view=diff&rev=453618&r1=453617&r2=453618
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.dsw (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator.dsw Fri Oct 6 07:46:55 2006
@@ -3,7 +3,7 @@
###############################################################################
-Project: "Calculator"=.\Calculator\Calculator.dsp - Package Owner=<4>
+Project: "Build"=.\Build\Build.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -11,11 +11,20 @@
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name Calculator
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name Client
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name WSClient
+ End Project Dependency
}}}
###############################################################################
-Project: "Client"=.\Client\Client.dsp - Package Owner=<4>
+Project: "Calculator"=.\Calculator\Calculator.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -24,12 +33,24 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name Calculator
+ Project_Dep_Name Client
End Project Dependency
}}}
###############################################################################
+Project: "Client"=.\Client\Client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "WSClient"=.\WSClient\WSClient.dsp - Package Owner=<4>
Package=<5>
@@ -38,12 +59,6 @@
Package=<4>
{{{
- Begin Project Dependency
- Project_Dep_Name Calculator
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name Client
- End Project Dependency
}}}
###############################################################################
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?view=diff&rev=453618&r1=453617&r2=453618
==============================================================================
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?view=diff&rev=453618&r1=453617&r2=453618
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp?view=diff&rev=453618&r1=453617&r2=453618
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.dsp Fri Oct 6 07:46:55 2006
@@ -54,7 +54,11 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE 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 /nologo /dll /machine:I386
-# 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_cpp.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /machine:I386 /out:"Release/CalculatorComposite.dll" /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib" /libpath:"$(TUSCANY_SCACPP)/extensions/cpp/lib"
+# 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_cpp.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /machine:I386 /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib" /libpath:"$(TUSCANY_SCACPP)/extensions/cpp/lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=..\..\..\..\..\Calculator\deploy.bat ..\..\..\..\..\Calculator Release
+# End Special Build Tool
!ELSEIF "$(CFG)" == "Calculator - Win32 Debug"
@@ -81,7 +85,11 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE 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 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# 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_cpp.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /debug /machine:I386 /out:"Debug/CalculatorComposite.dll" /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib" /libpath:"$(TUSCANY_SCACPP)/extensions/cpp/lib"
+# 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_cpp.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib" /libpath:"$(TUSCANY_SCACPP)/extensions/cpp/lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=..\..\..\..\..\Calculator\deploy.bat ..\..\..\..\..\Calculator Debug
+# End Special Build Tool
!ENDIF
@@ -94,71 +102,71 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\Calculator.h
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_CalculatorService_Proxy.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl.h
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_CalculatorService_Wrapper.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Proxy.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_divideService_Proxy.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Proxy.h
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\DivideImpl.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Wrapper.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\DivideImpl_DivideService_Proxy.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Wrapper.h
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\DivideImpl_DivideService_Wrapper.cpp
# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_divideService_Proxy.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\Calculator.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\DivideService.h
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_CalculatorService_Proxy.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl.h
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_CalculatorService_Wrapper.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl_DivideService_Proxy.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_divideService_Proxy.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl_DivideService_Proxy.h
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\Divide.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl_DivideService_Wrapper.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\DivideImpl.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl_DivideService_Wrapper.h
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\DivideImpl_DivideService_Proxy.h
# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_divideService_Proxy.h
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\DivideImpl_DivideService_Wrapper.h
# End Source File
# End Group
# Begin Group "Resource Files"
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak?view=diff&rev=453618&r1=453617&r2=453618
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak Fri Oct 6 07:46:55 2006
@@ -25,6 +25,10 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "Calculator - Win32 Release"
OUTDIR=.\Release
@@ -33,17 +37,28 @@
OutDir=.\Release
# End Custom Macros
+!IF "$(RECURSE)" == "0"
+
ALL : "$(OUTDIR)\Calculator.dll"
+!ELSE
+
+ALL : "Client - Win32 Release" "$(OUTDIR)\Calculator.dll"
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"Client - Win32 ReleaseCLEAN"
+!ELSE
CLEAN :
+!ENDIF
-@erase "$(INTDIR)\CalculatorImpl.obj"
- -@erase "$(INTDIR)\CalculatorImpl_CalculatorDivideService_Proxy.obj"
-@erase "$(INTDIR)\CalculatorImpl_CalculatorService_Proxy.obj"
-@erase "$(INTDIR)\CalculatorImpl_CalculatorService_Wrapper.obj"
- -@erase "$(INTDIR)\DivideServiceImpl.obj"
- -@erase "$(INTDIR)\DivideServiceImpl_DivideService_Proxy.obj"
- -@erase "$(INTDIR)\DivideServiceImpl_DivideService_Wrapper.obj"
+ -@erase "$(INTDIR)\CalculatorImpl_divideService_Proxy.obj"
+ -@erase "$(INTDIR)\DivideImpl.obj"
+ -@erase "$(INTDIR)\DivideImpl_DivideService_Proxy.obj"
+ -@erase "$(INTDIR)\DivideImpl_DivideService_Wrapper.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(OUTDIR)\Calculator.dll"
-@erase "$(OUTDIR)\Calculator.exp"
@@ -52,62 +67,41 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "$(TUSCANY_SDOCPP)/include" /I "$(TUSCANY_SCACPP)/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CALCULATOR_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "$(TUSCANY_SDOCPP)/include" /I "$(TUSCANY_SCACPP)/include" /I "$(TUSCANY_SCACPP)/extensions/cpp/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CALCULATOR_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\Calculator.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=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 /dll /incremental:no /pdb:"$(OUTDIR)\Calculator.pdb" /machine:I386 /out:"$(OUTDIR)\Calculator.dll" /implib:"$(OUTDIR)\Calculator.lib" /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib"
+LINK32_FLAGS=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_cpp.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\Calculator.pdb" /machine:I386 /out:"$(OUTDIR)\Calculator.dll" /implib:"$(OUTDIR)\Calculator.lib" /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib" /libpath:"$(TUSCANY_SCACPP)/extensions/cpp/lib"
LINK32_OBJS= \
"$(INTDIR)\CalculatorImpl.obj" \
- "$(INTDIR)\CalculatorImpl_CalculatorDivideService_Proxy.obj" \
"$(INTDIR)\CalculatorImpl_CalculatorService_Proxy.obj" \
"$(INTDIR)\CalculatorImpl_CalculatorService_Wrapper.obj" \
- "$(INTDIR)\DivideServiceImpl.obj" \
- "$(INTDIR)\DivideServiceImpl_DivideService_Proxy.obj" \
- "$(INTDIR)\DivideServiceImpl_DivideService_Wrapper.obj"
+ "$(INTDIR)\CalculatorImpl_divideService_Proxy.obj" \
+ "$(INTDIR)\DivideImpl.obj" \
+ "$(INTDIR)\DivideImpl_DivideService_Proxy.obj" \
+ "$(INTDIR)\DivideImpl_DivideService_Wrapper.obj"
"$(OUTDIR)\Calculator.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "Client - Win32 Release" "$(OUTDIR)\Calculator.dll"
+ ..\..\..\..\..\Calculator\deploy.bat ..\..\..\..\..\Calculator Release
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
!ELSEIF "$(CFG)" == "Calculator - Win32 Debug"
OUTDIR=.\Debug
@@ -116,17 +110,28 @@
OutDir=.\Debug
# End Custom Macros
+!IF "$(RECURSE)" == "0"
+
ALL : "$(OUTDIR)\Calculator.dll"
+!ELSE
+
+ALL : "Client - Win32 Debug" "$(OUTDIR)\Calculator.dll"
+!ENDIF
+
+!IF "$(RECURSE)" == "1"
+CLEAN :"Client - Win32 DebugCLEAN"
+!ELSE
CLEAN :
+!ENDIF
-@erase "$(INTDIR)\CalculatorImpl.obj"
- -@erase "$(INTDIR)\CalculatorImpl_CalculatorDivideService_Proxy.obj"
-@erase "$(INTDIR)\CalculatorImpl_CalculatorService_Proxy.obj"
-@erase "$(INTDIR)\CalculatorImpl_CalculatorService_Wrapper.obj"
- -@erase "$(INTDIR)\DivideServiceImpl.obj"
- -@erase "$(INTDIR)\DivideServiceImpl_DivideService_Proxy.obj"
- -@erase "$(INTDIR)\DivideServiceImpl_DivideService_Wrapper.obj"
+ -@erase "$(INTDIR)\CalculatorImpl_divideService_Proxy.obj"
+ -@erase "$(INTDIR)\DivideImpl.obj"
+ -@erase "$(INTDIR)\DivideImpl_DivideService_Proxy.obj"
+ -@erase "$(INTDIR)\DivideImpl_DivideService_Wrapper.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\vc60.pdb"
-@erase "$(OUTDIR)\Calculator.dll"
@@ -138,8 +143,42 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(TUSCANY_SDOCPP)/include" /I "$(TUSCANY_SCACPP)/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CALCULATOR_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(TUSCANY_SDOCPP)/include" /I "$(TUSCANY_SCACPP)/include" /I "$(TUSCANY_SCACPP)/extensions/cpp/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CALCULATOR_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\Calculator.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=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_cpp.lib tuscany_sca.lib tuscany_sdo.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\Calculator.pdb" /debug /machine:I386 /out:"$(OUTDIR)\Calculator.dll" /implib:"$(OUTDIR)\Calculator.lib" /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib" /libpath:"$(TUSCANY_SCACPP)/extensions/cpp/lib"
+LINK32_OBJS= \
+ "$(INTDIR)\CalculatorImpl.obj" \
+ "$(INTDIR)\CalculatorImpl_CalculatorService_Proxy.obj" \
+ "$(INTDIR)\CalculatorImpl_CalculatorService_Wrapper.obj" \
+ "$(INTDIR)\CalculatorImpl_divideService_Proxy.obj" \
+ "$(INTDIR)\DivideImpl.obj" \
+ "$(INTDIR)\DivideImpl_DivideService_Proxy.obj" \
+ "$(INTDIR)\DivideImpl_DivideService_Wrapper.obj"
+
+"$(OUTDIR)\Calculator.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "Client - Win32 Debug" "$(OUTDIR)\Calculator.dll"
+ ..\..\..\..\..\Calculator\deploy.bat ..\..\..\..\..\Calculator Debug
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -171,31 +210,6 @@
$(CPP_PROJ) $<
<<
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Calculator.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=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 /dll /incremental:yes /pdb:"$(OUTDIR)\Calculator.pdb" /debug /machine:I386 /out:"$(OUTDIR)\Calculator.dll" /implib:"$(OUTDIR)\Calculator.lib" /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib"
-LINK32_OBJS= \
- "$(INTDIR)\CalculatorImpl.obj" \
- "$(INTDIR)\CalculatorImpl_CalculatorDivideService_Proxy.obj" \
- "$(INTDIR)\CalculatorImpl_CalculatorService_Proxy.obj" \
- "$(INTDIR)\CalculatorImpl_CalculatorService_Wrapper.obj" \
- "$(INTDIR)\DivideServiceImpl.obj" \
- "$(INTDIR)\DivideServiceImpl_DivideService_Proxy.obj" \
- "$(INTDIR)\DivideServiceImpl_DivideService_Wrapper.obj"
-
-"$(OUTDIR)\Calculator.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("Calculator.dep")
@@ -207,47 +221,73 @@
!IF "$(CFG)" == "Calculator - Win32 Release" || "$(CFG)" == "Calculator - Win32 Debug"
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl.cpp
"$(INTDIR)\CalculatorImpl.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorDivideService_Proxy.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_CalculatorService_Proxy.cpp
-"$(INTDIR)\CalculatorImpl_CalculatorDivideService_Proxy.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\CalculatorImpl_CalculatorService_Proxy.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Proxy.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_CalculatorService_Wrapper.cpp
-"$(INTDIR)\CalculatorImpl_CalculatorService_Proxy.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\CalculatorImpl_CalculatorService_Wrapper.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\CalculatorImpl_CalculatorService_Wrapper.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\CalculatorImpl_divideService_Proxy.cpp
-"$(INTDIR)\CalculatorImpl_CalculatorService_Wrapper.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\CalculatorImpl_divideService_Proxy.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\DivideImpl.cpp
-"$(INTDIR)\DivideServiceImpl.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\DivideImpl.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl_DivideService_Proxy.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\DivideImpl_DivideService_Proxy.cpp
-"$(INTDIR)\DivideServiceImpl_DivideService_Proxy.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\DivideImpl_DivideService_Proxy.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\Calculator\CalculatorComposite\DivideServiceImpl_DivideService_Wrapper.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator\DivideImpl_DivideService_Wrapper.cpp
-"$(INTDIR)\DivideServiceImpl_DivideService_Wrapper.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\DivideImpl_DivideService_Wrapper.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+
+!IF "$(CFG)" == "Calculator - Win32 Release"
+
+"Client - Win32 Release" :
+ cd "..\Client"
+ $(MAKE) /$(MAKEFLAGS) /F .\Client.mak CFG="Client - Win32 Release"
+ cd "..\Calculator"
+
+"Client - Win32 ReleaseCLEAN" :
+ cd "..\Client"
+ $(MAKE) /$(MAKEFLAGS) /F .\Client.mak CFG="Client - Win32 Release" RECURSE=1 CLEAN
+ cd "..\Calculator"
+
+!ELSEIF "$(CFG)" == "Calculator - Win32 Debug"
+
+"Client - Win32 Debug" :
+ cd "..\Client"
+ $(MAKE) /$(MAKEFLAGS) /F .\Client.mak CFG="Client - Win32 Debug"
+ cd "..\Calculator"
+
+"Client - Win32 DebugCLEAN" :
+ cd "..\Client"
+ $(MAKE) /$(MAKEFLAGS) /F .\Client.mak CFG="Client - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\Calculator"
+
+!ENDIF
!ENDIF
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp?view=diff&rev=453618&r1=453617&r2=453618
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp Fri Oct 6 07:46:55 2006
@@ -51,10 +51,10 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# 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_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib /nologo /subsystem:console /machine:I386 /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib" /libpath:"$(TUSCANY_SCACPP)/extensions/cpp/lib"
+# 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_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib /nologo /subsystem:console /machine:I386 /out:"Release/calculator_client.exe" /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib" /libpath:"$(TUSCANY_SCACPP)/extensions/cpp/lib"
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=..\deploy.cmd Release
+PostBuild_Cmds=..\..\..\..\..\Calculator\deployclient.bat ..\..\..\..\..\Calculator Release $(TUSCANY_SCACPP)/bin/scagen.cmd -dir ../../../../../Calculator/sample.calculator -output ../../../../../Calculator/sample.calculator -verbose
# End Special Build Tool
!ELSEIF "$(CFG)" == "Client - Win32 Debug"
@@ -80,11 +80,11 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# 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_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib" /libpath:"$(TUSCANY_SCACPP)/extensions/cpp/lib"
+# 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_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/calculator_client.exe" /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib" /libpath:"$(TUSCANY_SCACPP)/extensions/cpp/lib"
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=..\deploy.cmd Debug
+PostBuild_Cmds=..\..\..\..\..\Calculator\deployclient.bat ..\..\..\..\..\Calculator Debug $(TUSCANY_SCACPP)/bin/scagen.cmd -dir ../../../../../Calculator/sample.calculator -output ../../../../../Calculator/sample.calculator -verbose
# End Special Build Tool
!ENDIF
@@ -98,16 +98,16 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\Client\Calc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\Calculator\Client\Calculator.h
+SOURCE=..\..\..\..\..\Calculator\sample.calculator.client\CalculatorClient.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\Calculator\sample.calculator.client\Calculator.h
+# End Source File
# End Group
# Begin Group "Resource Files"
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak?view=diff&rev=453618&r1=453617&r2=453618
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak Fri Oct 6 07:46:55 2006
@@ -25,6 +25,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "Client - Win32 Release"
OUTDIR=.\Release
@@ -33,73 +36,28 @@
OutDir=.\Release
# End Custom Macros
-!IF "$(RECURSE)" == "0"
-
-ALL : "$(OUTDIR)\Client.exe"
-
-!ELSE
-
-ALL : "Calculator - Win32 Release" "$(OUTDIR)\Client.exe"
+ALL : "$(OUTDIR)\calculator_client.exe"
-!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"Calculator - Win32 ReleaseCLEAN"
-!ELSE
CLEAN :
-!ENDIF
- -@erase "$(INTDIR)\Calc.obj"
+ -@erase "$(INTDIR)\CalculatorClient.obj"
-@erase "$(INTDIR)\vc60.idb"
- -@erase "$(OUTDIR)\Client.exe"
+ -@erase "$(OUTDIR)\calculator_client.exe"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "$(TUSCANY_SDOCPP)/include" /I "$(TUSCANY_SCACPP)/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "$(TUSCANY_SDOCPP)/include" /I "$(TUSCANY_SCACPP)/include" /I "$(TUSCANY_SCACPP)/extensions/cpp/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\Client.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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_sdo.lib tuscany_sca.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Client.pdb" /machine:I386 /out:"$(OUTDIR)\Client.exe" /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib"
+LINK32_FLAGS=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_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\calculator_client.pdb" /machine:I386 /out:"$(OUTDIR)\calculator_client.exe" /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib" /libpath:"$(TUSCANY_SCACPP)/extensions/cpp/lib"
LINK32_OBJS= \
- "$(INTDIR)\Calc.obj" \
- "..\Calculator\Release\Calculator.lib"
+ "$(INTDIR)\CalculatorClient.obj"
-"$(OUTDIR)\Client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\calculator_client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -113,8 +71,9 @@
OutDir=.\Release
# End Custom Macros
-$(DS_POSTBUILD_DEP) : "Calculator - Win32 Release" "$(OUTDIR)\Client.exe"
- ..\deploy.cmd Release
+$(DS_POSTBUILD_DEP) : "$(OUTDIR)\calculator_client.exe"
+ ..\..\..\..\..\Calculator\deployclient.bat ..\..\..\..\..\Calculator Release
+ D:\tuscanysvn\cpp\sca\deploy/bin/scagen.cmd -dir ../../../../../Calculator/sample.calculator -output ../../../../../Calculator/sample.calculator -verbose
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ELSEIF "$(CFG)" == "Client - Win32 Debug"
@@ -125,33 +84,50 @@
OutDir=.\Debug
# End Custom Macros
-!IF "$(RECURSE)" == "0"
+ALL : "$(OUTDIR)\calculator_client.exe"
-ALL : "$(OUTDIR)\Client.exe"
-
-!ELSE
-
-ALL : "Calculator - Win32 Debug" "$(OUTDIR)\Client.exe"
-
-!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"Calculator - Win32 DebugCLEAN"
-!ELSE
CLEAN :
-!ENDIF
- -@erase "$(INTDIR)\Calc.obj"
+ -@erase "$(INTDIR)\CalculatorClient.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\vc60.pdb"
- -@erase "$(OUTDIR)\Client.exe"
- -@erase "$(OUTDIR)\Client.ilk"
- -@erase "$(OUTDIR)\Client.pdb"
+ -@erase "$(OUTDIR)\calculator_client.exe"
+ -@erase "$(OUTDIR)\calculator_client.ilk"
+ -@erase "$(OUTDIR)\calculator_client.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(TUSCANY_SDOCPP)/include" /I "$(TUSCANY_SCACPP)/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "$(TUSCANY_SDOCPP)/include" /I "$(TUSCANY_SCACPP)/include" /I "$(TUSCANY_SCACPP)/extensions/cpp/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\Client.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=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_sdo.lib tuscany_sca.lib tuscany_sca_cpp.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\calculator_client.pdb" /debug /machine:I386 /out:"$(OUTDIR)\calculator_client.exe" /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib" /libpath:"$(TUSCANY_SCACPP)/extensions/cpp/lib"
+LINK32_OBJS= \
+ "$(INTDIR)\CalculatorClient.obj"
+
+"$(OUTDIR)\calculator_client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "$(OUTDIR)\calculator_client.exe"
+ ..\..\..\..\..\Calculator\deployclient.bat ..\..\..\..\..\Calculator Debug
+ D:\tuscanysvn\cpp\sca\deploy/bin/scagen.cmd -dir ../../../../../Calculator/sample.calculator -output ../../../../../Calculator/sample.calculator -verbose
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -183,37 +159,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Client.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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_sdo.lib tuscany_sca.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Client.pdb" /debug /machine:I386 /out:"$(OUTDIR)\Client.exe" /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/lib"
-LINK32_OBJS= \
- "$(INTDIR)\Calc.obj" \
- "..\Calculator\Debug\Calculator.lib"
-
-"$(OUTDIR)\Client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-SOURCE="$(InputPath)"
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-ALL : $(DS_POSTBUILD_DEP)
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-$(DS_POSTBUILD_DEP) : "Calculator - Win32 Debug" "$(OUTDIR)\Client.exe"
- ..\deploy.cmd Debug
- echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("Client.dep")
@@ -225,37 +170,11 @@
!IF "$(CFG)" == "Client - Win32 Release" || "$(CFG)" == "Client - Win32 Debug"
-SOURCE=..\..\..\..\..\Calculator\Client\Calc.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator.client\CalculatorClient.cpp
-"$(INTDIR)\Calc.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\CalculatorClient.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-
-!IF "$(CFG)" == "Client - Win32 Release"
-
-"Calculator - Win32 Release" :
- cd "..\Calculator"
- $(MAKE) /$(MAKEFLAGS) /F .\Calculator.mak CFG="Calculator - Win32 Release"
- cd "..\Client"
-
-"Calculator - Win32 ReleaseCLEAN" :
- cd "..\Calculator"
- $(MAKE) /$(MAKEFLAGS) /F .\Calculator.mak CFG="Calculator - Win32 Release" RECURSE=1 CLEAN
- cd "..\Client"
-
-!ELSEIF "$(CFG)" == "Client - Win32 Debug"
-
-"Calculator - Win32 Debug" :
- cd "..\Calculator"
- $(MAKE) /$(MAKEFLAGS) /F .\Calculator.mak CFG="Calculator - Win32 Debug"
- cd "..\Client"
-
-"Calculator - Win32 DebugCLEAN" :
- cd "..\Calculator"
- $(MAKE) /$(MAKEFLAGS) /F .\Calculator.mak CFG="Calculator - Win32 Debug" RECURSE=1 CLEAN
- cd "..\Client"
-
-!ENDIF
!ENDIF
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp?view=diff&rev=453618&r1=453617&r2=453618
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp Fri Oct 6 07:46:55 2006
@@ -39,6 +39,7 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "$(TUSCANY_SDOCPP)/include" /I "$(AXIS2C_HOME)/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
@@ -50,10 +51,10 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# 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 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 axis2_engine.lib axis2_parser.lib axis2_util.lib axiom.lib /nologo /subsystem:console /machine:I386 /libpath:"$(TUSCANY_SDOCPP)\lib" /libpath:"$(AXIS2C_HOME)\lib"
+# 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_sdo.lib axis2_engine.lib axis2_parser.lib axis2_util.lib axiom.lib /nologo /subsystem:console /machine:I386 /out:"Release/calculator_wsclient.exe" /libpath:"$(TUSCANY_SDOCPP)\lib" /libpath:"$(AXIS2C_HOME)\lib"
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=..\wsdeploy.cmd Release
+PostBuild_Cmds=..\..\..\..\..\Calculator\deploywsclient.bat ..\..\..\..\..\Calculator Release
# End Special Build Tool
!ELSEIF "$(CFG)" == "WSClient - Win32 Debug"
@@ -67,6 +68,7 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "$(TUSCANY_SDOCPP)/include" /I "$(AXIS2C_HOME)/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
@@ -78,10 +80,10 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# 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 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 axis2_engine.lib axis2_parser.lib axis2_util.lib axiom.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)\lib" /libpath:"$(AXIS2C_HOME)\lib"
+# 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_sdo.lib axis2_engine.lib axis2_parser.lib axis2_util.lib axiom.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/calculator_wsclient.exe" /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)\lib" /libpath:"$(AXIS2C_HOME)\lib"
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=..\wsdeploy.cmd Debug
+PostBuild_Cmds=..\..\..\..\..\Calculator\deploywsclient.bat ..\..\..\..\..\Calculator Debug
# End Special Build Tool
!ENDIF
@@ -95,28 +97,24 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\WSClient\axis2_Calculator_stub.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator.wsclient\axis2_Calculator_stub.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\Calculator\WSClient\axis2_Calculator_stub.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\..\Calculator\WSClient\Calculator_Client.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator.wsclient\CalculatorWSClient.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\..\..\Calculator\sample.calculator.wsclient\axis2_Calculator_stub.h
+# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
-# Begin Source File
-
-SOURCE=.\BuildInstructions.txt
-# End Source File
# End Target
# End Project
Modified: incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak?view=diff&rev=453618&r1=453617&r2=453618
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak Fri Oct 6 07:46:55 2006
@@ -25,6 +25,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "WSClient - Win32 Release"
OUTDIR=.\Release
@@ -33,75 +36,30 @@
OutDir=.\Release
# End Custom Macros
-!IF "$(RECURSE)" == "0"
-
-ALL : "$(OUTDIR)\WSClient.exe"
+ALL : "$(OUTDIR)\calculator_wsclient.exe"
-!ELSE
-
-ALL : "Client - Win32 Release" "Calculator - Win32 Release" "$(OUTDIR)\WSClient.exe"
-
-!ENDIF
-!IF "$(RECURSE)" == "1"
-CLEAN :"Calculator - Win32 ReleaseCLEAN" "Client - Win32 ReleaseCLEAN"
-!ELSE
CLEAN :
-!ENDIF
-@erase "$(INTDIR)\axis2_Calculator_stub.obj"
- -@erase "$(INTDIR)\Calculator_Client.obj"
+ -@erase "$(INTDIR)\CalculatorWSClient.obj"
-@erase "$(INTDIR)\vc60.idb"
- -@erase "$(OUTDIR)\WSClient.exe"
+ -@erase "$(OUTDIR)\calculator_wsclient.exe"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "$(TUSCANY_SDOCPP)/include" /I "$(AXIS2C_HOME)/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\WSClient.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 axis2_engine.lib axis2_parser.lib axis2_util.lib axiom.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\WSClient.pdb" /machine:I386 /out:"$(OUTDIR)\WSClient.exe" /libpath:"$(TUSCANY_SCACPP)\lib" /libpath:"$(TUSCANY_SDOCPP)\lib" /libpath:"$(AXIS2C_HOME)\lib"
+LINK32_FLAGS=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_sdo.lib axis2_engine.lib axis2_parser.lib axis2_util.lib axiom.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\calculator_wsclient.pdb" /machine:I386 /out:"$(OUTDIR)\calculator_wsclient.exe" /libpath:"$(TUSCANY_SDOCPP)\lib" /libpath:"$(AXIS2C_HOME)\lib"
LINK32_OBJS= \
"$(INTDIR)\axis2_Calculator_stub.obj" \
- "$(INTDIR)\Calculator_Client.obj" \
- "..\Calculator\Release\Calculator.lib"
+ "$(INTDIR)\CalculatorWSClient.obj"
-"$(OUTDIR)\WSClient.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\calculator_wsclient.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -115,8 +73,8 @@
OutDir=.\Release
# End Custom Macros
-$(DS_POSTBUILD_DEP) : "Client - Win32 Release" "Calculator - Win32 Release" "$(OUTDIR)\WSClient.exe"
- ..\wsdeploy.cmd Release
+$(DS_POSTBUILD_DEP) : "$(OUTDIR)\calculator_wsclient.exe"
+ ..\..\..\..\..\Calculator\deploywsclient.bat ..\..\..\..\..\Calculator Release
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ELSEIF "$(CFG)" == "WSClient - Win32 Debug"
@@ -127,34 +85,51 @@
OutDir=.\Debug
# End Custom Macros
-!IF "$(RECURSE)" == "0"
-
-ALL : "$(OUTDIR)\WSClient.exe"
+ALL : "$(OUTDIR)\calculator_wsclient.exe"
-!ELSE
-ALL : "Client - Win32 Debug" "Calculator - Win32 Debug" "$(OUTDIR)\WSClient.exe"
-
-!ENDIF
-
-!IF "$(RECURSE)" == "1"
-CLEAN :"Calculator - Win32 DebugCLEAN" "Client - Win32 DebugCLEAN"
-!ELSE
CLEAN :
-!ENDIF
-@erase "$(INTDIR)\axis2_Calculator_stub.obj"
- -@erase "$(INTDIR)\Calculator_Client.obj"
+ -@erase "$(INTDIR)\CalculatorWSClient.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\vc60.pdb"
- -@erase "$(OUTDIR)\WSClient.exe"
- -@erase "$(OUTDIR)\WSClient.ilk"
- -@erase "$(OUTDIR)\WSClient.pdb"
+ -@erase "$(OUTDIR)\calculator_wsclient.exe"
+ -@erase "$(OUTDIR)\calculator_wsclient.ilk"
+ -@erase "$(OUTDIR)\calculator_wsclient.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "$(TUSCANY_SDOCPP)/include" /I "$(AXIS2C_HOME)/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\WSClient.bsc"
+BSC32_SBRS= \
+
+LINK32=link.exe
+LINK32_FLAGS=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_sdo.lib axis2_engine.lib axis2_parser.lib axis2_util.lib axiom.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\calculator_wsclient.pdb" /debug /machine:I386 /out:"$(OUTDIR)\calculator_wsclient.exe" /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)\lib" /libpath:"$(AXIS2C_HOME)\lib"
+LINK32_OBJS= \
+ "$(INTDIR)\axis2_Calculator_stub.obj" \
+ "$(INTDIR)\CalculatorWSClient.obj"
+
+"$(OUTDIR)\calculator_wsclient.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) @<<
+ $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+SOURCE="$(InputPath)"
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
+
+ALL : $(DS_POSTBUILD_DEP)
+
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "$(OUTDIR)\calculator_wsclient.exe"
+ ..\..\..\..\..\Calculator\deploywsclient.bat ..\..\..\..\..\Calculator Debug
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -186,38 +161,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\WSClient.bsc"
-BSC32_SBRS= \
-
-LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 axis2_engine.lib axis2_parser.lib axis2_util.lib axiom.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\WSClient.pdb" /debug /machine:I386 /out:"$(OUTDIR)\WSClient.exe" /pdbtype:sept /libpath:"$(TUSCANY_SCACPP)\lib" /libpath:"$(TUSCANY_SDOCPP)\lib" /libpath:"$(AXIS2C_HOME)\lib"
-LINK32_OBJS= \
- "$(INTDIR)\axis2_Calculator_stub.obj" \
- "$(INTDIR)\Calculator_Client.obj" \
- "..\Calculator\Debug\Calculator.lib"
-
-"$(OUTDIR)\WSClient.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-SOURCE="$(InputPath)"
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep
-
-ALL : $(DS_POSTBUILD_DEP)
-
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-$(DS_POSTBUILD_DEP) : "Client - Win32 Debug" "Calculator - Win32 Debug" "$(OUTDIR)\WSClient.exe"
- ..\wsdeploy.cmd Debug
- echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("WSClient.dep")
@@ -229,69 +172,17 @@
!IF "$(CFG)" == "WSClient - Win32 Release" || "$(CFG)" == "WSClient - Win32 Debug"
-SOURCE=..\..\..\..\..\Calculator\WSClient\axis2_Calculator_stub.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator.wsclient\axis2_Calculator_stub.cpp
"$(INTDIR)\axis2_Calculator_stub.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-SOURCE=..\..\..\..\..\Calculator\WSClient\Calculator_Client.cpp
+SOURCE=..\..\..\..\..\Calculator\sample.calculator.wsclient\CalculatorWSClient.cpp
-"$(INTDIR)\Calculator_Client.obj" : $(SOURCE) "$(INTDIR)"
+"$(INTDIR)\CalculatorWSClient.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-
-!IF "$(CFG)" == "WSClient - Win32 Release"
-
-"Calculator - Win32 Release" :
- cd "..\Calculator"
- $(MAKE) /$(MAKEFLAGS) /F .\Calculator.mak CFG="Calculator - Win32 Release"
- cd "..\WSClient"
-
-"Calculator - Win32 ReleaseCLEAN" :
- cd "..\Calculator"
- $(MAKE) /$(MAKEFLAGS) /F .\Calculator.mak CFG="Calculator - Win32 Release" RECURSE=1 CLEAN
- cd "..\WSClient"
-
-!ELSEIF "$(CFG)" == "WSClient - Win32 Debug"
-
-"Calculator - Win32 Debug" :
- cd "..\Calculator"
- $(MAKE) /$(MAKEFLAGS) /F .\Calculator.mak CFG="Calculator - Win32 Debug"
- cd "..\WSClient"
-
-"Calculator - Win32 DebugCLEAN" :
- cd "..\Calculator"
- $(MAKE) /$(MAKEFLAGS) /F .\Calculator.mak CFG="Calculator - Win32 Debug" RECURSE=1 CLEAN
- cd "..\WSClient"
-
-!ENDIF
-
-!IF "$(CFG)" == "WSClient - Win32 Release"
-
-"Client - Win32 Release" :
- cd "..\Client"
- $(MAKE) /$(MAKEFLAGS) /F .\Client.mak CFG="Client - Win32 Release"
- cd "..\WSClient"
-
-"Client - Win32 ReleaseCLEAN" :
- cd "..\Client"
- $(MAKE) /$(MAKEFLAGS) /F .\Client.mak CFG="Client - Win32 Release" RECURSE=1 CLEAN
- cd "..\WSClient"
-
-!ELSEIF "$(CFG)" == "WSClient - Win32 Debug"
-
-"Client - Win32 Debug" :
- cd "..\Client"
- $(MAKE) /$(MAKEFLAGS) /F .\Client.mak CFG="Client - Win32 Debug"
- cd "..\WSClient"
-
-"Client - Win32 DebugCLEAN" :
- cd "..\Client"
- $(MAKE) /$(MAKEFLAGS) /F .\Client.mak CFG="Client - Win32 Debug" RECURSE=1 CLEAN
- cd "..\WSClient"
-
-!ENDIF
!ENDIF
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?view=diff&rev=453618&r1=453617&r2=453618
==============================================================================
--- incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd (original)
+++ incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd Fri Oct 6 07:46:55 2006
@@ -17,22 +17,33 @@
@REM under the License.
rem Will copy the correct files from the source tree for packaging and deployment of the
-rem SCA sample.
+rem SCA Calculator sample.
+
setlocal
-set currentPath=%~d0%~p0
-set sourcePath=%currentPath%..\..\..\..\Calculator
-set buildMode=Release
-if .Debug == .%1 (
-set buildMode=Debug
+if . == .%1 (
+echo source path not specified
+goto usage
)
+set srcdir=%1
-
-if . == %2. (
-set destinationPath=%sourcePath%\deploy
-) ELSE (
-set destinationPath=%2
+if . == .%2 (
+echo input directory not specified
+goto usage
)
+set inpath=%2
+echo %inpath%
+
+
+set deploydir=%TUSCANY_SCACPP%\deploy
+set samplesdir=%deploydir%\samples
+set calcdir=%samplesdir%\Calculator
+set calcdeploydir=%calcdir%\deploy
+
+if not exist %deploydir% mkdir %deploydir%
+if not exist %samplesir% mkdir %samplesir%
+if not exist %calcdir% mkdir %calcdir%
+if not exist %calcdeploydir% mkdir %calcdeploydir%
if not exist %destinationPath%\packages mkdir %destinationPath%\packages
if not exist %destinationPath%\packages\CalculatorComposite mkdir %destinationPath%\packages\CalculatorComposite
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org