Mailing-List: contact stdcxx-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: stdcxx-dev@incubator.apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Message-ID: <43A0BD43.2040607@roguewave.com>
Date: Wed, 14 Dec 2005 17:48:03 -0700
From: Martin Sebor <sebor@roguewave.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.12) Gecko/20050920
MIME-Version: 1.0
To: stdcxx-dev@incubator.apache.org
Subject: [Fwd: Solution generartion script for Intel 9.0 compiler]
Content-Type: multipart/mixed;
 boundary="------------020100050509050103030209"

--------------020100050509050103030209
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

-------- Original Message --------
Subject: Solution generartion script for Intel 9.0 compiler
Date: Wed, 14 Dec 2005 19:42:45 +0300
From: Anton Pevtsov <AntonP@moscow.vdiweb.com>
[...]

Hi Martin,

The attached archive (stdcxx_121405.zip) contains the latest version of
the solution generation scripts. Now it supports the solution and build
summary log generation for the Intel 9.0 compiler. The script operates
in the following way: it generates the VC solution and converts it to IC
solution using the ICProjConvert90 utility (it is installed with the
Intel compiler).

I suppose that the user added paths to Intel directories (and to
ICProjConvert90.exe utility which is located in Common Files folder in
Program Files) to PATHS environment variable. Also it is necessary to
add paths to IC folders into Visual Studio general directories
(Tools/Options Projects tabs, VC++ directories) to build from Visual
Studio. And I suppose that the user executed vsvars32 before the calling
to build.bat.

The solution update script will be added in next version.

The attached build_logs.zip archive contains the build summary log for
Intel C++ 9.0 compiler.

There are a couple of questions (they were asked in my previous e-mails,
but I repeat them here):

1) Shall we have build.bat for each configuration (VC71, ICC90) or shall
we have only one build.bat for all configuration (in this case first
parameter of the build.bat will be the configuration)? Currently I
change nothing here and there is the unique build.bat file for each
configuration.

2) Where shall we store the build summary log? The build summary log
files have config-specific names, so we can store them in BUILDDIR\type
(for example, $(BUILDDIR)\11d) directories or in BUILDDIR\config
directories (for example $(BUILDDIR)\icc-9.0); both variants are
possible. Currently I change nothing here and build summary log files
are stored in BUILDDIR\config directories.


And there are several issues for Intel C++ 9.0 Compiler (they were in my
previous e-mails too):

1) The absolute paths to the projects in the solution file are not
supported when you use ICC projects tree. I changed scripts to generate
relative paths but if we need to keep absolute paths for MSVC I'll
branch the script code to MSVC and ICC versions.

2) The ICC solutiion uses .icproj files for projects but requires
corresponding .vcproj files too. It looks like it is impossible to open
the solution without .vcproj file. So the builddir for ICC90 contains
both .icproj and .vcproj files.

3) The Intel Compiler doesn't allow the '*' symbol in defines in the
compiler command line. For example, when you passes to the compiler
something like /D "FUN=strchr((char*)0,0)" the compiler just crashes. I
changed the configure.wsf script and fun_present_check.cpp to avoid
passing '*'. These changes don't affect the MSVC version.

4) There is a problem with project dependencies. They present in the
solution file and you can see them in Visual Studio but it looks like
they are ignored in the building process. This results in that all
examples could not be build because of linker errors. But I can
sucessfully  link any example manually from the command line providing
paths to the required libraries.
After investigation I decided to store paths to the libraries in the
project files. These changes don't affect MSVC version.


The script_patches.zip archive contains .diff files for each modified
script file and two new files:
icc-config.js		(Solution configuration code for Intel compiler)
icc-config_classes.js 	(Intel Compiler, Linker, Librarian tools
"classes")

I plan to modify the update script, implement your notes (see questions
above, please) if any, and send the scripts patches to stdcxx-dev. And
there is a question: shall I send one patch file with all my changes in
scripts (it will be large) or it will be more convenient to send small
patch for each script (like in the attached archive) ?


With best wishes,
Anton Pevtsov.


--------------020100050509050103030209
Content-Type: text/plain;
 name="patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="patch"

Index: config.js
===================================================================
--- config.js	(revision 354007)
+++ config.js	(working copy)
@@ -300,6 +300,7 @@
     this.base = Tool;
     this.base(linkerToolName);
     this.libraries = new Collection();
+    this.libdirs = new Collection();
 }
 
 // Linker class methods
Index: configure.wsf
===================================================================
--- configure.wsf	(revision 354007)
+++ configure.wsf	(working copy)
@@ -41,8 +41,10 @@
         <object id="WshShell" progid="WScript.Shell"/>
         <script language="JScript" src="config.js"/>
         <script language="JScript" src="msvc-config_classes.js"/>
+        <script language="JScript" src="icc-config_classes.js"/>
         <script language="JScript" src="data.js"/>
         <script language="JScript" src="msvc-config.js"/>
+        <script language="JScript" src="icc-config.js"/>
         <script language="JScript" src="utilities.js"/>
         <script id="configure" language="JScript">
 <![CDATA[
@@ -224,7 +226,7 @@
     checkArchitecture();
         
     // headers and functions check
-    checkHeaders();
+    checkHeaders(WScript.Arguments.Named("SolutionName"));
 
     // compile .lib.cpp s
     compileLibs();
@@ -376,8 +378,13 @@
 }
 
 // perform headers presence check
-function checkHeaders()
+function checkHeaders(currentCfg)
 {
+    // for some strange reasons Intel C++ 9.0 Compiler
+    // crashes when '*' symbol presents in compiler defines
+    // or do another strange things
+    var useStarInDefines = (currentCfg != "ICC90");
+    
     var hdrs = "assert ctype errno float iso646 limits locale math setjmp";
     hdrs += " signal stdarg stddef stdio stdlib string time wchar wctype";
     hdrs += " new typeinfo";
@@ -488,6 +495,7 @@
     var lib;
     for (i in headers)
     {
+        var fun_params = "";
         var hdr_base = headers[i];
         switch (hdr_base)
         {
@@ -564,29 +572,50 @@
             break;
             case "string":
             funs = 
-                "memchr((char*)0,0,0) memcmp memcpy memmove memset strcat";
+                useStarInDefines ? "memchr((char*)0,0,0)" : "memchr(0,0,0)";
+            funs += " memcmp memcpy memmove memset strcat";
             funs += 
-         " strchr((char*)0,0) strcmp strcoll strcpy strcspn strerror strlen";
-            funs += " strncat strncmp strncpy strpbrk((char*)0,(char*)0)";
-            funs += " strrchr((char*)0,0) strspn strstr((char*)0,(char*)0)";
+                useStarInDefines ? " strchr((char*)0,0)" : " strchr(0,0)";
+            funs += 
+                " strcmp strcoll strcpy strcspn strerror strlen";
+            funs += " strncat strncmp strncpy"
+            funs += useStarInDefines ? 
+                " strpbrk((char*)0,(char*)0)" : " strpbrk(0,0)";
+            funs += 
+                useStarInDefines ? " strrchr((char*)0,0)" : " strrchr(0,0)";
+            funs += " strspn"
+            funs += useStarInDefines ? 
+                " strstr((char*)0,(char*)0)" : " strstr(0,0)";
             funs += " strtok strxfrm";
             funs = funs.split(" ");
             lib = "c";
             break;
-            case "wchar":
+        case "wchar":
+            fun_params = "wchar_t t[] = {'a'}";
             funs = 
                 "btowc fgetwc fgetws fputwc fputws fwide fwprintf fwscanf";
             funs += " getwc getwchar mbrlen mbrtowc mbsinit mbsrtowcs putwc";
             funs += " putwchar swprintf swscanf ungetwc vfwprintf vswprintf";
-            funs += " vwprintf vwscanf wcrtomb wcscat wcschr((wchar_t*)0,0)";
+            funs += " vwprintf vwscanf wcrtomb wcscat"
+            funs += 
+             useStarInDefines ? " wcschr((wchar_t*)0,0)" : " wcschr(t,0)";
             funs += " wcscmp wcscoll wcscpy wcscspn wcsftime wcslen wcsncat";
-            funs += " wcsncmp wcsncpy wcspbrk((wchar_t*)0,(wchar_t*)0)";
-            funs += " wcsrchr((wchar_t*)0,0) wcsrtombs wcsspn";
+            funs += " wcsncmp wcsncpy"
+            funs += useStarInDefines ? 
+                " wcspbrk((wchar_t*)0,(wchar_t*)0)" : " wcspbrk(t,0)";
+            funs += useStarInDefines ? 
+                " wcsrchr((wchar_t*)0,0)" : " wcsrchr(t,0)";
+            funs += " wcsrtombs wcsspn";
+            funs += useStarInDefines ? 
+                " wcsstr((wchar_t*)0,(wchar_t*)0)" : " wcsstr(t,0)";
             funs += 
-             " wcsstr((wchar_t*)0,(wchar_t*)0) wcstod wcstod wcstof wcstok";
+             " wcstod wcstod wcstof wcstok";
             funs += 
                 " wcstol wcstold wcstoll wcstombs wcstoul wcstoull wcsxfrm";
-            funs += " wctob wctomb wmemchr((wchar_t*)0,0,0) wmemcmp wmemcpy";
+            funs += " wctob wctomb"
+            funs += useStarInDefines ? 
+                " wmemchr((wchar_t*)0,0,0)" : " wmemchr(t,0,0)";
+            funs += " wmemcmp wmemcpy";
             funs += " wmemmove wmemset wprintf wscanf";
             funs = funs.split(" ");         
             lib = "c";
@@ -649,6 +678,10 @@
             {
                 defines.push("NONAMESPACE");
             }
+            if (paramsIndx != -1 && fun_params != "")
+            {
+                defines.push("FUN_PARAMS=" + fun_params);
+            }
             var ret = compileFiles(srcFile, defines);
             if (ret == 0)
             {
Index: fun_present_check.cpp
===================================================================
--- fun_present_check.cpp	(revision 354007)
+++ fun_present_check.cpp	(working copy)
@@ -46,6 +46,9 @@
     (void)&argc;
 
     // call the function using the supplied arguments
+    #ifdef FUN_PARAMS
+        FUN_PARAMS;
+    #endif
     (void)FUN;
 
     return 0;
Index: generate.js
===================================================================
--- generate.js	(revision 354007)
+++ generate.js	(working copy)
@@ -394,7 +394,7 @@
                         cfgProjectSrcFolder);
                     project.sourceFiles.add(filter.name, filter);
                     
-                    filter = createIncludesFilter(srcDir, 
+                    filter = createExcludedIncludesFilter(srcDir, 
                         cfgProjectIncludeFolder);                        
                     project.sourceFiles.add(filter.name, filter);
                 
@@ -403,7 +403,7 @@
                 case projectStdLibName:
                     project.folder = stdlibProjectFolder;
                     
-                    var filter = createSourcesFilter(srcDir + "\\"
+                    var filter = createCppSourcesFilter(srcDir + "\\"
                         + stdlibProjectFolder, stdlibSrcFolder);
                     project.sourceFiles.add(filter.name, filter);
                     
@@ -420,7 +420,7 @@
                 case projectRwTestName:
                 
                     project.folder = rwtestProjectFolder;
-                    var filter = createSourcesFilter(srcDir + "\\"
+                    var filter = createCppSourcesFilter(srcDir + "\\"
                         + rwtestProjectFolder, rwtestSrcFolder);
                     project.sourceFiles.add(filter.name, filter);
                     
@@ -495,7 +495,7 @@
                     tool.dependencies = configureDependencies;
                     newCfg.tools.add(tool.name, tool);
                     // add a fake linker to suppress dependency on output
-                    tool = new FakeLinkerVC();
+                    tool = getFakeLinker(solution.name);
                     newCfg.tools.add(tool.name, tool);
                     
                     newCfg.outputDir = "include\\" + newCfg.outputDir;
@@ -575,7 +575,7 @@
                                                     
                     newCfg.tools.add(tool.name, tool);
                     // add a fake linker to suppress dependency on output
-                    tool = new FakeLinkerVC();
+                    tool = getFakeLinker(solution.name);
                     newCfg.tools.add(tool.name, tool);
                 
                     platform.configurations.add(newCfg.name, newCfg);
@@ -603,7 +603,7 @@
                                                     
                     newCfg.tools.add(tool.name, tool);
                     // add a fake linker to suppress dependency on output
-                    tool = new FakeLinkerVC();
+                    tool = getFakeLinker(solution.name);
                     newCfg.tools.add(tool.name, tool);
                 
                     platform.configurations.add(newCfg.name, newCfg);
@@ -655,6 +655,14 @@
     return filter;
 }
 
+function createCppSourcesFilter(projectDir, offsetDir)
+{
+    var filter = createFilter(projectDir, offsetDir, 
+        "Source Files", "cpp;cxx;s", /^.+\.cc|.+\.c$/i);
+    filter.id = "{4FC737F1-C7A5-4376-A066-2A32D752A2FF}";
+    return filter;
+}
+
 function createIncludesFilter(projectDir, offsetDir)
 {
     var filter = createFilter(projectDir, offsetDir, 
@@ -676,6 +684,14 @@
     return filter;
 }
 
+function createExcludedIncludesFilter(projectDir, offsetDir)
+{
+    var filter = createFilter(projectDir, offsetDir, 
+        "Header Files", "h;hpp;hxx", /^.+\.cc|.+\.c|.+\.hpp|.+\.hxx$/i);
+    filter.id = "{93995380-89BD-4b04-88EB-625FBE52EBFB}";
+    return filter;
+}
+
 var rxExcludedFolders = 
     new RegExp("^(?:\\.svn|Release.*|Debug.*|in|out|CVS)$","i");
 
@@ -832,6 +848,17 @@
 }
 
 
+function getFakeLinker(solutionName)
+{
+    if (solutionName == "VC71")
+        return new FakeLinkerVC();
+        
+    if (solutionName == "ICC90")
+        return new FakeLinkerICC();
+        
+    return new FakeLinkerVC();
+}
+
 // creates real solution based on the template
 function fillSolutionTemplateLight(solution, oldProjects, srcDir, outDir, logStream)
 {
@@ -1130,16 +1157,17 @@
     vcproj.Close();
 }
 
-function generateSolutionVC(srcDir, outDir, logStream, genVCPROJs)
+function generateSolutionVCImpl (solution, srcDir, outDir, 
+                                 logStream, genVCPROJs)
 {
-    var slnFileName = outDir + "\\" + this.name + ".sln";
+    var slnFileName = outDir + "\\" + solution.name + ".sln";
     var sln = fso.CreateTextFile(slnFileName, true, false);
     // header
     sln.WriteLine(
         "Microsoft Visual Studio Solution File, Format Version 8.00");
-    for (i in this.projects)
+    for (i in solution.projects)
     {
-        var project = this.projects[i];
+        var project = solution.projects[i];
         if (project.name) //really a project
         {
             if (true == genVCPROJs)
@@ -1154,9 +1182,11 @@
             sln.Write("\"" + project.name + "\"");
             var projectPath = project.folder.length > 0 ?
                 outDir + project.folder + "\\" : outDir + "";
+            var projectRelPath = project.folder.length > 0 ?
+                removeLeadingSymbol(project.folder, "\\") + "\\" : "";
             var projectSrcPath = project.folder.length > 0 ?
                 srcDir + project.folder + "\\" : srcDir + "";
-            var projectFile = projectPath + 
+            var projectFile = projectRelPath + 
                 removeLeadingDot(project.name) + ".vcproj";
             sln.Write(", \"" + projectFile + "\"");
             sln.WriteLine(", \"" + project.id + "\"");
@@ -1166,7 +1196,7 @@
                 "\tProjectSection(ProjectDependencies) = postProject");
             for (j in project.dependencies)
             {
-                var depProject = this.projects[j];
+                var depProject = solution.projects[j];
                 if (depProject.name)
                 {
                     sln.WriteLine("\t\t" + depProject.id
@@ -1188,9 +1218,9 @@
     sln.WriteLine("Global");
     // solution configurations
     sln.WriteLine("\tGlobalSection(SolutionConfiguration) = preSolution");
-    for (j in this.configurations)
+    for (j in solution.configurations)
     {
-        var slnCfg = this.configurations[j];
+        var slnCfg = solution.configurations[j];
         if (slnCfg.name)
         {           
             sln.WriteLine("\t\t" + slnCfg.name + " = " + slnCfg.name);
@@ -1199,9 +1229,9 @@
     sln.WriteLine("\tEndGlobalSection");
     // project configurations
     sln.WriteLine("\tGlobalSection(ProjectConfiguration) = postSolution");
-    for (j in this.configurations)
+    for (j in solution.configurations)
     {
-        var slnCfg = this.configurations[j];
+        var slnCfg = solution.configurations[j];
         if (slnCfg.name)
         {
             for (k in slnCfg.projectConfigurations)
@@ -1209,7 +1239,7 @@
                 var projectCfg = slnCfg.projectConfigurations[k];
                 if (projectCfg.projectName)
                 {
-                    var project = this.projects[projectCfg.projectName];
+                    var project = solution.projects[projectCfg.projectName];
                     if (!project)
                     {
                         WScript.StdErr.WriteLine(
@@ -1310,6 +1340,101 @@
     }
 }
 
+function generateSolutionVC(srcDir, outDir, logStream, genVCPROJs)
+{
+    generateSolutionVCImpl(this, srcDir, outDir, logStream, genVCPROJs);
+}
+
+////////////////////////////////////////////////////////////////////
+// ICC 
+function setAdditionalDependencies(solution, outDir)
+{
+    for (i in solution.projects)
+    {
+        var prj = solution.projects[i];
+        if (! prj.platforms || ! prj.dependencies)
+            continue;
+        
+        for (dep in prj.dependencies)
+        {
+            var depPrj = solution.projects[dep];
+            if (! depPrj.name || ! depPrj.platforms)
+                continue;
+
+            if (depPrj.name != projectStdLibName && 
+                depPrj.name != projectRwTestName)
+                continue;
+               
+            for (j in prj.platforms)
+            {
+                var platform = prj.platforms[j];
+                var depPlatform = depPrj.platforms[j];
+
+                if (!platform.configurations || !depPlatform.configurations)
+                    continue;
+                    
+                for (k in platform.configurations)
+                {
+                    var cfg = platform.configurations[k];
+                    var depCfg = depPlatform.configurations[k];
+                    if (!cfg.tools || !depCfg.tools)
+                        continue;
+
+                    var lnkTool = cfg.tools[linkerToolName];
+                    if (! lnkTool)
+                        continue;
+                    
+                    var depLnkTool = depCfg.tools[linkerToolName];
+                    var depLibTool = depCfg.tools[librarianToolName];
+                                  
+                    if (depLnkTool && depLnkTool.outputFile)
+                    {
+                        var addlib = depLnkTool.outputFile;
+                        var idxDll = addlib.lastIndexOf(".dll");
+                        if (-1 != idxDll)
+                            addlib = addlib.substr(0, idxDll);
+                        addlib += ".lib";
+                        
+                        lnkTool.libraries.add(addlib);
+                        lnkTool.libdirs.add(outDir + depPrj.folder + 
+                            "\\" + depCfg.outputDir);
+                    }
+                    else if (depLibTool && depLibTool.outputFile)
+                    {                        
+                        var addlib = depLibTool.outputFile;
+                        lnkTool.libraries.add(addlib);
+                        lnkTool.libdirs.add(outDir + depPrj.folder + 
+                            "\\" + depCfg.outputDir);
+                    }
+                }
+            }
+        }
+    }
+}
+
+function generateSolutionICC(srcDir, outDir, logStream, genICPROJs)
+{
+    setAdditionalDependencies(this, outDir);
+    
+    generateSolutionVCImpl(this, srcDir, outDir, logStream, genICPROJs);
+    
+    WScript.Echo("Converting to ICC...");
+    
+    var slnICFileName = outDir + "\\" + this.name + ".sln";
+    var cmdICConvert = "ICProjConvert90.exe \"" + slnICFileName + "\" /IC";
+    
+    logStream.WriteLine("Convert to ICC: " + cmdICConvert);
+    
+    var ret = WshShell.Run(cmdICConvert, 7, true);
+    if (0 == ret)
+        WScript.Echo("Conversion to ICC succeeded");
+    else
+        WScript.Echo("Conversion to ICC finished with code " + ret);
+        
+    logStream.WriteLine("Conversion to ICC finished with code " + ret);
+}
+
+
 function readSolutionGUIDs(solFileName)
 {
     if (! fso.FileExists(solFileName))
@@ -1358,3 +1483,6 @@
 
 var solutionVC71 = getSolution("VC71");
 solutionVC71.generateSolution = generateSolutionVC;
+
+var solutionICC90 = getSolution("ICC90");
+solutionICC90.generateSolution = generateSolutionICC;
Index: generate.wsf
===================================================================
--- generate.wsf	(revision 354007)
+++ generate.wsf	(working copy)
@@ -32,6 +32,7 @@
         <object id="WshShell" progid="WScript.Shell"/>
         <script language="JScript" src="config.js"/>
         <script language="JScript" src="msvc-config_classes.js"/>
+        <script language="JScript" src="icc-config_classes.js"/>
         <script language="JScript" src="data.js"/>
         <script language="JScript" src="msvc-config.js"/>
         <script language="JScript" src="utilities.js"/>
@@ -75,6 +76,8 @@
     readAndCheckArguments();
     createBuildDirs();
     
+    outDir += "\\" + currentCfg;
+    
     if (srcDir[srcDir.length - 1] != "\\")
         srcDir += "\\";
             
@@ -130,8 +133,11 @@
     logStream.WriteLine("Solution created");
     logStream.Close();
     
-    WScript.Echo("Solution was generated successfully. See " + outDir + 
-        currentCfg + "slngen.log" + " for details.");
+    var logPath = outDir + currentCfg + "slngen.log";
+    var resLogPath = "file://" + logPath.replace(/\\/mg, "/");
+    
+    WScript.Echo("Solution was generated successfully. See " + 
+        resLogPath + " for details.");
         
     WScript.Quit(0);
 }
@@ -205,6 +211,11 @@
         if (! fso.FolderExists(builddir))
             fso.CreateFolder(builddir); 
             
+        builddir += "\\" + currentCfg;
+        
+        if (! fso.FolderExists(builddir))
+            fso.CreateFolder(builddir); 
+            
         if (! fso.FolderExists(builddir + includeDir))
             fso.CreateFolder(builddir + includeDir);    
             
@@ -236,7 +247,7 @@
     }
     catch(e)
     {
-        WScript.StdErr.WriteLine("RunGem: Fatal error: Failed to"
+        WScript.StdErr.WriteLine("Generate: Fatal error: Failed to"
             + " open folder " + builddir);
         WScript.Quit(3);
     }
@@ -296,7 +307,8 @@
         buildBatchFile.WriteLine("");
         buildBatchFile.WriteLine("cscript /nologo "
             + "\"%topdir%%scriptdir%\\%makelog%\""
-            + " /BUILDDIR:\"%builddir%\" /BUILDTYPE:%cfgbrief%");
+            + " /BUILDDIR:\"%builddir%\" /BUILDTYPE:%cfgbrief%"
+            + " /CONFIG:%config%");
         buildBatchFile.WriteLine("");
         
         buildBatchFile.WriteLine(":nextcfg");
// file should be included after base_config_classes

// IC compiler, linker and librarian

/*
var varSign = "$$";

// builds standard string of inputs from a collection
function buildOptionsVC(collection, prefix)
{
    var options = "";
    for (i in collection)
    {
        if (typeof(collection[i]) != "function")
        {
            options += " " + prefix + "\"" + i + "\"";
        }
    }
    return options;
}

// returns outputDirectory with the (back)slash at end
function getOutputDir()
{
    return this.outputDirectory;
}

// returns intermDirectory with the (back)slash at end
function getIntermDir()
{
    return this.intermDirectory;
}
*/

//------------------------------------------------
// CompilerICC class
//------------------------------------------------

// ICC compiler options
// optimization = Disabled (0, /Od) | Size (1, /O1) | Speed (2, /O2)
//                  | Full (3, /Ox) (custom is not supported)
// minimalRebuild = true (TRUE, /Gm)| false (FALSE, "")
// runtime = 
//      SingleDebug (5, /MLd) | Single (4, /ML) | MultiDebugDll (3, /MDd)
//              | MultiDll (2, /MD) | MultiDebug (1, MTd) | Multi (0, /MT)
// exceptions = true (TRUE, /EHsc) | false (FALSE, "")
// precompiledHeader = 
//      Use (3, /Yu) | Auto (2, /YX) | Create (1, /Yc) | No (0, "")
// pchName = <name of the pchfile>
// pchBuildFrom = <name of the .h file>
// warningsLevel = 0 (/W0) | 1 (/W1) | 2 (/W2)| 3 (/W3)| 4 (/W4)
// debugInfoFormat = Disabled (0, "") | C7 (1, /Z7) | LinesOnly (2, /Zd)
//                      | PDB (3, /Zi) | EditContinue (4, /ZI)
// pdbName = <name of pdb file>
// nologo = true (TRUE, /nologo) | FALSE (FALSE, "")

//.ctor from base compiler
function CompilerICC(compilerBase)
{
    if (!compilerBase)
    {
        compilerBase = new Compiler();
    }
    compilerBase.cloneTo(this);
    this.optimization = "Disabled";
    this.minimalRebuild = true;
    this.runtime = "MultiDebugDll";
    this.exceptions = true;
    this.precompiledHeader = "No";
    this.pchName = "";
    this.pchBuildFrom = "";
    this.warningsLevel = 3;
    this.debugInfoFormat = "PDB";
    this.pdbName = "";
    this.nologo = true;

    this.cloneTo = genericCloneTo;
    this.clone = genericClone;
    this.getOutputDir = getOutputDir;
    this.getIntermDir = getIntermDir;
    this.getCommandLine = getCommandLineCompilerICC;
    this.getPreprocessCommandLine = getPreprocessCommandLineCompilerICC;
}

function getCommandLineCompilerICC()
{
    var cmdLine = "icl /c";
    // nologo
    if (this.nologo)
    {
        cmdLine += " /nologo";
    }
    // defines
    cmdLine += buildOptionsVC(this.defines, "/D ");
    // includes
    cmdLine += buildOptionsVC(this.includeDirectories, "/I");
    // warnings
    cmdLine += " /W" + this.warningsLevel;
    // exceptions
    if (this.exceptions)
    {
        cmdLine += " /EHsc";
    }
    // runtime
    switch (this.runtime.toUpperCase())
    {
    case "MULTI":
        cmdLine += " /MT";
        break;
    case "MULTIDEBUG":
        cmdLine += " /MTd";
        break;
    case "MULTIDLL":
        cmdLine += " /MD";
        break;
    case "MULTIDEBUGDLL":
        cmdLine += " /MDd";
        break;
    case "SINGLE":
        cmdLine += " /ML";
        break;
    default: // SingleDebug
        cmdLine += " /MLd";
    }
    // minimalRebuild
    if (this.minimalRebuild)
    {
        cmdLine += " /Gm";
    }
    switch (this.optimization.toUpperCase())
    {
    case "FULL":
        cmdLine += " /Ox";
        break;
    case "SPEED":
        cmdLine += " /O2";
        break;
    case "SIZE":
        cmdLine += " /O1";
        break;
    default: // Diasbled
        cmdLine += " /Od";
    }
    /*
    // outfolder
    var outDir = this.getOutputDir() + "\\";
    if (outDir.length > 0)
    {
        cmdLine += " /Fo\"" + outDir + "\\\"";
    }
    */
    // outfolder
    var outDir = this.getIntermDir() + "\\";
    if (outDir.length > 0)
    {
        cmdLine += " /Fo\"" + outDir + "\\\"";
    }
    // pch
    var usePCH = true;
    switch (this.precompiledHeader.toUpperCase())
    {
    case "USE":
        cmdLine += " /Yu";
        break;
    case "AUTO":
        cmdLine += " /YX";
        break;
    case "CREATE":
        cmdLine += " /Yc";
        break;
    default:
        usePCH = false;
    }
    if (usePCH)
    {
        if (this.pchBuildFrom.length > 0)
        {
            cmdLine += "\"" + this.pchBuildFrom + "\"";
        }
        else
        {
            cmdLine += "\"stdafx.h\"";
        }
        if (this.pchName.length > 0)
        {
            cmdLine += " /Fp\"" + outFir + this.pchName + "\"";
        }
    }
    // pdb
    var usePDB = true;
    switch (this.debugInfoFormat.toUpperCase())
    {
    case "C7":
        cmdLine += " /Z7";
        break;
    case "LINESONLY":
        cmdLine += " /Zd";
        break;
    case "PDB":
        cmdLine += " /Zi";
        break;
    case "EDITCONTINUE":
        cmdLine += " /ZI";
        break;
    default:
        usePDB = false;
    }
    if (usePDB && this.pdbName.length > 0)
    {
        cmdLine += " /Fd\"" + outDir + this.pdbName + "\"";
    }
    // output
    if (this.outputFile.length > 0)
    {
        cmdLine += " /Fe\"" + outDir + this.outputFile + "\"";
    }
    // inputs
    cmdLine += buildOptionsVC(this.inputFiles, "");
    return cmdLine;
}

function writeSolutionSettingsCompilerICC(icproj, outDir)
{
    icproj.WriteLine("\t\t\t<Tool")
    icproj.WriteLine("\t\t\t\tName=\"CppCmplrTool\"");
    var opt = 0;
    switch (this.optimization.toUpperCase())
    {
    case "SIZE":
        opt = 1;
        break;
    case "SPEED":
        opt = 2;
        break;
    case "FULL":
        opt = 3;
        break;
    default:
        // leave 0 (Disabled)
    }
    icproj.WriteLine("\t\t\t\tOptimization=\"" + opt + "\"");
    var includesArray = new Array();
    for (i in this.includeDirectories)
    {
        if (!this.includeDirectories[i])
        {
            var findex = i.indexOf(varSign);
            if (findex == 0)
                includesArray.push(i.substr(varSign.length));
            else
                includesArray.push(outDir + i);
        }
    }
    icproj.WriteLine("\t\t\t\tAdditionalIncludeDirectories=\""
                        + xmlencode(includesArray.join(";")) + "\"");
    
    var defsArray = new Array();
    for (i in this.defines)
    {
        if (!this.defines[i])
        {
            defsArray.push(i);
        }
    }
    icproj.WriteLine("\t\t\t\tPreprocessorDefinitions=\""
                    + xmlencode(defsArray.join(";")) + "\"");
    icproj.WriteLine("\t\t\t\tMinimalRebuild=\""
                    + this.minimalRebuild.toString().toUpperCase() + "\"");
    icproj.WriteLine("\t\t\t\tExceptionHandling=\""
                    + this.exceptions.toString().toUpperCase() + "\"");
                        
    //TODO: customize following 2 lines later
    //icproj.WriteLine("\t\t\t\tBasicRuntimeChecks=\"3\"");
    icproj.WriteLine("\t\t\t\tDetect64BitPortabilityProblems=\"FALSE\"");
    
    icproj.WriteLine("\t\t\t\tSuppressStartupBanner=\""
                        + this.nologo.toString().toUpperCase() + "\"");
    
    var runtime = "0";
    switch (this.runtime.toUpperCase())
    {
        case "SINGLEDEBUG":
            runtime = "5";
            break;
        case "SINGLE":
            runtime = "4";
            break;
        case "MULTIDEBUGDLL":
            runtime = "3";
            break;
        case "MULTIDLL":
            runtime = "2";
            break;
        case "MULTIDEBUG":
            runtime = "1";
            break;
        default:
            // Multi, 0
    }
    icproj.WriteLine("\t\t\t\tRuntimeLibrary=\"" + runtime + "\"");
    if (this.pchBuildFrom.length > 0)
    {
        icproj.WriteLine("\t\t\t\tPrecompiledHeaderThrough=\""
                            + xmlencode(this.pchBuildFrom) + "\"");
    }
    if (this.pchName.length > 0)
    {
        icproj.WriteLine("\t\t\t\tPrecompiledHeaderFile=\""
                            + xmlencode(this.pchName) + "\"");
    }
    var usePh = "0";
    switch (this.precompiledHeader.toUpperCase())
    {
    case "USE":
        usePh = "3";
        break;
    case "AUTO":
        usePh = "2";
        break;
    case "CREATE":
        usePh = "1";
        break;
    default:
        // No, 0        
    }
    icproj.WriteLine("\t\t\t\tUsePrecompiledHeader=\"" + usePh + "\"");
    
    if (this.pdbName.length > 0)
    {
        icproj.WriteLine("\t\t\t\tProgramDataBaseFileName=\""
            + xmlencode(this.getIntermDir() + "\\" + this.pdbName) + "\"");
    }
    
    icproj.WriteLine("\t\t\t\tWarningLevel=\""
                        + this.warningsLevel + "\"");
    var diFormat = "0";
    switch (this.debugInfoFormat.toUpperCase())
    {
        case "C7":
            diFormat = "1";
            break;
        case "LINESONLY":
            diFormat = "2";
            break;
        case "PDB":
            diFormat = "3";
            break;
        case "EDITCONTINUE":
            diFormat = "4";
            break;
        default:
            // Disabled, 0
    }   
    icproj.WriteLine("\t\t\t\tObjectFile=\""
        + xmlencode(this.getIntermDir() + "\\" + this.outputFile) + "\"");

    icproj.WriteLine(
        "\t\t\t\tDebugInformationFormat=\"" + diFormat + "\"/>");   
}


function getPreprocessCommandLineCompilerICC()
{
    return this.getCommandLine() + " /E";
}

// compilerICC class methods
CompilerICC.prototype.cloneTo = genericCloneTo;
CompilerICC.prototype.clone = genericClone;
CompilerICC.prototype.getOutputDir = getOutputDir;
CompilerICC.prototype.getIntermDir = getIntermDir;
CompilerICC.prototype.getCommandLine = getCommandLineCompilerICC;
CompilerICC.prototype.getPreprocessCommandLine =
                        getPreprocessCommandLineCompilerICC;
CompilerICC.prototype.writeSolutionSettings =
                        writeSolutionSettingsCompilerICC;

//------------------------------------------------
// LinkerICC class
//------------------------------------------------

// ICC linker options
// incremental = Yes (2, /INCREMENTAL) | 
//      No (1, /INCREMENTAL:NO) | Default (0, "")
// debugInfo = true (TRUE, /DEBUG) | false (FALSE, "")
// pdbFile = <file name w/o directory>
// subsystem = Default (0, "") | Console (1, /SUBSYSTEM:CONSOLE)
//              | Windows (2, /SUBSYSTEM:WINDOWS)
// optimizeRefs = Remove (2, /OPT:REF) | 
//      Leave (1, /OPT:NOREF) | Default (0, "")
// comdatFolding = Remove (2, /OPT:ICF) | 
//      Leave (1, /OPT:NOICF) | Default (0, "")
// machine = X86 (1, /MACHINE:X86) | Default (0, "")
// nologo = true (TRUE, /nologo) | FALSE (FALSE, "")
// isDLL = true (?, /DLL) | false (?, "") 
//determined by a configuration type in solution!

// .ctor from base linker
function LinkerICC(linkerBase)
{
    if (!linkerBase)
    {
        linkerBase = new Linker();
    }
    linkerBase.cloneTo(this);
    this.incremental = "Default";
    this.debugInfo = true;
    this.pdbFile = "";
    this.subsystem = "";
    this.optimizeRef = "";
    this.comdatFolding = "";
    this.machine = "X86";
    this.nologo = true;
    this.isDLL = false;

    this.cloneTo = genericCloneTo;
    this.clone = genericClone;
    this.getOutputDir = getOutputDir;
    this.getIntermDir = getIntermDir;
    this.getCommandLine = getCommandLineLinkerICC;
}

function getCommandLineLinkerICC()
{
    var cmdLine = "xilink -qnoipo";
    // nologo
    if (this.nologo)
    {
        cmdLine += " /NOLOGO";
    }
    if (this.isDLL)
    {
        cmdLine += " /DLL";
    }
    // machine
    switch (this.machine.toUpperCase())
    {
    case "X86":
        cmdLine += " /MACHINE:X86";
        break;
    default:
        // do nothing
    }
    // comdatFolding
    switch (this.comdatFolding.toUpperCase())
    {
    case "REMOVE":
        cmdLine += " /OPT:ICF";
        break;
    case "LEAVE":
        cmdLine += " /OPT:NOICF";
        break;
    default:
        // do nothing
    }
    // optimizeRef
    switch (this.optimizeRef.toUpperCase())
    {
    case "REMOVE":
        cmdLine += " /OPT:REF";
        break;
    case "LEAVE":
        cmdLine += " /OPT:NOREF";
        break;
    default:
        // do nothing
    }
    // subsystem
    switch (this.subsystem.toUpperCase())
    {
    case "WINDOWS":
    case "CONSOLE":
        cmdLine += " /SUBSYSTEM:" + this.subsystem.toUpperCase();
        break;
    default:
        // do nothing
    }
    // debug info
    if (this.debugInfo)
    {
        cmdLine += " /DEBUG";
    }
    // incremental
    switch (this.incremental.toUpperCase())
    {
    case "YES":
        cmdLine += " /INCREMENTAL";
        break;
    case "NO":
        cmdLine += " /INCREMENTAL:NO";
        break;
    default:
        // do nothing
    }
    // PDB
    var intDir = this.getIntermDir() + "\\";
    if (this.pdbFile.length > 0)
    {
        cmdLine += " /PDB:\"" + intDir + this.pdbFile + "\"";
    }
    // output
    var outDir = this.getOutputDir() + "\\";
    if (this.outputFile.length > 0)
    {
        cmdLine += " /OUT:\"" + outDir + this.outputFile + "\"";
    }
    // inputs
    cmdLine += buildOptionsVC(this.inputFiles, "");
    cmdLine += buildOptionsVC(this.libraries, "");
    return cmdLine;
}

function writeSolutionSettingsLinkerICC(icproj, outDir)
{
    icproj.WriteLine("\t\t\t<Tool")
    icproj.WriteLine("\t\t\t\tName=\"LinkerTool\"");
    var inc = "0";
    switch (this.incremental.toUpperCase())
    {
        case "YES":
            inc = "2";
            break;
        case "NO":
            inc = "1";
            break;
        default:        
            // leave 0
    }
    icproj.WriteLine("\t\t\t\tLinkIncremental=\"" + inc + "\"");
    icproj.WriteLine("\t\t\t\tSuppressStartupBanner=\""
                        + this.nologo.toString().toUpperCase() + "\"");
    icproj.WriteLine("\t\t\t\tGenerateDebugInformation=\""
                        + this.debugInfo.toString().toUpperCase() + "\"");
    var subsys = "0";
    switch (this.subsystem.toUpperCase())
    {
        case "WINDOWS":
            subsys = "2";
            break;
        case "CONSOLE":
            subsys = "1";
            break;
        default:
            // leave as it is
    }
    icproj.WriteLine("\t\t\t\tSubSystem=\"" + subsys + "\"");
    var opt = "0";
    switch (this.optimizeRef.toUpperCase())
    {
        case "REMOVE":
            opt = "2";
            break;
        case "LEAVE":
            opt = "1";
            break;
        default:
            // leave as it is
    }   
    icproj.WriteLine("\t\t\t\tOptimizeReferences=\"" + opt + "\"");
    opt = "0";
    switch (this.comdatFolding.toUpperCase())
    {
        case "REMOVE":
            opt = "2";
            break;
        case "LEAVE":
            opt = "1";
            break;
        default:
            // leave as it is
    }   
    icproj.WriteLine("\t\t\t\tEnableCOMDATFolding=\"" + opt + "\"");
    icproj.WriteLine("\t\t\t\tTargetMachine=\""
                        + (this.machine.toUpperCase() == "X86" ?
                                "1" : "0") + "\""); 
    if (this.pdbFile.length > 0)
    {
        icproj.WriteLine("\t\t\t\tProgramDatabaseFile=\""
                    + xmlencode(this.getOutputDir() + "\\" + this.pdbFile)
                    + "\"");
    }
    
    icproj.WriteLine("\t\t\t\tOutputFile=\""
        + xmlencode(this.getOutputDir() + "\\" + this.outputFile)
        + "\"/>");
}

// linkerICC class methods
LinkerICC.prototype.cloneTo = genericCloneTo;
LinkerICC.prototype.clone = genericClone;
LinkerICC.prototype.getOutputDir = getOutputDir;
LinkerICC.prototype.getIntermDir = getIntermDir;
LinkerICC.prototype.getCommandLine = getCommandLineLinkerICC;
LinkerICC.prototype.writeSolutionSettings =
                    writeSolutionSettingsLinkerICC;

//------------------------------------------------
// LibrarianICC class
//------------------------------------------------

// ICC librarian options
// nologo = true (TRUE, /nologo) | FALSE (FALSE, "")

// .ctor from base librarian
function LibrarianICC(librarianBase)
{
    if (!librarianBase)
    {
        librarianBase = new Librarian();
    }
    librarianBase.cloneTo(this);
    this.nologo = true;

    this.cloneTo = genericCloneTo;
    this.clone = genericClone;
    this.getOutputDir = getOutputDir;
    this.getCommandLine = getCommandLineLibrarianICC;
}

function getCommandLineLibrarianICC()
{
    var cmdLine = "xilib";
    //nologo
    if (this.nologo)
    {
        cmdLine += " /NOLOGO";
    }
    //output
    if (this.outputFile.length > 0)
    {
        cmdLine += " /OUT:\"" + this.getOutputDir() + "\\"
            + this.outputFile + "\"";
    }
    //inputs
    cmdLine += buildOptionsVC(this.inputFiles, "");
    return cmdLine;
}

function writeSolutionSettingsLibrarianICC(icproj, outDir)
{
    icproj.WriteLine("\t\t\t<Tool")
    icproj.WriteLine("\t\t\t\tName=\"LibrarianTool\"");
    icproj.WriteLine("\t\t\t\tOutputFile=\""
        + xmlencode(this.getOutputDir() + "\\" + this.outputFile)
        + "\"/>");
}

// librarianICC class methods
LibrarianICC.prototype.cloneTo = genericCloneTo;
LibrarianICC.prototype.clone = genericClone;
LibrarianICC.prototype.getOutputDir = getOutputDir;
LibrarianICC.prototype.getIntermDir = getIntermDir;
LibrarianICC.prototype.getCommandLine = getCommandLineLibrarianICC;
LibrarianICC.prototype.writeSolutionSettings =
                        writeSolutionSettingsLibrarianICC;


// CustomBuildICC class
// .ctor from base CustomBuild
function CustomBuildICC(customBase)
{
    if (!customBase)
    {
        customBase = new CustomBuild();
    }
    customBase.cloneTo(this);

    this.cloneTo = genericCloneTo;
    this.clone = genericClone;
}

function writeSolutionSettingsCustomICC(icproj, outDir)
{
    icproj.WriteLine("\t\t\t<Tool")
    icproj.WriteLine("\t\t\t\tName=\"CustomTool\"");
    icproj.Write("\t\t\t\tCommandLine=\""
                    + xmlencode(this.command) + "\"");
    if (this.output.length > 0)
    {
        icproj.WriteLine("");
        icproj.Write("\t\t\t\tOutputs=\"" + this.output + "\"");
    }
    var deps = new Array();
    for (i in this.dependencies)
    {
        if (!this.dependencies[i])
        {
            deps.push(i);
        }
    }
    if (deps.length > 0)
    {
        icproj.WriteLine("");
        icproj.Write("\t\t\t\tAdditionalDependencies=\""
                        + deps.join(";") + "\"");
    }
    icproj.WriteLine("/>");
}

CustomBuildICC.prototype.cloneTo = genericCloneTo;
CustomBuildICC.prototype.clone = genericClone;
CustomBuildICC.prototype.writeSolutionSettings =
                            writeSolutionSettingsCustomICC;

// encodes special xml characters
function xmlencode(str)
{
    return str.replace(/\"/g, "&quot;");
}

//------------------------------------------------
// FakeLinkerICC class
// Used in Configure project just to set "Ignore Import library" option
//------------------------------------------------

// .ctor from base linker
function FakeLinkerICC()
{
    this.base = Tool;
    this.base(linkerToolName);
}

function writeSolutionSettingsFakeLinkerICC(icproj, outDir)
{
    icproj.WriteLine("\t\t\t<Tool")
    icproj.WriteLine("\t\t\t\tName=\"LinkerTool\"");
    icproj.WriteLine("\t\t\t\tIgnoreImportLibrary=\"TRUE\"/>");
}

// FakeLinkerICC class methods
FakeLinkerICC.prototype.cloneTo = genericCloneTo;
FakeLinkerICC.prototype.clone = genericClone;
FakeLinkerICC.prototype.writeSolutionSettings =
            writeSolutionSettingsFakeLinkerICC;
            
            
//------------------------------------------------
// PostBuildICC class
// Used in Examples projects to copy necessary files
//------------------------------------------------
// .ctor from base PostBuild
function PostBuildICC(postBase)
{
    if (!postBase)
    {
        postBase = new PostBuild();
    }
    postBase.cloneTo(this);

    this.cloneTo = genericCloneTo;
    this.clone = genericClone;
}

function writeSolutionSettingsPostBuildICC(icproj, outDir)
{
    icproj.WriteLine("\t\t\t<Tool")
    icproj.WriteLine("\t\t\t\tName=\"PostBuildEventTool\"");
    icproj.Write("\t\t\t\tCommandLine=\"");
    for (i in this.commands)
    {
        var index = i.indexOf("$");
        if (index != -1)
        {
            icproj.WriteLine(xmlencode(this.commands[i]));
        }
    }
    icproj.Write("\"");
    icproj.WriteLine("/>");
}

PostBuildICC.prototype.cloneTo = genericCloneTo;
PostBuildICC.prototype.clone = genericClone;
PostBuildICC.prototype.writeSolutionSettings =
                            writeSolutionSettingsPostBuildICC;
                            
                            
//------------------------------------------------
// CompilerICC90 class
//------------------------------------------------

// ICC 9.0 compiler options

// .ctor from base compiler
function CompilerICC90(compilerICC)
{
    if (!compilerICC)
    {
        compilerICC = new CompilerICC();
    }   
    compilerICC.cloneTo(this);
    //TODO: add
    // basicRuntimeChecks
    // detect64BitProblems = true | false
    
    this.cloneTo = genericCloneTo;
    this.clone = genericClone;  
    this.getOutputDir = getOutputDir;
    this.getIntermDir = getIntermDir;
    //TODO: change this line when new options will be added
    this.getCommandLine = getCommandLineCompilerICC;
    this.getPreprocessCommandLine = getPreprocessCommandLineCompilerICC;
    
}

//compilerICC90 class methods
CompilerICC90.prototype.cloneTo = genericCloneTo;
CompilerICC90.prototype.clone = genericClone;
CompilerICC90.prototype.getOutputDir = getOutputDir;
CompilerICC90.prototype.getIntermDir = getIntermDir;
//TODO: change this line when new options will be added
CompilerICC90.prototype.getCommandLine = getCommandLineCompilerICC;
CompilerICC90.prototype.getPreprocessCommandLine =
    getPreprocessCommandLineCompilerICC;
CompilerICC90.prototype.writeSolutionSettings =
                        writeSolutionSettingsCompilerICC;
// ICC solution configuration for configure script
// not use this for the solution generation

var icc90CfgSolutionName = "ICC90_config";

//clone generic solution
var solutionICC90Cfg = solution.clone();
solutionICC90Cfg.name = icc90CfgSolutionName;
configurations.add(icc90CfgSolutionName.name, solutionICC90Cfg);
configureToolsICC90();

function configureToolsICC90()
{
    // ICC compilers
    var compilerICCRelease = new CompilerICC(compilerWin32);
    
    var compilerICCDebug = compilerICCRelease.clone();
    compilerICCDebug.isDebug = true;
    
    compilerICCRelease.optimization = "Size";
    compilerICCRelease.debugInfoFormat = "PDB";
    
    compilerICCDebug.debugInfoFormat = "PDB";
    
    var compilerICC90Release = new CompilerICC90(compilerICCRelease);
    var compilerICC90Debug = new CompilerICC90(compilerICCDebug);
    
    // ICC linkers
    var linkerICCDebug = new LinkerICC(linker);
    linkerICCDebug.subsystem = "Console";
    linkerICCDebug.incremental = "No";
    var linkerICCRelease = linkerICCDebug.clone();
    linkerICCRelease.optimizeRefs = "Remove";
    linkerICCRelease.comdatFolding = "Remove";

    // ICC librarian
    var librarianICC = new LibrarianICC(librarian);
 
    // ICC custom
    var customICC = new CustomBuildICC();
    
    // ICC post build
    var postICC = new PostBuildICC();
    
    // configure projects tools
    configureToolsConfigure(icc90SolutionName, compilerICC90Debug, 
        compilerICC90Release, linkerICCDebug, linkerICCRelease, 
        librarianICC, customICC, postICC);
        
    /*
    configureToolsExamples(icc90SolutionName, compilerICC90Debug, 
        compilerICC90Release, linkerICCDebug, linkerICCRelease, 
        librarianICC, customICC, postICC);

    configureToolsTests(icc90SolutionName, compilerICC90Debug, 
        compilerICC90Release, linkerICCDebug, linkerICCRelease, 
        librarianICC, customICC, postICC);
        
    configureToolsRwTest(icc90SolutionName, compilerICC90Debug, 
        compilerICC90Release, linkerICCDebug, linkerICCRelease, 
        librarianICC, customICC, postICC);
        
    configureToolsRunExamples(icc90SolutionName, compilerICC90Debug, 
        compilerICC90Release, linkerICCDebug, linkerICCRelease, 
        librarianICC, customICC, postICC);
        
    configureToolsRunTests(icc90SolutionName, compilerICC90Debug, 
        compilerICC90Release, linkerICCDebug, linkerICCRelease, 
        librarianICC, customICC, postICC);
    */
}
Index: makelog.wsf
===================================================================
--- makelog.wsf	(revision 354007)
+++ makelog.wsf	(working copy)
@@ -34,8 +34,9 @@
 // Summary build log maker script
 //
 
-var buildDir = ""; // path to the root directory containing executables
-var buildType = ""      // the buid type (11d, 11s, etc)
+var buildDir = "";      // path to the root directory containing executables
+var buildType = "";     // the buid type (11d, 11s, etc)
+var buildCfg = "";      // the build configuration (vc71, icc90, etc)
 
 var buildlogFile = "BuildLog.htm";
 var summaryFileName = "Summary.htm";
@@ -103,7 +104,8 @@
     
     deleteTemporaryFiles();
     
-    WScript.Echo("Summary log was generated in " + logPath);
+    var resLogPath = logPath.replace(/\\/mg, "/");  
+    WScript.Echo("Summary log was generated in file://" + resLogPath);
     
     WScript.Quit(0);
 }
@@ -120,6 +122,17 @@
     
     buildDir =  WScript.Arguments.Named("BUILDDIR");
     
+    if (!WScript.Arguments.Named.Exists("CONFIG"))
+    {
+        WScript.StdErr.WriteLine(
+            "Generate: Missing required argument CONFIG.");
+        WScript.Arguments.ShowUsage();
+        WScript.Quit(2);
+    }
+    
+    buildCfg =  WScript.Arguments.Named("CONFIG");
+    buildSummaryPrefix = buildCfg + "-";
+    
     if (WScript.Arguments.Named.Exists("BUILDTYPE"))
         buildType = WScript.Arguments.Named("BUILDTYPE");
     else
@@ -145,7 +158,7 @@
 }
 
 function getLibraryBuildInfo(libDir, bType, libInfo)
-{
+{   
     var logDir = libDir + "\\" + bType;
     if (! fso.FolderExists(logDir))
         return;
Index: msvc-config_classes.js
===================================================================
--- msvc-config_classes.js	(revision 354007)
+++ msvc-config_classes.js	(working copy)
@@ -515,6 +515,36 @@
 {
     vcproj.WriteLine("\t\t\t<Tool")
     vcproj.WriteLine("\t\t\t\tName=\"VCLinkerTool\"");
+    
+    // additional libraries, if any
+    var addlibsArray = new Array();
+    for (al in this.libraries)
+    {
+        if (!this.libraries[al])
+        {
+            addlibsArray.push(al);
+        }
+    }
+    if (addlibsArray.length > 0)
+    {
+        vcproj.WriteLine("\t\t\t\tAdditionalDependencies=\""
+                        + xmlencode(addlibsArray.join(" ")) + "\"");
+    }
+    
+    var addlibdirsArray = new Array();
+    for (ald in this.libdirs)
+    {
+        if (!this.libdirs[ald])
+        {
+            addlibdirsArray.push(ald);
+        }
+    }
+    if (addlibdirsArray.length > 0)
+    {
+        vcproj.WriteLine("\t\t\t\tAdditionalLibraryDirectories=\""
+                        + xmlencode(addlibdirsArray.join(";")) + "\"");
+    }
+    
     var inc = "0";
     switch (this.incremental.toUpperCase())
     {
Index: msvc-config.js
===================================================================
--- msvc-config.js	(revision 354007)
+++ msvc-config.js	(working copy)
@@ -27,17 +27,36 @@
 var varCmdCopyOut = "$$copy_out";
 var varCmdCopyDll = "$$copy_dll";
 
+////////////////////////////////////////////////////////////////////
+// solutions
+
+// VC71 solution configuration
+var vc71SolutionName = "VC71";
+
 //clone generic solution
 var solutionVC71 = solution.clone();
-solutionVC71.name = "VC71";
-configureToolsVC71();
+solutionVC71.name = vc71SolutionName;
 configurations.add(solutionVC71.name, solutionVC71);
 
+// configure the solution
+configureToolsVC71();
 
-function configureToolsVC71Configure(
+// ICC solution configuration
+var icc90SolutionName = "ICC90";
+
+//clone VC71 solution
+var solutionICC90 = solutionVC71.clone();
+solutionICC90.name = icc90SolutionName;
+configurations.add(solutionICC90.name, solutionICC90);
+
+////////////////////////////////////////////////////////////////////
+// implementation
+
+function configureToolsConfigure (solutionName,
             compilerDebug, compilerRelease, 
             linkerDebug, linkerRelease, 
-            librarianTool, customTool)
+            librarianTool, customTool, 
+            postBuildTool)
 {
     var compilerDebugConfigure = compilerDebug.clone();
     var compilerReleaseConfigure = compilerRelease.clone();
@@ -49,7 +68,15 @@
     compilerDebugConfigure.pdbName = "MSVC.pdb";
     compilerReleaseConfigure.pdbName = "MSVC.pdb";
     
-    var configureProj = solutionVC71.projects.get(projectConfigureName);
+    if (solutionName == "ICC90")
+    {
+        compilerDebugConfigure.pdbName = "ICC.pdb";
+        compilerReleaseConfigure.pdbName = "ICC.pdb";
+    }
+    
+    //var configureProj = solutionVC71.projects.get(projectConfigureName);
+    var solutionCfg = getSolution(solutionName);
+    var configureProj = solutionCfg.projects.get(projectConfigureName);
     var platform = configureProj.platforms.get(platformWin32Name);
     
     // debug static
@@ -145,17 +172,19 @@
     configuration.tools.add(customBuildToolName, customConfigure);
 }
 
-function configureToolsVC71Examples(
+function configureToolsExamples( solutionName,
             compilerDebug, compilerRelease, 
             linkerDebug, linkerRelease, 
-            librarianTool, customTool)
+            librarianTool, customTool,
+            postBuildTool)
 {
     var compilerDebugExamples = compilerDebug.clone();
     var compilerReleaseExamples = compilerRelease.clone();
     var linkerDebugExamples = linkerDebug.clone();
     var linkerReleaseExamples = linkerRelease.clone();
     
-    var postExamplesDll = new PostBuildVC();
+    //var postExamplesDll = new PostBuildVC();
+    var postExamplesDll = postBuildTool.clone();
     postExamplesDll.commands.add(varCmdCopyDll, varCmdCopyDll);
     
     compilerDebugExamples.includeDirectories.add(samplesBaseIncludeDir);
@@ -166,7 +195,9 @@
     compilerReleaseExamples.includeDirectories.add(samplesIncludeDir);
     compilerReleaseExamples.includeDirectories.add(samplesBaseAnsiIncludeDir);
     
-    var examplesProj = solutionVC71.projects.get(projectExamplesName);
+    //var examplesProj = solutionVC71.projects.get(projectExamplesName);
+    var solutionCfg = getSolution(solutionName);
+    var examplesProj = solutionCfg.projects.get(projectExamplesName);
     var platform = examplesProj.platforms.get(platformWin32Name);
   
     // debug static
@@ -279,17 +310,19 @@
 }
 
 
-function configureToolsVC71Tests(
+function configureToolsTests( solutionName,
             compilerDebug, compilerRelease, 
             linkerDebug, linkerRelease, 
-            librarianTool, customTool)
+            librarianTool, customTool,
+            postBuildTool)
 {
     var compilerDebugTests = compilerDebug.clone();
     var compilerReleaseTests = compilerRelease.clone();
     var linkerDebugTests = linkerDebug.clone();
     var linkerReleaseTests = linkerRelease.clone();
     
-    var postTestsDll = new PostBuildVC();
+    //var postTestsDll = new PostBuildVC();
+    var postTestsDll = postBuildTool.clone();
     postTestsDll.commands.add(varCmdCopyDll, varCmdCopyDll);
     
     compilerDebugTests.includeDirectories.add(testsBaseIncludeDir);
@@ -300,7 +333,9 @@
     compilerReleaseTests.includeDirectories.add(testsIncludeDir);
     compilerReleaseTests.includeDirectories.add(testsBaseAnsiIncludeDir);
     
-    var testsProj = solutionVC71.projects.get(projectTestsName);
+    //var testsProj = solutionVC71.projects.get(projectTestsName);
+    var solutionCfg = getSolution(solutionName);
+    var testsProj = solutionCfg.projects.get(projectTestsName);
     var platform = testsProj.platforms.get(platformWin32Name);
   
     // debug static
@@ -417,10 +452,11 @@
 }
 
 
-function configureToolsVC71RwTest(
+function configureToolsRwTest( solutionName,
             compilerDebug, compilerRelease, 
             linkerDebug, linkerRelease, 
-            librarianTool, customTool)
+            librarianTool, customTool,
+            postBuildTool)
 {
     var compilerDebugRwTest = compilerDebug.clone();
     var compilerReleaseRwTest = compilerRelease.clone();
@@ -434,7 +470,9 @@
     compilerReleaseRwTest.includeDirectories.add(includeSecondParentDir);
     compilerReleaseRwTest.includeDirectories.add(includeSecondParentAnsiDir);
     
-    var rwTestProj = solutionVC71.projects.get(projectRwTestName);
+    //var rwTestProj = solutionVC71.projects.get(projectRwTestName);
+    var solutionCfg = getSolution(solutionName);
+    var rwTestProj = solutionCfg.projects.get(projectRwTestName);
     var platform = rwTestProj.platforms.get(platformWin32Name);
     
     librarianRwTest.outputFile = rwTestProj.name + ".lib";
@@ -537,14 +575,17 @@
 }
 
 
-function configureToolsVC71RunExamples(
+function configureToolsRunExamples( solutionName,
             compilerDebug, compilerRelease, 
             linkerDebug, linkerRelease, 
-            librarianTool, customTool)
+            librarianTool, customTool,
+            postBuildTool)
 {
     var customRunEx = customTool.clone();
     
-    var runExProj = solutionVC71.projects.get(projectRunExamplesName);
+    //var runExProj = solutionVC71.projects.get(projectRunExamplesName);
+    var solutionCfg = getSolution(solutionName);
+    var runExProj = solutionCfg.projects.get(projectRunExamplesName);
     var platform = runExProj.platforms.get(platformWin32Name);
   
     // debug static
@@ -589,14 +630,17 @@
 }
 
 
-function configureToolsVC71RunTests(
+function configureToolsRunTests( solutionName,
             compilerDebug, compilerRelease, 
             linkerDebug, linkerRelease, 
-            librarianTool, customTool)
+            librarianTool, customTool,
+            postBuildTool)
 {
     var customRunEx = customTool.clone();
     
-    var runTestsProj = solutionVC71.projects.get(projectRunTestsName);
+    //var runTestsProj = solutionVC71.projects.get(projectRunTestsName);
+    var solutionCfg = getSolution(solutionName);
+    var runTestsProj = solutionCfg.projects.get(projectRunTestsName);
     var platform = runTestsProj.platforms.get(platformWin32Name);
   
     // debug static
@@ -647,7 +691,7 @@
     var compilerVCRelease = new CompilerVC(compilerWin32);
     
     var compilerVCDebug = compilerVCRelease.clone();
-    compilerVCDebug.isDebug =true;
+    compilerVCDebug.isDebug = true;
     
     compilerVCRelease.optimization = "Size";
     compilerVCRelease.debugInfoFormat = "PDB";
@@ -671,24 +715,33 @@
     // VC custom
     var customVC = new CustomBuildVC();
     
+    // VC post build
+    var postVC = new PostBuildVC();
+    
     // configure projects tools
-    configureToolsVC71Configure(compilerVC71Debug, compilerVC71Release,
-        linkerVCDebug, linkerVCRelease, librarianVC, customVC);
+    configureToolsConfigure(vc71SolutionName, compilerVC71Debug, 
+        compilerVC71Release, linkerVCDebug, linkerVCRelease, 
+        librarianVC, customVC, postVC);
         
-    configureToolsVC71Examples(compilerVC71Debug, compilerVC71Release,
-        linkerVCDebug, linkerVCRelease, librarianVC, customVC);
+    configureToolsExamples(vc71SolutionName, compilerVC71Debug, 
+        compilerVC71Release, linkerVCDebug, linkerVCRelease, 
+        librarianVC, customVC, postVC);
 
-    configureToolsVC71Tests(compilerVC71Debug, compilerVC71Release,
-        linkerVCDebug, linkerVCRelease, librarianVC, customVC);
+    configureToolsTests(vc71SolutionName, compilerVC71Debug, 
+        compilerVC71Release, linkerVCDebug, linkerVCRelease, 
+        librarianVC, customVC, postVC);
         
-    configureToolsVC71RwTest(compilerVC71Debug, compilerVC71Release,
-        linkerVCDebug, linkerVCRelease, librarianVC, customVC);
+    configureToolsRwTest(vc71SolutionName, compilerVC71Debug, 
+        compilerVC71Release, linkerVCDebug, linkerVCRelease, 
+        librarianVC, customVC, postVC);
         
-    configureToolsVC71RunExamples(compilerVC71Debug, compilerVC71Release,
-        linkerVCDebug, linkerVCRelease, librarianVC, customVC);
+    configureToolsRunExamples(vc71SolutionName, compilerVC71Debug, 
+        compilerVC71Release, linkerVCDebug, linkerVCRelease, 
+        librarianVC, customVC, postVC);
         
-    configureToolsVC71RunTests(compilerVC71Debug, compilerVC71Release,
-        linkerVCDebug, linkerVCRelease, librarianVC, customVC);
+    configureToolsRunTests(vc71SolutionName, compilerVC71Debug, 
+        compilerVC71Release, linkerVCDebug, linkerVCRelease, 
+        librarianVC, customVC, postVC);
 }
 
 
Index: runall.wsf
===================================================================
--- runall.wsf	(revision 354007)
+++ runall.wsf	(working copy)
@@ -194,7 +194,7 @@
             
         // run example
         var runCmd = exeDir + "\\" + exeFileName;
-        WScript.Echo("running1 " + exeFileName);
+        WScript.Echo("running " + exeFileName);
         fileLog.WriteLine("running " + exeFileName);
             
         exRun++;
Index: summary.js
===================================================================
--- summary.js	(revision 354007)
+++ summary.js	(working copy)
@@ -84,9 +84,14 @@
     
     // skip first line in the summary as not needed at all
     var posPrjName = summaryData.indexOf(buildlogFile);
-    posPrjName = summaryData.indexOf("\r\n", posPrjName);
+    var posPrjTmp = posPrjName;
+    posPrjName = summaryData.indexOf(String.fromCharCode(10), posPrjTmp);
     if (-1 == posPrjName)
-        return posStart + summaryData.length;
+    {
+        posPrjName = summaryData.indexOf("\r\n", posPrjTmp);
+        if (-1 == posPrjName)
+            return posStart + summaryData.length;
+    }
         
     var prjSummary = summaryData.substr(posPrjName);
     
@@ -111,6 +116,27 @@
     return posStart + summaryData.length;
 }
 
+function extractTextBlockData(blogData, posTextBlock)
+{
+    var nextTableBlock = blogData.indexOf("<table", posTextBlock);
+    
+    var textData = "";
+    if (nextTableBlock > 0)
+    {
+        textData = 
+            blogData.substr(posTextBlock, nextTableBlock - posTextBlock);
+    }
+    else
+    {
+        textData = blogData.substr(posTextBlock);
+    }
+    
+    var posPreTag = textData.indexOf("<pre", 0);
+    if (-1 == posPreTag)
+        textData = "<pre>" + textData + "</pre>";
+        
+    return textData;
+}
 
 function extractTableData(blogData, posStart)
 {
@@ -118,6 +144,11 @@
     if (-1 == posMainTable)
         return "";
         
+    // check that we have data in table form
+    var posFirstCloseTable = blogData.indexOf("</table>", posStart);
+    if (-1 != posFirstCloseTable && posMainTable - posFirstCloseTable > 20)
+        return extractTextBlockData(blogData, posFirstCloseTable + 8);
+        
     // lookup for the main table close tag 
     var posCloseTag = posMainTable;
     var posOpenTag = posMainTable;
Index: update.wsf
===================================================================
--- update.wsf	(revision 354007)
+++ update.wsf	(working copy)
@@ -71,13 +71,13 @@
         
     WScript.Echo("Checking consistence...");
     var logStream;
-    if (fso.FileExists(outDir + currentCfg + logFile))
+    if (fso.FileExists(outDir + logFile))
     {
-        logStream = fso.OpenTextFile(outDir + currentCfg + logFile, 8);
+        logStream = fso.OpenTextFile(outDir + logFile, 8);
     }
     else
     {
-        logStream = fso.CreateTextFile(outDir + currentCfg + logFile, 
+        logStream = fso.CreateTextFile(outDir + logFile, 
             true, false);
     }
 
@@ -110,6 +110,9 @@
             WScript.Quit(2);        
     }
     
+    if ("ICC90" == currentCfg)
+        convertSolution(currentCfg, false);
+    
     //read existing solution file
     WScript.Echo("Reading solution...");
     var slnFileName = outDir + "\\" + currentCfg + ".sln";
@@ -128,6 +131,9 @@
     WScript.Echo("Writing modified projects on disk...");
     saveModifiedProjects(modProjects, srcDir, outDir, logStream);
     
+    if ("ICC90" == currentCfg)
+        convertSolution(currentCfg, true);
+    
     logStream.WriteLine("Solution updated");
     logStream.Close();
     
@@ -255,6 +261,26 @@
     }
 }
 
+function convertSolution(solName, toICC)
+{   
+    var slnICFileName = outDir + "\\" + solName + ".sln";
+    
+    var convertKey = toICC == true ? "/IC" : "/VC";
+    var cmdICConvert = "ICProjConvert90.exe \"" + slnICFileName + 
+        "\" " + convertKey;
+    
+    if (toICC == true)
+        WScript.Echo("Converting solution to ICC. " + 
+            "This may take several minutes.");
+    else
+        WScript.Echo("Converting solution to VC. " + "
+            "This may take several minutes.");
+    
+    var ret = WshShell.Run(cmdICConvert, 7, true);
+    if (0 != ret)
+        WScript.Echo("Conversion finished with code " + ret);
+}
+
 ]]>
         </script>
     </job>
Index: utilities.js
===================================================================
--- utilities.js	(revision 354007)
+++ utilities.js	(working copy)
@@ -127,6 +127,16 @@
     return res;
 }
 
+function removeLeadingSymbol(dotName, symbol)
+{
+    var index = dotName.indexOf(symbol);
+    if (0 != index)
+        return dotName;
+        
+    var resName = dotName.substr(symbol.length);
+    return resName;
+}
+
 function removeLeadingDot(dotName)
 {
     var index = dotName.indexOf(".");
@@ -149,7 +159,12 @@
 function setCompileEnvironment(solutionName, configurationName
                                 , projectName, logFile)
 {
+    // obtain the solution. Check that there is no specail solution
+    // for configure script
     var solution = configurations.get(solutionName);
+    if (null != configurations.get(solutionName + "_config"))
+        solution = configurations.get(solutionName + "_config");
+        
     var solutionconfig = solution.configurations.get(configurationName);
     var projectConfig = 
         solutionconfig.projectConfigurations.get(projectName);

--------------020100050509050103030209--