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/07/11 15:16:55 UTC
svn commit: r420834 - in /incubator/tuscany/cpp/sdo/projects/tuscany_sdo: ./
sdo_axiom/ sdo_axiom_test/ sdo_runtime/ sdo_samples/ sdo_test/
Author: robbinspg
Date: Tue Jul 11 06:16:53 2006
New Revision: 420834
URL: http://svn.apache.org/viewvc?rev=420834&view=rev
Log:
TUSCANY-534 Windows release build for SDO
Modified:
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/build.cmd
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/build_instructions.txt
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_samples/sdo_samples.dsp
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_samples/sdo_samples.mak
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.opt
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/build.cmd
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/build.cmd?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/projects/tuscany_sdo/build.cmd (original)
+++ incubator/tuscany/cpp/sdo/projects/tuscany_sdo/build.cmd Tue Jul 11 06:16:53 2006
@@ -1,3 +1,3 @@
cd sdo_axiom_test
-NMAKE /f "sdo_axiom_test.mak" CFG="sdo_axiom_test - Win32 Debug"
+NMAKE /f "sdo_axiom_test.mak" CFG="sdo_axiom_test - Win32 Release"
cd ..
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/build_instructions.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/build_instructions.txt?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/projects/tuscany_sdo/build_instructions.txt (original)
+++ incubator/tuscany/cpp/sdo/projects/tuscany_sdo/build_instructions.txt Tue Jul 11 06:16:53 2006
@@ -5,7 +5,7 @@
(available here: http://www.zlatkovic.com/libxml.en.html)
The versions required are these:
- libxml2-2.6.19.win32
+ libxml2-2.6.20.win32
iconv-1.9.1.win32
zlib-1.2.2.win32
@@ -15,11 +15,12 @@
The two projects sdo_axiom and sdo_axiom_test are dependent on AXIS2C, and require that
an environment variable AXIS2C_HOME be set to where axis2c is installed. Axis2c can be
-located at http://ws.apache.org/axis2/c/.
+located at http://ws.apache.org/axis2/c/. Please read the axis2c documentation to ensure
+you have installed any pre-requisites.
Open the build workspace tuscany\cpp\sdo\runtime\projects\tuscany_sdo\tuscany_sdo.dsw
-Build->Set Active Configuration->sdo_runtime - Win32 Release
+Build->Set Active Configuration->sdo_axiom_test - Win32 Release
Build->Rebuild All
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp (original)
+++ incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.dsp Tue Jul 11 06:16:53 2006
@@ -40,9 +40,11 @@
# 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 /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -52,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 /nologo /dll /machine:I386
+# ADD LINK32 axis2_parser.lib axis2_util.lib axiom.lib tuscany_sdo.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 /dll /machine:I386 /out:"Release/tuscany_sdo_axiom.dll" /libpath:"..\..\..\deploy\lib" /libpath:"$(AXIS2C_HOME)\lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy Release\tuscany_sdo_axiom.dll ..\..\..\deploy\bin copy Release\tuscany_sdo_axiom.lib ..\..\..\deploy\lib copy ..\..\..\runtime\core\sdo_axiom\sdo_axiom.h ..\..\..\deploy\include copy ..\..\..\runtime\core\sdo_axiom\sdo_axiom_export.h ..\..\..\deploy\include
+# End Special Build Tool
!ELSEIF "$(CFG)" == "sdo_axiom - Win32 Debug"
@@ -68,7 +74,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -82,7 +88,7 @@
# ADD LINK32 axis2_parser.lib axis2_util.lib axiom.lib tuscany_sdo.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 /dll /debug /machine:I386 /out:"Debug/tuscany_sdo_axiom.dll" /pdbtype:sept /libpath:"..\..\..\deploy\lib" /libpath:"$(AXIS2C_HOME)\lib"
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy Debug\tuscany_sdo_axiom.dll ..\..\..\deploy\bin copy Debug\tuscany_sdo_axiom.pdb ..\..\..\deploy\bin copy Debug\tuscany_sdo_axiom.lib ..\..\..\deploy\lib copy ..\..\..\runtime\core\sdo_axiom\sdo_axiom.h ..\..\..\deploy\include\ copy ..\..\..\runtime\core\sdo_axiom\sdo_axiom_export.h ..\..\..\deploy\include\
+PostBuild_Cmds=copy Debug\tuscany_sdo_axiom.dll ..\..\..\deploy\bin copy Debug\tuscany_sdo_axiom.pdb ..\..\..\deploy\bin copy Debug\tuscany_sdo_axiom.lib ..\..\..\deploy\lib copy ..\..\..\runtime\core\sdo_axiom\sdo_axiom.h ..\..\..\deploy\include copy ..\..\..\runtime\core\sdo_axiom\sdo_axiom_export.h ..\..\..\deploy\include
# End Special Build Tool
!ENDIF
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak (original)
+++ incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom/sdo_axiom.mak Tue Jul 11 06:16:53 2006
@@ -35,11 +35,11 @@
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\sdo_axiom.dll"
+ALL : "$(OUTDIR)\tuscany_sdo_axiom.dll"
!ELSE
-ALL : "sdo_runtime - Win32 Release" "$(OUTDIR)\sdo_axiom.dll"
+ALL : "sdo_runtime - Win32 Release" "$(OUTDIR)\tuscany_sdo_axiom.dll"
!ENDIF
@@ -50,15 +50,15 @@
!ENDIF
-@erase "$(INTDIR)\sdo_axiom.obj"
-@erase "$(INTDIR)\vc60.idb"
- -@erase "$(OUTDIR)\sdo_axiom.dll"
- -@erase "$(OUTDIR)\sdo_axiom.exp"
- -@erase "$(OUTDIR)\sdo_axiom.lib"
+ -@erase "$(OUTDIR)\tuscany_sdo_axiom.dll"
+ -@erase "$(OUTDIR)\tuscany_sdo_axiom.exp"
+ -@erase "$(OUTDIR)\tuscany_sdo_axiom.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /Fp"$(INTDIR)\sdo_axiom.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -98,16 +98,32 @@
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 /nologo /dll /incremental:no /pdb:"$(OUTDIR)\sdo_axiom.pdb" /machine:I386 /out:"$(OUTDIR)\sdo_axiom.dll" /implib:"$(OUTDIR)\sdo_axiom.lib"
+LINK32_FLAGS=axis2_parser.lib axis2_util.lib axiom.lib tuscany_sdo.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 /dll /incremental:no /pdb:"$(OUTDIR)\tuscany_sdo_axiom.pdb" /machine:I386 /out:"$(OUTDIR)\tuscany_sdo_axiom.dll" /implib:"$(OUTDIR)\tuscany_sdo_axiom.lib" /libpath:"..\..\..\deploy\lib" /libpath:"$(AXIS2C_HOME)\lib"
LINK32_OBJS= \
"$(INTDIR)\sdo_axiom.obj" \
- "..\..\..\runtime\core\Release\tuscany_sdo.lib"
+ "..\sdo_runtime\Release\tuscany_sdo.lib"
-"$(OUTDIR)\sdo_axiom.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\tuscany_sdo_axiom.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) : "sdo_runtime - Win32 Release" "$(OUTDIR)\tuscany_sdo_axiom.dll"
+ copy Release\tuscany_sdo_axiom.dll ..\..\..\deploy\bin
+ copy Release\tuscany_sdo_axiom.lib ..\..\..\deploy\lib
+ copy ..\..\..\runtime\core\sdo_axiom\sdo_axiom.h ..\..\..\deploy\include
+ copy ..\..\..\runtime\core\sdo_axiom\sdo_axiom_export.h ..\..\..\deploy\include
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
!ELSEIF "$(CFG)" == "sdo_axiom - Win32 Debug"
OUTDIR=.\Debug
@@ -144,7 +160,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_AXIOM_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -187,7 +203,7 @@
LINK32_FLAGS=axis2_parser.lib axis2_util.lib axiom.lib tuscany_sdo.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 /dll /incremental:yes /pdb:"$(OUTDIR)\tuscany_sdo_axiom.pdb" /debug /machine:I386 /out:"$(OUTDIR)\tuscany_sdo_axiom.dll" /implib:"$(OUTDIR)\tuscany_sdo_axiom.lib" /pdbtype:sept /libpath:"..\..\..\deploy\lib" /libpath:"$(AXIS2C_HOME)\lib"
LINK32_OBJS= \
"$(INTDIR)\sdo_axiom.obj" \
- "..\..\..\runtime\core\Debug\tuscany_sdo.lib"
+ "..\sdo_runtime\Debug\tuscany_sdo.lib"
"$(OUTDIR)\tuscany_sdo_axiom.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -204,11 +220,12 @@
# End Custom Macros
$(DS_POSTBUILD_DEP) : "sdo_runtime - Win32 Debug" "$(OUTDIR)\tuscany_sdo_axiom.dll"
- copy Debug\tuscany_sdo_axiom.dll ..\..\..\deploy\bin
- copy Debug\tuscany_sdo_axiom.pdb ..\..\..\deploy\bin
- copy Debug\tuscany_sdo_axiom.lib ..\..\..\deploy\lib
- copy ..\..\..\runtime\core\sdo_axiom\sdo_axiom.h ..\..\..\deploy\include
- copy ..\..\..\runtime\core\sdo_axiom\sdo_axiom_export.h ..\..\..\deploy\include
+ copy Debug\tuscany_sdo_axiom.dll ..\..\..\deploy\bin
+ copy Debug\tuscany_sdo_axiom.pdb ..\..\..\deploy\bin
+ copy Debug\tuscany_sdo_axiom.lib ..\..\..\deploy\lib
+ copy ..\..\..\runtime\core\sdo_axiom\sdo_axiom.h ..\..\..\deploy\include
+ copy ..\..\..\runtime\core\sdo_axiom\sdo_axiom_export.h ..\..\..\deploy\include
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ENDIF
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp (original)
+++ incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.dsp Tue Jul 11 06:16:53 2006
@@ -39,9 +39,11 @@
# 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 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -49,7 +51,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 /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 /nologo /subsystem:console /machine:I386
+# ADD LINK32 tuscany_sdo.lib tuscany_sdo_axiom.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 /libpath:"..\..\..\deploy\lib"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=copy ..\..\..\deploy\bin\*.dll Release
+# End Special Build Tool
!ELSEIF "$(CFG)" == "sdo_axiom_test - Win32 Debug"
@@ -65,7 +71,7 @@
# 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 "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
@@ -74,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 tuscany_sdo.lib tuscany_sdo_axiom.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 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 /libpath:"..\..\..\deploy\lib"
+# ADD LINK32 tuscany_sdo.lib tuscany_sdo_axiom.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 /libpath:"..\..\..\deploy\lib"
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Cmds=copy ..\..\..\deploy\bin\*.dll Debug copy ..\..\..\deploy\bin\*.pdb Debug
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak (original)
+++ incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_axiom_test/sdo_axiom_test.mak Tue Jul 11 06:16:53 2006
@@ -56,7 +56,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\sdo_axiom_test.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -94,17 +94,30 @@
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 /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sdo_axiom_test.pdb" /machine:I386 /out:"$(OUTDIR)\sdo_axiom_test.exe"
+LINK32_FLAGS=tuscany_sdo.lib tuscany_sdo_axiom.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 /incremental:no /pdb:"$(OUTDIR)\sdo_axiom_test.pdb" /machine:I386 /out:"$(OUTDIR)\sdo_axiom_test.exe" /libpath:"..\..\..\deploy\lib"
LINK32_OBJS= \
"$(INTDIR)\sdo_axiom_test.obj" \
- "..\sdo_axiom\Release\sdo_axiom.lib" \
- "..\..\..\runtime\core\Release\tuscany_sdo.lib"
+ "..\sdo_axiom\Release\tuscany_sdo_axiom.lib" \
+ "..\sdo_runtime\Release\tuscany_sdo.lib"
"$(OUTDIR)\sdo_axiom_test.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=.\Release
+# End Custom Macros
+
+$(DS_POSTBUILD_DEP) : "sdo_test - Win32 Release" "sdo_runtime - Win32 Release" "sdo_axiom - Win32 Release" "$(OUTDIR)\sdo_axiom_test.exe"
+ copy ..\..\..\deploy\bin\*.dll Release
+ echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
+
!ELSEIF "$(CFG)" == "sdo_axiom_test - Win32 Debug"
OUTDIR=.\Debug
@@ -139,7 +152,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\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 "..\..\..\deploy\include" /I "$(AXIS2C_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -177,11 +190,11 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=tuscany_sdo.lib tuscany_sdo_axiom.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 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 /incremental:yes /pdb:"$(OUTDIR)\sdo_axiom_test.pdb" /debug /machine:I386 /out:"$(OUTDIR)\sdo_axiom_test.exe" /pdbtype:sept /libpath:"..\..\..\deploy\lib"
+LINK32_FLAGS=tuscany_sdo.lib tuscany_sdo_axiom.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 /incremental:yes /pdb:"$(OUTDIR)\sdo_axiom_test.pdb" /debug /machine:I386 /out:"$(OUTDIR)\sdo_axiom_test.exe" /pdbtype:sept /libpath:"..\..\..\deploy\lib"
LINK32_OBJS= \
"$(INTDIR)\sdo_axiom_test.obj" \
"..\sdo_axiom\Debug\tuscany_sdo_axiom.lib" \
- "..\..\..\runtime\core\Debug\tuscany_sdo.lib"
+ "..\sdo_runtime\Debug\tuscany_sdo.lib"
"$(OUTDIR)\sdo_axiom_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp (original)
+++ incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.dsp Tue Jul 11 06:16:53 2006
@@ -38,12 +38,12 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\runtime\core\Release"
-# PROP Intermediate_Dir "..\..\..\runtime\core\Release"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_RUNTIME_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\runtime\core\src" /I "$(LIBXML2_HOME)\include" /I "$(ICONV_HOME)\include" /I "$(ZLIB_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\runtime\core\src" /I "$(LIBXML2_HOME)\include" /I "$(ICONV_HOME)\include" /I "$(ZLIB_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_EXPORTS" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -53,13 +53,12 @@
# 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 libxml2.lib /nologo /dll /machine:I386 /out:"..\..\..\runtime\core\Release\tuscany_sdo.dll" /libpath:"$(LIBXML2_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 libxml2.lib /nologo /dll /machine:I386 /out:"Release\tuscany_sdo.dll" /libpath:"$(LIBXML2_HOME)\lib"
+# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Desc=copyout
-PostBuild_Cmds=copy ..\..\..\runtime\core\Release\tuscany_sdo.dll ..\..\..\bin copy ..\..\..\runtime\core\Release\tuscany_sdo.lib ..\..\..\lib copy ..\..\..\runtime\core\src\commonj\sdo\Property.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\ChangedDataObjectList.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\ChangeSummary.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\CopyHelper.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\DataFactory.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\DataGraph.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\DataObject.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\DataObjectInstance.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\DataObjectList.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\DefaultLogWrit
er.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\EqualityHelper.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\export.h ..\..\..\include\commonj\sdo copy\
- ..\..\..\runtime\core\src\commonj\sdo\HelperProvider.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\Logger.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\Logging.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\LogWriter.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\PropertyList.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\RefCountingPointer.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\SDOCheck.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\SDODate.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\SDORuntime.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\SDORuntimeException.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\SDOUtils.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\
commonj\sdo\Sequence.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\Setting.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\SettingList.h ..\..\..\include\commonj\sdo copy\
- ..\..\..\runtime\core\src\commonj\sdo\Type.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\TypeList.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\XMLDocument.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\XMLHelper.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\XSDHelper.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\SDO.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\RefCountingObject.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\DASValue.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\XpathHelper.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\TypeImpl.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\TypeDefinitions.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\Typ
eDefinition.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\PropertyDefinition.h ..\..\..\include\commonj\sdo copy ..\..\..\runtime\core\src\commonj\sdo\SDOString.h ..\..\..\include\commonj\sdo
+PostBuild_Cmds=copy Release\tuscany_sdo.dll ..\..\..\deploy\bin copy Release\tuscany_sdo.lib ..\..\..\deploy\lib copy ..\..\..\runtime\core\src\commonj\sdo\*.h ..\..\..\deploy\include\commonj\sdo
# End Special Build Tool
!ELSEIF "$(CFG)" == "sdo_runtime - Win32 Debug"
@@ -71,13 +70,12 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\runtime\core\Debug"
-# PROP Intermediate_Dir "..\..\..\runtime\core\Debug"
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_RUNTIME_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\runtime\core\src" /I "$(LIBXML2_HOME)\include" /I "$(ICONV_HOME)\include" /I "$(ZLIB_HOME)\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_EXPORTS" /FD /GZ /c
-# SUBTRACT CPP /X /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -87,12 +85,12 @@
# 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 libxml2.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\runtime\core\Debug\tuscany_sdo.dll" /pdbtype:sept /libpath:"$(LIBXML2_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 libxml2.lib /nologo /dll /debug /machine:I386 /out:"Debug\tuscany_sdo.dll" /pdbtype:sept /libpath:"$(LIBXML2_HOME)\lib"
# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Desc=copyout
-PostBuild_Cmds=copy ..\..\..\runtime\core\Debug\tuscany_sdo.dll ..\..\..\deploy\bin copy ..\..\..\runtime\core\Debug\tuscany_sdo.lib ..\..\..\deploy\lib copy ..\..\..\runtime\core\src\commonj\sdo\*.h ..\..\..\deploy\include\commonj\sdo copy ..\..\..\runtime\core\Debug\tuscany_sdo.pdb ..\..\..\deploy\bin
+PostBuild_Cmds=copy Debug\tuscany_sdo.dll ..\..\..\deploy\bin copy Debug\tuscany_sdo.lib ..\..\..\deploy\lib copy ..\..\..\runtime\core\src\commonj\sdo\*.h ..\..\..\deploy\include\commonj\sdo copy Debug\tuscany_sdo.pdb ..\..\..\deploy\bin
# End Special Build Tool
!ENDIF
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak (original)
+++ incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_runtime/sdo_runtime.mak Tue Jul 11 06:16:53 2006
@@ -27,10 +27,10 @@
!IF "$(CFG)" == "sdo_runtime - Win32 Release"
-OUTDIR=.\..\..\..\runtime\core\Release
-INTDIR=.\..\..\..\runtime\core\Release
+OUTDIR=.\Release
+INTDIR=.\Release
# Begin Custom Macros
-OutDir=.\..\..\..\runtime\core\Release
+OutDir=.\Release
# End Custom Macros
ALL : "$(OUTDIR)\tuscany_sdo.dll"
@@ -123,7 +123,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /I "..\..\..\runtime\core\src" /I "$(LIBXML2_HOME)\include" /I "$(ICONV_HOME)\include" /I "$(ZLIB_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_EXPORTS" /Fp"$(INTDIR)\sdo_runtime.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\runtime\core\src" /I "$(LIBXML2_HOME)\include" /I "$(ICONV_HOME)\include" /I "$(ZLIB_HOME)\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SDO_EXPORTS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -255,60 +255,21 @@
ALL : $(DS_POSTBUILD_DEP)
# Begin Custom Macros
-OutDir=.\..\..\..\runtime\core\Release
+OutDir=.\Release
# End Custom Macros
$(DS_POSTBUILD_DEP) : "$(OUTDIR)\tuscany_sdo.dll"
- copy ..\..\..\runtime\core\Release\tuscany_sdo.dll ..\..\..\bin
- copy ..\..\..\runtime\core\Release\tuscany_sdo.lib ..\..\..\lib
- copy ..\..\..\runtime\core\src\commonj\sdo\Property.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\ChangedDataObjectList.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\ChangeSummary.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\CopyHelper.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\DataFactory.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\DataGraph.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\DataObject.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\DataObjectInstance.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\DataObjectList.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\DefaultLogWriter.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\EqualityHelper.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\export.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\HelperProvider.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\Logger.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\Logging.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\LogWriter.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\PropertyList.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\RefCountingPointer.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\SDOCheck.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\SDODate.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\SDORuntime.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\SDORuntimeException.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\SDOUtils.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\Sequence.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\Setting.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\SettingList.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\Type.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\TypeList.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\XMLDocument.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\XMLHelper.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\XSDHelper.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\SDO.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\RefCountingObject.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\DASValue.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\XpathHelper.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\TypeImpl.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\TypeDefinitions.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\TypeDefinition.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\PropertyDefinition.h ..\..\..\include\commonj\sdo
- copy ..\..\..\runtime\core\src\commonj\sdo\SDOString.h ..\..\..\include\commonj\sdo
+ copy Release\tuscany_sdo.dll ..\..\..\deploy\bin
+ copy Release\tuscany_sdo.lib ..\..\..\deploy\lib
+ copy ..\..\..\runtime\core\src\commonj\sdo\*.h ..\..\..\deploy\include\commonj\sdo
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ELSEIF "$(CFG)" == "sdo_runtime - Win32 Debug"
-OUTDIR=.\..\..\..\runtime\core\Debug
-INTDIR=.\..\..\..\runtime\core\Debug
+OUTDIR=.\Debug
+INTDIR=.\Debug
# Begin Custom Macros
-OutDir=.\..\..\..\runtime\core\Debug
+OutDir=.\Debug
# End Custom Macros
ALL : "$(OUTDIR)\tuscany_sdo.dll"
@@ -536,14 +497,14 @@
ALL : $(DS_POSTBUILD_DEP)
# Begin Custom Macros
-OutDir=.\..\..\..\runtime\core\Debug
+OutDir=.\Debug
# End Custom Macros
$(DS_POSTBUILD_DEP) : "$(OUTDIR)\tuscany_sdo.dll"
- copy ..\..\..\runtime\core\Debug\tuscany_sdo.dll ..\..\..\deploy\bin
- copy ..\..\..\runtime\core\Debug\tuscany_sdo.lib ..\..\..\deploy\lib
+ copy Debug\tuscany_sdo.dll ..\..\..\deploy\bin
+ copy Debug\tuscany_sdo.lib ..\..\..\deploy\lib
copy ..\..\..\runtime\core\src\commonj\sdo\*.h ..\..\..\deploy\include\commonj\sdo
- copy ..\..\..\runtime\core\Debug\tuscany_sdo.pdb ..\..\..\deploy\bin
+ copy Debug\tuscany_sdo.pdb ..\..\..\deploy\bin
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ENDIF
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_samples/sdo_samples.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_samples/sdo_samples.dsp?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_samples/sdo_samples.dsp (original)
+++ incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_samples/sdo_samples.dsp Tue Jul 11 06:16:53 2006
@@ -37,12 +37,12 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\runtime\core\samples\Release"
-# PROP Intermediate_Dir "..\..\..\runtime\core\samples\Release"
+# 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 "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\deploy\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,10 +50,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 /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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\deploy\lib"
+# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy ..\..\..\runtime\core\samples\*.xsd ..\..\..\runtime\core\samples\Release copy ..\..\..\runtime\core\samples\*.xml ..\..\..\runtime\core\samples\Release copy ..\..\..\runtime\core\samples\*.wsdl ..\..\..\runtime\core\samples\Release copy ..\..\..\bin\*.dll ..\..\..\runtime\core\samples\Release
+PostBuild_Cmds=copy ..\..\..\runtime\core\samples\*.xsd ..\..\..\runtime\core\samples\Release copy ..\..\..\runtime\core\samples\*.xml ..\..\..\runtime\core\samples\Release copy ..\..\..\runtime\core\samples\*.wsdl ..\..\..\runtime\core\samples\Release copy ..\..\..\deploy\bin\*.dll ..\..\..\runtime\core\samples\Release
# End Special Build Tool
!ELSEIF "$(CFG)" == "sdo_samples - Win32 Debug"
@@ -65,13 +66,12 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\runtime\core\samples\Debug"
-# PROP Intermediate_Dir "..\..\..\runtime\core\samples\Debug"
+# 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 "..\..\..\deploy\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
@@ -79,10 +79,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 tuscany_sdo.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 /out:"..\..\..\runtime\core\samples\Debug/samples.exe" /pdbtype:sept /libpath:"..\..\..\deploy\lib"
+# ADD LINK32 tuscany_sdo.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 /out:"Debug/samples.exe" /pdbtype:sept /libpath:"..\..\..\deploy\lib"
+# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy ..\..\..\runtime\core\samples\*.xsd ..\..\..\runtime\core\samples\Debug copy ..\..\..\runtime\core\samples\*.xml ..\..\..\runtime\core\samples\Debug copy ..\..\..\deploy\bin\*.dll ..\..\..\runtime\core\samples\Debug copy ..\..\..\deploy\bin\*.pdb ..\..\..\runtime\core\samples\Debug
+PostBuild_Cmds=copy ..\..\..\runtime\core\samples\*.xsd ..\..\..\runtime\core\samples\Debug copy ..\..\..\runtime\core\samples\*.xml ..\..\..\runtime\core\samples\Debug copy ..\..\..\deploy\bin\*.dll ..\..\..\runtime\core\samples\Debug copy ..\..\..\deploy\bin\*.pdb ..\..\..\runtime\core\samples\Debug copy ..\..\..\runtime\core\samples\*.wsdl ..\..\..\runtime\core\samples\Debug
# End Special Build Tool
!ENDIF
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_samples/sdo_samples.mak
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_samples/sdo_samples.mak?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_samples/sdo_samples.mak (original)
+++ incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_samples/sdo_samples.mak Tue Jul 11 06:16:53 2006
@@ -27,10 +27,10 @@
!IF "$(CFG)" == "sdo_samples - Win32 Release"
-OUTDIR=.\..\..\..\runtime\core\samples\Release
-INTDIR=.\..\..\..\runtime\core\samples\Release
+OUTDIR=.\Release
+INTDIR=.\Release
# Begin Custom Macros
-OutDir=.\..\..\..\runtime\core\samples\Release
+OutDir=.\Release
# End Custom Macros
!IF "$(RECURSE)" == "0"
@@ -61,7 +61,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\sdo_samples.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\..\..\deploy\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -99,7 +99,7 @@
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 /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sdo_samples.pdb" /machine:I386 /out:"$(OUTDIR)\sdo_samples.exe" /libpath:"..\..\..\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 /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sdo_samples.pdb" /machine:I386 /out:"$(OUTDIR)\sdo_samples.exe" /libpath:"..\..\..\deploy\lib"
LINK32_OBJS= \
"$(INTDIR)\ChangeSummarySave.obj" \
"$(INTDIR)\ObjectCreation.obj" \
@@ -107,7 +107,7 @@
"$(INTDIR)\samples.obj" \
"$(INTDIR)\Substitutes.obj" \
"$(INTDIR)\XSDLoading.obj" \
- "..\..\..\runtime\core\Release\tuscany_sdo.lib"
+ "..\sdo_runtime\Release\tuscany_sdo.lib"
"$(OUTDIR)\sdo_samples.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -120,22 +120,22 @@
ALL : $(DS_POSTBUILD_DEP)
# Begin Custom Macros
-OutDir=.\..\..\..\runtime\core\samples\Release
+OutDir=.\Release
# End Custom Macros
$(DS_POSTBUILD_DEP) : "sdo_runtime - Win32 Release" "$(OUTDIR)\sdo_samples.exe"
copy ..\..\..\runtime\core\samples\*.xsd ..\..\..\runtime\core\samples\Release
copy ..\..\..\runtime\core\samples\*.xml ..\..\..\runtime\core\samples\Release
copy ..\..\..\runtime\core\samples\*.wsdl ..\..\..\runtime\core\samples\Release
- copy ..\..\..\bin\*.dll ..\..\..\runtime\core\samples\Release
+ copy ..\..\..\deploy\bin\*.dll ..\..\..\runtime\core\samples\Release
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ELSEIF "$(CFG)" == "sdo_samples - Win32 Debug"
-OUTDIR=.\..\..\..\runtime\core\samples\Debug
-INTDIR=.\..\..\..\runtime\core\samples\Debug
+OUTDIR=.\Debug
+INTDIR=.\Debug
# Begin Custom Macros
-OutDir=.\..\..\..\runtime\core\samples\Debug
+OutDir=.\Debug
# End Custom Macros
!IF "$(RECURSE)" == "0"
@@ -169,7 +169,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\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 "..\..\..\deploy\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -215,7 +215,7 @@
"$(INTDIR)\samples.obj" \
"$(INTDIR)\Substitutes.obj" \
"$(INTDIR)\XSDLoading.obj" \
- "..\..\..\runtime\core\Debug\tuscany_sdo.lib"
+ "..\sdo_runtime\Debug\tuscany_sdo.lib"
"$(OUTDIR)\samples.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -228,7 +228,7 @@
ALL : $(DS_POSTBUILD_DEP)
# Begin Custom Macros
-OutDir=.\..\..\..\runtime\core\samples\Debug
+OutDir=.\Debug
# End Custom Macros
$(DS_POSTBUILD_DEP) : "sdo_runtime - Win32 Debug" "$(OUTDIR)\samples.exe"
@@ -236,6 +236,7 @@
copy ..\..\..\runtime\core\samples\*.xml ..\..\..\runtime\core\samples\Debug
copy ..\..\..\deploy\bin\*.dll ..\..\..\runtime\core\samples\Debug
copy ..\..\..\deploy\bin\*.pdb ..\..\..\runtime\core\samples\Debug
+ copy ..\..\..\runtime\core\samples\*.wsdl ..\..\..\runtime\core\samples\Debug
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ENDIF
@@ -290,24 +291,24 @@
!IF "$(CFG)" == "sdo_samples - Win32 Release"
"sdo_runtime - Win32 Release" :
- cd "\apache\apache_checkout\cpp\sdo\projects\tuscany_sdo\sdo_runtime"
+ cd "..\sdo_runtime"
$(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Release"
cd "..\sdo_samples"
"sdo_runtime - Win32 ReleaseCLEAN" :
- cd "\apache\apache_checkout\cpp\sdo\projects\tuscany_sdo\sdo_runtime"
+ cd "..\sdo_runtime"
$(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Release" RECURSE=1 CLEAN
cd "..\sdo_samples"
!ELSEIF "$(CFG)" == "sdo_samples - Win32 Debug"
"sdo_runtime - Win32 Debug" :
- cd "\apache\apache_checkout\cpp\sdo\projects\tuscany_sdo\sdo_runtime"
+ cd "..\sdo_runtime"
$(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Debug"
cd "..\sdo_samples"
"sdo_runtime - Win32 DebugCLEAN" :
- cd "\apache\apache_checkout\cpp\sdo\projects\tuscany_sdo\sdo_runtime"
+ cd "..\sdo_runtime"
$(MAKE) /$(MAKEFLAGS) /F .\sdo_runtime.mak CFG="sdo_runtime - Win32 Debug" RECURSE=1 CLEAN
cd "..\sdo_samples"
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp (original)
+++ incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_test/sdo_test.dsp Tue Jul 11 06:16:53 2006
@@ -37,13 +37,12 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\runtime\core\test\Release"
-# PROP Intermediate_Dir "..\..\..\runtime\core\test\Release"
+# 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 "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MD /W3 /GX /I "..\..\..\deploy\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
@@ -51,10 +50,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 /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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\deploy\lib"
+# SUBTRACT LINK32 /verbose /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy ..\..\..\bin\*.dll ..\..\..\runtime\core\test\Release
+PostBuild_Cmds=copy ..\..\..\deploy\bin\*.dll ..\..\..\runtime\core\test\Release
# End Special Build Tool
!ELSEIF "$(CFG)" == "sdo_test - Win32 Debug"
@@ -66,13 +66,12 @@
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\runtime\core\test\Debug"
-# PROP Intermediate_Dir "..\..\..\runtime\core\test\Debug"
+# 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 "..\..\..\deploy\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /Zm200 /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /Zm200 /c
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
@@ -81,6 +80,7 @@
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 tuscany_sdo.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 /libpath:"..\..\..\deploy\lib"
+# SUBTRACT LINK32 /pdb:none
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Cmds=copy ..\..\..\deploy\bin\*.dll ..\..\..\runtime\core\test\Debug copy ..\..\..\deploy\bin\*.pdb ..\..\..\runtime\core\test\Debug
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
--- incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak (original)
+++ incubator/tuscany/cpp/sdo/projects/tuscany_sdo/sdo_test/sdo_test.mak Tue Jul 11 06:16:53 2006
@@ -27,10 +27,10 @@
!IF "$(CFG)" == "sdo_test - Win32 Release"
-OUTDIR=.\..\..\..\runtime\core\test\Release
-INTDIR=.\..\..\..\runtime\core\test\Release
+OUTDIR=.\Release
+INTDIR=.\Release
# Begin Custom Macros
-OutDir=.\..\..\..\runtime\core\test\Release
+OutDir=.\Release
# End Custom Macros
!IF "$(RECURSE)" == "0"
@@ -60,7 +60,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /I "..\..\..\deploy\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -98,14 +98,14 @@
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 /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sdo_test.pdb" /machine:I386 /out:"$(OUTDIR)\sdo_test.exe" /libpath:"..\..\..\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 /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\sdo_test.pdb" /machine:I386 /out:"$(OUTDIR)\sdo_test.exe" /libpath:"..\..\..\deploy\lib"
LINK32_OBJS= \
"$(INTDIR)\main.obj" \
"$(INTDIR)\SdoGenerate.obj" \
"$(INTDIR)\sdotest.obj" \
"$(INTDIR)\sdotest2.obj" \
"$(INTDIR)\utils.obj" \
- "..\..\..\runtime\core\Release\tuscany_sdo.lib"
+ "..\sdo_runtime\Release\tuscany_sdo.lib"
"$(OUTDIR)\sdo_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -118,19 +118,19 @@
ALL : $(DS_POSTBUILD_DEP)
# Begin Custom Macros
-OutDir=.\..\..\..\runtime\core\test\Release
+OutDir=.\Release
# End Custom Macros
$(DS_POSTBUILD_DEP) : "sdo_runtime - Win32 Release" "$(OUTDIR)\sdo_test.exe"
- copy ..\..\..\bin\*.dll ..\..\..\runtime\core\test\Release
+ copy ..\..\..\deploy\bin\*.dll ..\..\..\runtime\core\test\Release
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ELSEIF "$(CFG)" == "sdo_test - Win32 Debug"
-OUTDIR=.\..\..\..\runtime\core\test\Debug
-INTDIR=.\..\..\..\runtime\core\test\Debug
+OUTDIR=.\Debug
+INTDIR=.\Debug
# Begin Custom Macros
-OutDir=.\..\..\..\runtime\core\test\Debug
+OutDir=.\Debug
# End Custom Macros
!IF "$(RECURSE)" == "0"
@@ -163,7 +163,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /Zm200 /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\deploy\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /Zm200 /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -208,7 +208,7 @@
"$(INTDIR)\sdotest.obj" \
"$(INTDIR)\sdotest2.obj" \
"$(INTDIR)\utils.obj" \
- "..\..\..\runtime\core\Debug\tuscany_sdo.lib"
+ "..\sdo_runtime\Debug\tuscany_sdo.lib"
"$(OUTDIR)\sdo_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -221,7 +221,7 @@
ALL : $(DS_POSTBUILD_DEP)
# Begin Custom Macros
-OutDir=.\..\..\..\runtime\core\test\Debug
+OutDir=.\Debug
# End Custom Macros
$(DS_POSTBUILD_DEP) : "sdo_runtime - Win32 Debug" "$(OUTDIR)\sdo_test.exe"
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.ncb
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.ncb?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.opt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/projects/tuscany_sdo/tuscany_sdo.opt?rev=420834&r1=420833&r2=420834&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org