Author: robbinspg
Date: Wed Jul 19 09:08:57 2006
New Revision: 423510
URL: http://svn.apache.org/viewvc?rev=423510&view=rev
Log:
TUSCANY-564 fix Calculator sample Debug build
Modified:
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/Client/Client.dsp
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/Client/Client.mak
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/deploy.cmd
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
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=423510&r1=423509&r2=423510&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=423510&r1=423509&r2=423510&view=diff
==============================================================================
Binary files - no diff available.
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?rev=423510&r1=423509&r2=423510&view=diff
==============================================================================
---
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 Jul 19 09:08:57 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 /MD /W3 /GX /O2 /I "$(TUSCANY_SDOCPP)/include" /I
"$(TUSCANY_SCACPP)/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD
/c
@@ -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 /MDd /W3 /Gm /GX /ZI /Od /I "$(TUSCANY_SDOCPP)/include" /I
"$(TUSCANY_SCACPP)/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD
/GZ /c
@@ -78,7 +80,7 @@
# 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_sdo.lib tuscany_sca.lib /nologo /subsystem:console /debug
/machine:I386 /out:"Debug/Calc.exe" /pdbtype:sept
/libpath:"$(TUSCANY_SDOCPP)/lib" /libpath:"$(TUSCANY_SCACPP)/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 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 /debug
/machine:I386 /pdbtype:sept /libpath:"$(TUSCANY_SDOCPP)/lib"
/libpath:"$(TUSCANY_SCACPP)/lib"
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
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?rev=423510&r1=423509&r2=423510&view=diff
==============================================================================
---
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 Jul 19 09:08:57 2006
@@ -127,11 +127,11 @@
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\Calc.exe"
+ALL : "$(OUTDIR)\Client.exe"
!ELSE
-ALL : "Calculator - Win32 Debug" "$(OUTDIR)\Calc.exe"
+ALL : "Calculator - Win32 Debug" "$(OUTDIR)\Client.exe"
!ENDIF
@@ -143,9 +143,9 @@
[EMAIL PROTECTED] "$(INTDIR)\Calc.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc60.idb"
[EMAIL PROTECTED] "$(INTDIR)\vc60.pdb"
- [EMAIL PROTECTED] "$(OUTDIR)\Calc.exe"
- [EMAIL PROTECTED] "$(OUTDIR)\Calc.ilk"
- [EMAIL PROTECTED] "$(OUTDIR)\Calc.pdb"
+ [EMAIL PROTECTED] "$(OUTDIR)\Client.exe"
+ [EMAIL PROTECTED] "$(OUTDIR)\Client.ilk"
+ [EMAIL PROTECTED] "$(OUTDIR)\Client.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -189,12 +189,12 @@
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)\Calc.pdb" /debug /machine:I386
/out:"$(OUTDIR)\Calc.exe" /pdbtype:sept /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 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)\Calc.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\Client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -208,7 +208,7 @@
OutDir=.\Debug
# End Custom Macros
-$(DS_POSTBUILD_DEP) : "Calculator - Win32 Debug" "$(OUTDIR)\Calc.exe"
+$(DS_POSTBUILD_DEP) : "Calculator - Win32 Debug" "$(OUTDIR)\Client.exe"
..\deploy.cmd Debug
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
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=423510&r1=423509&r2=423510&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
Wed Jul 19 09:08:57 2006
@@ -21,7 +21,7 @@
set sourcePath=%currentPath%..\..\..\..\Calculator
set buildMode=Release
-if .Debug == %1. (
+if .Debug == .%1 (
set buildMode=Debug
)
Modified:
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
URL:
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd?rev=423510&r1=423509&r2=423510&view=diff
==============================================================================
---
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
(original)
+++
incubator/tuscany/cpp/sca/samples/ides/devstudio6/projects/Calculator/wsdeploy.cmd
Wed Jul 19 09:08:57 2006
@@ -21,7 +21,7 @@
set sourcePath=%currentPath%..\..\..\..\Calculator
set buildMode=Release
-if .Debug == %1. (
+if .Debug == .%1 (
set buildMode=Debug
)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
