diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-02-06 20:25:12 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-02-06 20:25:12 +0000 |
| commit | 0447ef59decd69bc5c03faf1d417863759536d23 (patch) | |
| tree | 0de3e019bddf20f1fe087dbd45328b715befa7e4 /cpp | |
| parent | Fixed alternate sequences for AMI/AMD (diff) | |
| download | ice-0447ef59decd69bc5c03faf1d417863759536d23.tar.bz2 ice-0447ef59decd69bc5c03faf1d417863759536d23.tar.xz ice-0447ef59decd69bc5c03faf1d417863759536d23.zip | |
Added project files for custom test
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/all.dsw | 84 | ||||
| -rwxr-xr-x | cpp/allTests.py | 2 | ||||
| -rwxr-xr-x | cpp/test/Ice/custom/customAMDS.dsp | 255 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/customC.dsp | 8 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/customCOL.dsp | 8 | ||||
| -rw-r--r-- | cpp/test/Ice/custom/customS.dsp | 8 |
6 files changed, 352 insertions, 13 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw index ae3e26779fc..05e3f5c100d 100644 --- a/cpp/all.dsw +++ b/cpp/all.dsw @@ -930,6 +930,90 @@ Package=<4> ###############################################################################
+Project: "customAMDS"=.\test\Ice\custom\customAMDS.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name slice2cpp
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "customC"=.\test\Ice\custom\customC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name slice2cpp
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "customCOL"=.\test\Ice\custom\customCOL.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name slice2cpp
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "customS"=.\test\Ice\custom\customS.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name ice
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name iceutil
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name slice2cpp
+ End Project Dependency
+}}}
+
+###############################################################################
+
Project: "dbmap"=.\test\freeze\dbmap\dbmap.dsp - Package Owner=<4>
Package=<5>
diff --git a/cpp/allTests.py b/cpp/allTests.py index da5e66202d8..3a1cab9262e 100755 --- a/cpp/allTests.py +++ b/cpp/allTests.py @@ -71,7 +71,7 @@ tests = [ \ "Ice/checksum", \ "Ice/stream", \ "Ice/hold", \ - "Ice/custom", \ + #"Ice/custom", \ "IceSSL/configuration", \ "IceSSL/loadPEM", \ "IceSSL/certificateAndKeyParsing", \ diff --git a/cpp/test/Ice/custom/customAMDS.dsp b/cpp/test/Ice/custom/customAMDS.dsp new file mode 100755 index 00000000000..ce26a0b3f49 --- /dev/null +++ b/cpp/test/Ice/custom/customAMDS.dsp @@ -0,0 +1,255 @@ +# Microsoft Developer Studio Project File - Name="customAMDS" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=customAMDS - Win32 Debug Static
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "customAMDS.mak".
+!MESSAGE
+!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 "customAMDS.mak" CFG="customAMDS - Win32 Debug Static"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "customAMDS - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "customAMDS - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "customAMDS - Win32 Debug Static" (based on "Win32 (x86) Console Application")
+!MESSAGE "customAMDS - Win32 Release Static" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "customAMDS - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# 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 /WX /GR /GX /Zi /O1 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 /nologo /subsystem:console /incremental:yes /debug /machine:I386 /out:"serveramd.exe" /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
+
+!ELSEIF "$(CFG)" == "customAMDS - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# 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 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /Fr /FD /Zm200 /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 /nologo /subsystem:console /debug /machine:I386 /out:"serveramd.exe" /pdbtype:sept /libpath:"../../../../lib" /fixed:no
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF "$(CFG)" == "customAMDS - Win32 Debug Static"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "customAMDS___Win32_Debug_Static"
+# PROP BASE Intermediate_Dir "customAMDS___Win32_Debug_Static"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugStatic"
+# PROP Intermediate_Dir "DebugStatic"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "_CONSOLE" /Fr /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /Fr /FD /Zm200 /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../../lib"
+# SUBTRACT BASE LINK32 /incremental:no /nodefaultlib
+# ADD LINK32 ws2_32.lib rpcrt4.lib /nologo /subsystem:console /debug /machine:I386 /out:"serveramd.exe" /pdbtype:sept /libpath:"../../../../lib" /fixed:no
+# SUBTRACT LINK32 /pdb:none
+
+!ELSEIF "$(CFG)" == "customAMDS - Win32 Release Static"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "customAMDS___Win32_Release_Static"
+# PROP BASE Intermediate_Dir "customAMDS___Win32_Release_Static"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseStatic"
+# PROP Intermediate_Dir "ReleaseStatic"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT BASE CPP /Fr /YX
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /Zi /O1 /I "." /I "../../../include" /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /Zm200 /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:console /incremental:yes /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# SUBTRACT BASE LINK32 /debug /nodefaultlib
+# ADD LINK32 ws2_32.lib rpcrt4.lib /nologo /subsystem:console /debug /machine:I386 /out:"serveramd.exe" /libpath:"../../../lib"
+# SUBTRACT LINK32 /incremental:yes /nodefaultlib
+
+!ENDIF
+
+# Begin Target
+
+# Name "customAMDS - Win32 Release"
+# Name "customAMDS - Win32 Debug"
+# Name "customAMDS - Win32 Debug Static"
+# Name "customAMDS - Win32 Release Static"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\MyByteSeq.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\ServerAMD.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Test.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestAMDI.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\MyByteSeq.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Test.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\TestAMDI.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"
+# Begin Source File
+
+SOURCE=.\TestAMD.ice
+
+!IF "$(CFG)" == "customAMDS - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\TestAMD.ice
+
+BuildCmds= \
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list TestAMD.ice
+
+"TestAMD.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"TestAMD.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "customAMDS - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\TestAMD.ice
+
+BuildCmds= \
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list TestAMD.ice
+
+"TestAMD.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"TestAMD.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "customAMDS - Win32 Debug Static"
+
+# Begin Custom Build
+InputPath=.\TestAMD.ice
+
+BuildCmds= \
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list TestAMD.ice
+
+"TestAMD.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"TestAMD.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ELSEIF "$(CFG)" == "customAMDS - Win32 Release Static"
+
+# Begin Custom Build
+InputPath=.\TestAMD.ice
+
+BuildCmds= \
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list TestAMD.ice
+
+"TestAMD.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+
+"TestAMD.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+ $(BuildCmds)
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/cpp/test/Ice/custom/customC.dsp b/cpp/test/Ice/custom/customC.dsp index 8be21420772..583b6d6cdfd 100644 --- a/cpp/test/Ice/custom/customC.dsp +++ b/cpp/test/Ice/custom/customC.dsp @@ -189,7 +189,7 @@ SOURCE=.\Test.ice InputPath=.\Test.ice
BuildCmds= \
- slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -204,7 +204,7 @@ BuildCmds= \ InputPath=.\Test.ice
BuildCmds= \
- slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -219,7 +219,7 @@ BuildCmds= \ InputPath=.\Test.ice
BuildCmds= \
- slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -234,7 +234,7 @@ BuildCmds= \ InputPath=.\Test.ice
BuildCmds= \
- slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/test/Ice/custom/customCOL.dsp b/cpp/test/Ice/custom/customCOL.dsp index 1dc941de93c..9df67f1d0a1 100644 --- a/cpp/test/Ice/custom/customCOL.dsp +++ b/cpp/test/Ice/custom/customCOL.dsp @@ -197,7 +197,7 @@ SOURCE=.\Test.ice InputPath=.\Test.ice
BuildCmds= \
- slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -212,7 +212,7 @@ BuildCmds= \ InputPath=.\Test.ice
BuildCmds= \
- slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -227,7 +227,7 @@ BuildCmds= \ InputPath=.\Test.ice
BuildCmds= \
- slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -242,7 +242,7 @@ BuildCmds= \ InputPath=.\Test.ice
BuildCmds= \
- slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cpp/test/Ice/custom/customS.dsp b/cpp/test/Ice/custom/customS.dsp index b5552642749..fc9dcd43623 100644 --- a/cpp/test/Ice/custom/customS.dsp +++ b/cpp/test/Ice/custom/customS.dsp @@ -193,7 +193,7 @@ SOURCE=.\Test.ice InputPath=.\Test.ice
BuildCmds= \
- slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -208,7 +208,7 @@ BuildCmds= \ InputPath=.\Test.ice
BuildCmds= \
- slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -223,7 +223,7 @@ BuildCmds= \ InputPath=.\Test.ice
BuildCmds= \
- slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -238,7 +238,7 @@ BuildCmds= \ InputPath=.\Test.ice
BuildCmds= \
- slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
+ slice2cpp.exe -I. --stream --add-header MyByteSeq.h --add-header deque --add-header list Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
|