Author: antonp
Date: Wed May 24 06:31:17 2006
New Revision: 409157
URL: http://svn.apache.org/viewvc?rev=409157&view=rev
Log:
2006-05-24 Anton Pevtsov <[EMAIL PROTECTED]>
* data.js (icc91SolutionName, icc91CfgSolutionName): New global
variables to keep icc-9.1 solution names.
* generate.js (solutionICC91): New global variable to keep icc-9.1
solution object.
* generate.wsf (generateBuildBatch): Added special processing
for icc-9.1solution.
* icc-config.js (solutionICC91Cfg): New variable to keep icc-9.1
configuration solution.
(configureToolsICC91): New function to configure tools for icc-9.1.
* makelog.wsf (readAndCheckArguments): Set buildLogUnicode
variable to -1 for icc-9.1 - buildlog.htm is unicode.
* msvc-config.js (solutionICC91): New variable to keep icc-9.1
solution object.
* runall.wsf (runAllExamples): Set logUnicode variable to "true"
for icc-9.1 - buildlog.htm is unicode.
Modified:
incubator/stdcxx/trunk/etc/config/windows/data.js
incubator/stdcxx/trunk/etc/config/windows/generate.js
incubator/stdcxx/trunk/etc/config/windows/generate.wsf
incubator/stdcxx/trunk/etc/config/windows/icc-config.js
incubator/stdcxx/trunk/etc/config/windows/makelog.wsf
incubator/stdcxx/trunk/etc/config/windows/msvc-config.js
incubator/stdcxx/trunk/etc/config/windows/runall.wsf
Modified: incubator/stdcxx/trunk/etc/config/windows/data.js
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/data.js?rev=409157&r1=409156&r2=409157&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/data.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/data.js Wed May 24 06:31:17 2006
@@ -843,3 +843,9 @@
// ICC90 configuration solution
var icc90CfgSolutionName = icc90SolutionName + "_config";
+
+// ICC91 solution
+var icc91SolutionName = "icc-9.1";
+
+// ICC91 configuration solution
+var icc91CfgSolutionName = icc91SolutionName + "_config";
Modified: incubator/stdcxx/trunk/etc/config/windows/generate.js
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/generate.js?rev=409157&r1=409156&r2=409157&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/generate.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/generate.js Wed May 24 06:31:17
2006
@@ -1619,3 +1619,7 @@
var solutionICC90 = getSolution(icc90SolutionName);
solutionICC90.generateSolution = generateSolutionICC;
solutionICC90.checkEnvironment = checkEnvironmentICC;
+
+var solutionICC91 = getSolution(icc91SolutionName);
+solutionICC91.generateSolution = generateSolutionICC;
+solutionICC91.checkEnvironment = checkEnvironmentICC;
Modified: incubator/stdcxx/trunk/etc/config/windows/generate.wsf
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/generate.wsf?rev=409157&r1=409156&r2=409157&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/generate.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/generate.wsf Wed May 24 06:31:17
2006
@@ -331,6 +331,12 @@
buildBatchFile.WriteLine("set useenv=/useenv");
buildBatchFile.WriteLine(")");
buildBatchFile.WriteLine("");
+
+ buildBatchFile.WriteLine(
+ "if \"%1\"==\"" + icc91SolutionName + "\" (");
+ buildBatchFile.WriteLine("set useenv=/useenv");
+ buildBatchFile.WriteLine(")");
+ buildBatchFile.WriteLine("");
buildBatchFile.WriteLine("shift");
buildBatchFile.WriteLine("");
Modified: incubator/stdcxx/trunk/etc/config/windows/icc-config.js
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/icc-config.js?rev=409157&r1=409156&r2=409157&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/icc-config.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/icc-config.js Wed May 24 06:31:17
2006
@@ -1,69 +1,115 @@
-// ICC solution configuration for configure script
-// not use this for the solution generation
-
-//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);
-
- /* not needed in this pseudo-solution
- 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);
- */
-}
+// ICC solution configuration for configure script
+// not use this for the solution generation
+
+//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);
+
+ /* not needed in this pseudo-solution
+ 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);
+ */
+}
+
+
+//clone generic solution
+var solutionICC91Cfg = solution.clone();
+solutionICC91Cfg.name = icc91CfgSolutionName;
+configurations.add(icc91CfgSolutionName.name, solutionICC91Cfg);
+configureToolsICC91();
+
+function configureToolsICC91()
+{
+ // 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(icc91SolutionName, compilerICC90Debug,
+ compilerICC90Release, linkerICCDebug, linkerICCRelease,
+ librarianICC, customICC, postICC);
+}
Modified: incubator/stdcxx/trunk/etc/config/windows/makelog.wsf
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/makelog.wsf?rev=409157&r1=409156&r2=409157&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/makelog.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/makelog.wsf Wed May 24 06:31:17
2006
@@ -157,7 +157,7 @@
WScript.Quit(3);
}
- if (buildCfg == "msvc-8.0")
+ if (buildCfg == "msvc-8.0" || buildCfg == "icc-9.1")
buildLogUnicode = -1;
}
Modified: incubator/stdcxx/trunk/etc/config/windows/msvc-config.js
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/msvc-config.js?rev=409157&r1=409156&r2=409157&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/msvc-config.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/msvc-config.js Wed May 24
06:31:17 2006
@@ -57,6 +57,10 @@
solutionICC90.name = icc90SolutionName;
configurations.add(solutionICC90.name, solutionICC90);
+var solutionICC91 = solutionVC71.clone();
+solutionICC91.name = icc91SolutionName;
+configurations.add(solutionICC91.name, solutionICC91);
+
////////////////////////////////////////////////////////////////////
// implementation
Modified: incubator/stdcxx/trunk/etc/config/windows/runall.wsf
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/runall.wsf?rev=409157&r1=409156&r2=409157&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/runall.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/runall.wsf Wed May 24 06:31:17
2006
@@ -240,7 +240,8 @@
else
runNoChecks(runCmd, exeFileName, itemInfo, fileLog);
- var unicodeLog = currentCfg == "msvc-8.0" ? true : false;
+ var unicodeLog =
+ currentCfg == "msvc-8.0" || currentCfg == "icc-9.1" ? true : false;
readBuildLog(exeDir, itemInfo, unicodeLog);
saveBuildInfo(itemInfo, htmDir, "htm");
saveBuildSummary(itemInfo, fileSummary);
