Author: robbinspg
Date: Wed Oct 11 11:26:12 2006
New Revision: 462895

URL: http://svn.apache.org/viewvc?view=rev&rev=462895
Log:
TUSCANY-785 Calculator windows build

Modified:
    
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.mak
    
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/Calculator/Calculator.dsp
    
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Calculator/Calculator.mak
    
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.dsp
    
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak
    
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.dsp
    
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/WSClient/WSClient.mak

Modified: 
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=diff&rev=462895&r1=462894&r2=462895
==============================================================================
--- 
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.mak
 (original)
+++ 
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Build/Build.mak
 Wed Oct 11 11:26:12 2006
@@ -48,15 +48,18 @@
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-MTL=midl.exe
-
 !IF  "$(CFG)" == "Build - Win32 Release"
 
+MTL=midl.exe
+MTL_PROJ=
+
 !ELSEIF  "$(CFG)" == "Build - Win32 Debug"
 
+MTL=midl.exe
+MTL_PROJ=
+
 !ENDIF 
 
-MTL_PROJ=
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("Build.dep")

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=462895&r1=462894&r2=462895
==============================================================================
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=462895&r1=462894&r2=462895
==============================================================================
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=462895&r1=462894&r2=462895
==============================================================================
--- 
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
 Wed Oct 11 11:26:12 2006
@@ -57,7 +57,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_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
+PostBuild_Cmds=call ..\..\..\..\..\Calculator\deploy.bat 
..\..\..\..\..\Calculator Release
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "Calculator - Win32 Debug"
@@ -88,7 +88,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_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
+PostBuild_Cmds=call ..\..\..\..\..\Calculator\deploy.bat 
..\..\..\..\..\Calculator Debug
 # End Special Build Tool
 
 !ENDIF 

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=462895&r1=462894&r2=462895
==============================================================================
--- 
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
 Wed Oct 11 11:26:12 2006
@@ -25,10 +25,6 @@
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "Calculator - Win32 Release"
 
 OUTDIR=.\Release
@@ -67,8 +63,42 @@
 "$(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" /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 
+
+.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
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\Calculator.bsc" 
 BSC32_SBRS= \
@@ -99,7 +129,7 @@
 # End Custom Macros
 
 $(DS_POSTBUILD_DEP) : "Client - Win32 Release" "$(OUTDIR)\Calculator.dll"
-   ..\..\..\..\..\Calculator\deploy.bat ..\..\..\..\..\Calculator Release
+   call ..\..\..\..\..\Calculator\deploy.bat ..\..\..\..\..\Calculator Release
        echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
 
 !ELSEIF  "$(CFG)" == "Calculator - Win32 Debug"
@@ -143,8 +173,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" /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 
+
+.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
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
+RSC=rc.exe
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\Calculator.bsc" 
 BSC32_SBRS= \
@@ -175,40 +239,10 @@
 # End Custom Macros
 
 $(DS_POSTBUILD_DEP) : "Client - Win32 Debug" "$(OUTDIR)\Calculator.dll"
-   ..\..\..\..\..\Calculator\deploy.bat ..\..\..\..\..\Calculator Debug
+   call ..\..\..\..\..\Calculator\deploy.bat ..\..\..\..\..\Calculator Debug
        echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
 
 !ENDIF 
-
-.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) $< 
-<<
 
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"

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=462895&r1=462894&r2=462895
==============================================================================
--- 
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
 Wed Oct 11 11:26:12 2006
@@ -54,7 +54,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_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=..\..\..\..\..\Calculator\deployclient.bat 
..\..\..\..\..\Calculator Release    $(TUSCANY_SCACPP)\bin\scagen.cmd -dir 
../../../../../Calculator/sample.calculator -output 
../../../../../Calculator/sample.calculator -verbose
+PostBuild_Cmds=call ..\..\..\..\..\Calculator\deployclient.bat 
..\..\..\..\..\Calculator Release       call ..\..\..\..\..\scagen.bat 
..\..\..\..\..\Calculator\sample.calculator
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "Client - Win32 Debug"
@@ -84,7 +84,7 @@
 # SUBTRACT LINK32 /pdb:none
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=..\..\..\..\..\Calculator\deployclient.bat 
..\..\..\..\..\Calculator Debug      $(TUSCANY_SCACPP)\bin\scagen.cmd -dir 
../../../../../Calculator/sample.calculator -output 
../../../../../Calculator/sample.calculator -verbose
+PostBuild_Cmds=call ..\..\..\..\..\Calculator\deployclient.bat 
..\..\..\..\..\Calculator Debug call ..\..\..\..\..\scagen.bat 
..\..\..\..\..\Calculator\sample.calculator
 # End Special Build Tool
 
 !ENDIF 

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=462895&r1=462894&r2=462895
==============================================================================
--- 
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
 Wed Oct 11 11:26:12 2006
@@ -25,9 +25,6 @@
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "Client - Win32 Release"
 
 OUTDIR=.\Release
@@ -47,7 +44,40 @@
 "$(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" /I "$(TUSCANY_SCACPP)/extensions/cpp/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)\Client.bsc" 
 BSC32_SBRS= \
@@ -72,8 +102,8 @@
 # End Custom Macros
 
 $(DS_POSTBUILD_DEP) : "$(OUTDIR)\calculator_client.exe"
-   ..\..\..\..\..\Calculator\deployclient.bat ..\..\..\..\..\Calculator Release
-       $(TUSCANY_SCACPP)\bin\scagen.cmd -dir 
../../../../../Calculator/sample.calculator -output 
../../../../../Calculator/sample.calculator -verbose
+   call ..\..\..\..\..\Calculator\deployclient.bat ..\..\..\..\..\Calculator 
Release
+       call ..\..\..\..\..\scagen.bat 
..\..\..\..\..\Calculator\sample.calculator
        echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
 
 !ELSEIF  "$(CFG)" == "Client - Win32 Debug"
@@ -98,36 +128,8 @@
 "$(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" /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
-       $(TUSCANY_SCACPP)/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) @<<
@@ -158,6 +160,37 @@
    $(CPP) @<<
    $(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 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"
+   call ..\..\..\..\..\Calculator\deployclient.bat ..\..\..\..\..\Calculator 
Debug
+       call ..\..\..\..\..\scagen.bat 
..\..\..\..\..\Calculator\sample.calculator
+       echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
 
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"

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=462895&r1=462894&r2=462895
==============================================================================
--- 
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
 Wed Oct 11 11:26:12 2006
@@ -54,7 +54,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_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=..\..\..\..\..\Calculator\deploywsclient.bat 
..\..\..\..\..\Calculator Release
+PostBuild_Cmds=call ..\..\..\..\..\Calculator\deploywsclient.bat 
..\..\..\..\..\Calculator Release
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "WSClient - Win32 Debug"
@@ -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_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=..\..\..\..\..\Calculator\deploywsclient.bat 
..\..\..\..\..\Calculator  Debug
+PostBuild_Cmds=call ..\..\..\..\..\Calculator\deploywsclient.bat 
..\..\..\..\..\Calculator  Debug
 # End Special Build Tool
 
 !ENDIF 

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=462895&r1=462894&r2=462895
==============================================================================
--- 
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
 Wed Oct 11 11:26:12 2006
@@ -25,9 +25,6 @@
 NULL=nul
 !ENDIF 
 
-CPP=cl.exe
-RSC=rc.exe
-
 !IF  "$(CFG)" == "WSClient - Win32 Release"
 
 OUTDIR=.\Release
@@ -48,7 +45,40 @@
 "$(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= \
@@ -74,7 +104,7 @@
 # End Custom Macros
 
 $(DS_POSTBUILD_DEP) : "$(OUTDIR)\calculator_wsclient.exe"
-   ..\..\..\..\..\Calculator\deploywsclient.bat ..\..\..\..\..\Calculator 
Release
+   call ..\..\..\..\..\Calculator\deploywsclient.bat ..\..\..\..\..\Calculator 
Release
        echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
 
 !ELSEIF  "$(CFG)" == "WSClient - Win32 Debug"
@@ -100,36 +130,8 @@
 "$(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) @<<
@@ -160,6 +162,37 @@
    $(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 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"
+   call ..\..\..\..\..\Calculator\deploywsclient.bat ..\..\..\..\..\Calculator 
 Debug
+       echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
+!ENDIF 
 
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to