From 0640f87859a5a676b41783be4741a62f4d1ea266 Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Wed, 28 Oct 2009 22:22:19 +0000
Subject: tests: More fixes and toolsets support

git-svn-id: http://pugixml.googlecode.com/svn/trunk@190 99668b35-9821-0410-8761-19e4c4f06640
---
 Jamrules.jam | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 71 insertions(+), 9 deletions(-)

(limited to 'Jamrules.jam')

diff --git a/Jamrules.jam b/Jamrules.jam
index 55138f2..c74764f 100644
--- a/Jamrules.jam
+++ b/Jamrules.jam
@@ -13,25 +13,25 @@ if ( $(toolset:I=^mingw) )
 
 	actions ObjectAction
 	{
-		%$(toolset)_PATH%\bin\gcc -W -Wall -Wextra -Werror -pedantic -c $(>) -o $(<) $(CCFLAGS)
+		"%$(toolset)_PATH%\bin\gcc" -W -Wall -Wextra -Werror -pedantic -c $(>) -o $(<) $(CCFLAGS)
 	}
 	
 	actions LibraryAction
 	{
-		%$(toolset)_PATH%\bin\ar rc $(<) $(>)
+		"%$(toolset)_PATH%\bin\ar" rc $(<) $(>)
 	}
 	
 	actions LinkAction
 	{
-		%$(toolset)_PATH%\bin\g++ $(>) -o $(<) $(LDFLAGS) 
+		"%$(toolset)_PATH%\bin\g++" $(>) -o $(<) $(LDFLAGS) 
 	}
 	
 	actions CoverageAction
 	{
-		%$(toolset)_PATH%\bin\gcov $(>:\\) $(GCOVFLAGS) | perl tests/gcov-filter.pl
+		"%$(toolset)_PATH%\bin\gcov" $(>:\\) $(GCOVFLAGS) | perl tests/gcov-filter.pl
 	}
 }
-else if ( $(toolset:I^=msvc) )
+else if ( $(toolset:I=^msvc) )
 {
 	if ( $(configuration) = "debug" )
 	{
@@ -53,17 +53,79 @@ else if ( $(toolset:I^=msvc) )
 
 	actions ObjectAction
 	{
-		%$(toolset)_PATH%\bin\cl.exe /EHsc /WX /I%$(toolset)_PATH%\include /c $(>) /Fo$(<) /nologo $(CCFLAGS)
+		"%$(toolset)_PATH%\bin\cl.exe" /EHsc /WX /I"%$(toolset)_PATH%\include" /c $(>) /Fo$(<) /nologo $(CCFLAGS)
 	}
 	
 	actions LibraryAction
 	{
-		%$(toolset)_PATH%\bin\lib.exe /NOLOGO /OUT:$(<) $(>)
+		"%$(toolset)_PATH%\bin\lib.exe" /NOLOGO /OUT:$(<) $(>)
 	}
 	
 	actions LinkAction
 	{
-		%$(toolset)_PATH%\bin\link.exe /SUBSYSTEM:CONSOLE /NOLOGO /OUT:$(<) $(>) /LIBPATH:%$(toolset)_PATH%\lib /LIBPATH:%$(toolset)_PATH%\PlatformSDK\lib $(LDFLAGS)
+		"%$(toolset)_PATH%\bin\link.exe" /SUBSYSTEM:CONSOLE /NOLOGO /OUT:$(<) $(>) /LIBPATH:"%$(toolset)_PATH%\lib" /LIBPATH:"%$(toolset)_PATH%\PlatformSDK\lib" $(LDFLAGS)
+	}
+	
+	actions CoverageAction
+	{
+	}
+}
+else if ( $(toolset) = "ic8" )
+{
+	msvc = "msvc7" ;
+
+	if ( $(configuration) = "debug" )
+	{
+		CCFLAGS += /D_DEBUG /MTd ;
+	}
+	else
+	{
+		CCFLAGS += /DNDEBUG /Ox /MT ;
+	}
+
+	actions ObjectAction
+	{
+		"%$(toolset)_PATH%\bin\icl.exe" /EHsc /W4 /WX /Wport /Qwd981,444,280,383,909,304,167 /I"%$(msvc)_PATH%\include" /I"%$(toolset)_PATH%\include" /c $(>) /Fo$(<) /nologo $(CCFLAGS)
+	}
+	
+	actions LibraryAction
+	{
+		"%$(msvc)_PATH%\bin\lib.exe" /NOLOGO /OUT:$(<) $(>)
+	}
+	
+	actions LinkAction
+	{
+		"%$(msvc)_PATH%\bin\link.exe" /SUBSYSTEM:CONSOLE /NOLOGO /OUT:$(<) $(>) /LIBPATH:"%$(toolset)_PATH%\lib" /LIBPATH:"%$(msvc)_PATH%\lib" /LIBPATH:"%$(msvc)_PATH%\PlatformSDK\lib" $(LDFLAGS)
+	}
+	
+	actions CoverageAction
+	{
+	}
+}
+else if ( $(toolset:I=^dmc) )
+{
+	if ( $(configuration) = "debug" )
+	{
+		CCFLAGS += -D_DEBUG ;
+	}
+	else
+	{
+		CCFLAGS += -DNDEBUG ;
+	}
+
+	actions ObjectAction
+	{
+		"%$(toolset)_PATH%\bin\dmc.exe" -c -f -wx -Ae $(>) -o$(<)
+	}
+	
+	actions LibraryAction
+	{
+		"%$(toolset)_PATH%\bin\lib.exe" -c $(<) $(>)
+	}
+	
+	actions LinkAction
+	{
+		"%$(toolset)_PATH%\bin\link.exe" $(>:\\) , $(<:\\) , nul , $(LDFLAGS:\\)
 	}
 	
 	actions CoverageAction
@@ -71,7 +133,7 @@ else if ( $(toolset:I^=msvc) )
 	}
 }
 
-actions RunAction
+actions screenoutput RunAction
 {
 	$(>:\\)
 }
-- 
cgit v1.2.3