Author: faridz
Date: Fri Mar 23 11:36:59 2007
New Revision: 521853
URL: http://svn.apache.org/viewvc?view=rev&rev=521853
Log:
2007-03-23 Farid Zaripov <[EMAIL PROTECTED]>
* msvc-7.0.config: Added variable CLVARSBAT (path to the iclvars.bat
for ICC)
* icc-9.0.config: Ditto.
* icc-9.1.config: Ditto.
* utilities.js: Added support of the variable CLVARSBAT
* projects.js: Call iclvars.bat before invoking the confirure.wsf
script.
Modified:
incubator/stdcxx/trunk/etc/config/windows/icc-9.0.config
incubator/stdcxx/trunk/etc/config/windows/icc-9.1.config
incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config
incubator/stdcxx/trunk/etc/config/windows/projects.js
incubator/stdcxx/trunk/etc/config/windows/utilities.js
Modified: incubator/stdcxx/trunk/etc/config/windows/icc-9.0.config
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/icc-9.0.config?view=diff&rev=521853&r1=521852&r2=521853
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/icc-9.0.config (original)
+++ incubator/stdcxx/trunk/etc/config/windows/icc-9.0.config Fri Mar 23
11:36:59 2007
@@ -6,3 +6,4 @@
CXX=icl
LD=icl
AR=xilib
+CLVARSBAT=%ICPP_COMPILER90%\IA32\Bin\iclvars.bat
Modified: incubator/stdcxx/trunk/etc/config/windows/icc-9.1.config
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/icc-9.1.config?view=diff&rev=521853&r1=521852&r2=521853
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/icc-9.1.config (original)
+++ incubator/stdcxx/trunk/etc/config/windows/icc-9.1.config Fri Mar 23
11:36:59 2007
@@ -6,3 +6,4 @@
CXX=icl
LD=icl
AR=xilib
+CLVARSBAT=%ICPP_COMPILER91%\IA32\Bin\iclvars.bat
Modified: incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config?view=diff&rev=521853&r1=521852&r2=521853
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config (original)
+++ incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config Fri Mar 23
11:36:59 2007
@@ -66,3 +66,7 @@
// 0 - non-unicode
// 1 - unicode
UNICODELOG=0
+
+// Path to the ICC iclvars.bat
+// Should be empty for MSVC
+CLVARSBAT=
Modified: incubator/stdcxx/trunk/etc/config/windows/projects.js
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/projects.js?view=diff&rev=521853&r1=521852&r2=521853
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projects.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projects.js Fri Mar 23 11:36:59
2007
@@ -29,6 +29,9 @@
var rwtestIncludes = "%SRCDIR%\\tests\\include;" + stdlibIncludes;
var commonLibs = "kernel32.lib user32.lib";
+var binPath = "$(SolutionDir)%CONFIG%\\bin";
+var libPath = "$(SolutionDir)%CONFIG%\\lib";
+
var ProjectsDir = "%BUILDDIR%\\Projects";
// projects which requires RTTI support
@@ -60,10 +63,14 @@
new FilterDef("Script Files", null, ".js;.wsf", eFileTypeScript,
false).
addFiles("%SRCDIR%\\etc\\config\\windows",
new Array("configure.wsf", "config.js", "data.js",
"utilities.js")));
- configureDef.OutDir = "$(SolutionDir)%CONFIG%\\include";
+ configureDef.OutDir = commonIncludes;
configureDef.IntDir = configureDef.OutDir;
configureDef.CustomBuildFile = "configure.wsf";
- configureDef.CustomBuildCmd = "cscript /nologo \"%CUSTOMFILE%\"" +
+ if (0 < CLVARSBAT.length)
+ configureDef.CustomBuildCmd = "call \"" + CLVARSBAT + "\"\r\n";
+ else
+ configureDef.CustomBuildCmd = "";
+ configureDef.CustomBuildCmd += "cscript /nologo \"%CUSTOMFILE%\"" +
" /SolutionName:\"%SOLUTION%\"" +
" /ConfigurationName:\"%CFGNAME%\"" +
" /SrcDir:\"%SRCDIR%\\etc\\config\\src\"" +
@@ -89,7 +96,7 @@
addFilesByMask("%SRCDIR%\\include", rxExcludedFolders, null)));
stdlibDef.Defines = commonDefines;
stdlibDef.Includes = stdlibIncludes;
- stdlibDef.OutDir = "$(SolutionDir)lib";
+ stdlibDef.OutDir = libPath;
stdlibDef.IntDir = "$(SolutionDir)%CONFIG%\\src";
stdlibDef.Libs = commonLibs;
stdlibDef.OutFile = "$(OutDir)\\stdlib%CONFIG%%EXT%";
@@ -132,7 +139,7 @@
new Array("cmdopt.h", "display.h", "exec.h", "output.h",
"target.h", "util.h")));
execDef.Defines = "";
execDef.Includes = commonIncludes;
- execDef.OutDir = "$(SolutionDir)%CONFIG%\\bin";
+ execDef.OutDir = binPath;
execDef.Libs = commonLibs;
execDef.OutFile = "$(OutDir)\\exec.exe";
execDef.PrjDeps.push(configureDef);
@@ -157,7 +164,7 @@
"loc_exception.h", "localedef.h", "path.h", "scanner.h")));
localedefDef.Defines = commonDefines;
localedefDef.Includes = stdlibIncludes;
- localedefDef.OutDir = "$(SolutionDir)%CONFIG%\\bin";
+ localedefDef.OutDir = binPath;
localedefDef.Libs = commonLibs;
localedefDef.OutFile = "$(OutDir)\\localedef.exe";
localedefDef.PrjRefs.push(stdlibDef);
@@ -182,7 +189,7 @@
"loc_exception.h", "memchk.h", "path.h", "scanner.h")));
localeDef.Defines = commonDefines;
localeDef.Includes = stdlibIncludes;
- localeDef.OutDir = "$(SolutionDir)%CONFIG%\\bin";
+ localeDef.OutDir = binPath;
localeDef.Libs = commonLibs;
localeDef.OutFile = "$(OutDir)\\locale.exe";
localeDef.PrjRefs.push(stdlibDef);
@@ -192,7 +199,7 @@
///////////////////////////////////////////////////////////////////////////////
var utilsDef = new ProjectDef(".stdcxx_utils", typeGeneric);
utilsDef.VCProjDir = ProjectsDir + "\\util";
- utilsDef.OutDir = "$(SolutionDir)%CONFIG%\\bin";
+ utilsDef.OutDir = binPath;
utilsDef.IntDir = utilsDef.OutDir;
utilsDef.PrjDeps.push(execDef);
utilsDef.PrjDeps.push(localedefDef);
@@ -253,7 +260,7 @@
" /CONFIG:\"%SOLUTION%\"" +
" /LOGFILE:\"runexamples.log\"" +
" /COPYDLL:" + (copyDll ? "false" : "true") +
- " /LIBDIR:\"$(SolutionDir)lib\"";
+ " /LIBDIR:\"" + libPath + "\"";
runexamplesDef.CustomBuildOut = "$(OutDir)\\runexamples.log";
runexamplesDef.CustomBuildDeps = "%FILES%";
//runexamplesDef.PrjDeps.push(allexamplesDef);
@@ -312,7 +319,7 @@
" /CONFIG:\"%SOLUTION%\"" +
" /LOGFILE:\"runtests.log\"" +
" /COPYDLL:" + (copyDll ? "false" : "true") +
- " /LIBDIR:\"$(SolutionDir)lib\"";
+ " /LIBDIR:\"" + libPath + "\"";
runtestsDef.CustomBuildOut = "$(OutDir)\\runtests.log";
runtestsDef.CustomBuildDeps = "%FILES%";
//runtestsDef.PrjDeps.push(alltestsDef);
@@ -342,8 +349,8 @@
// before executing localedef.exe utility
// and finally delete the copied file
var libname = "stdlib%CONFIG%.dll";
- var src = "\"$(SolutionDir)lib\\" + libname + "\"";
- var dst = "\"$(SolutionDir)%CONFIG%\\bin\\" + libname + "\"";
+ var src = "\"" + libPath + "\\" + libname + "\"";
+ var dst = "\"" + binPath + "\\" + libname + "\"";
localeTplDef.PreBuildCmd = "if exist " + src + " if not exist " +
dst +
" copy /Y " + src + " " + dst;
localeTplDef.PostBuildCmd = "if exist " + dst + " del " + dst;
@@ -373,7 +380,7 @@
new FilterDef("Script Files", null, "js;wsf", eFileTypeScript, false).
addFiles("%SRCDIR%\\etc\\config\\windows",
new Array("run_locale_utils.wsf")));
- testlocaleTplDef.OutDir = "$(SolutionDir)%CONFIG%\\bin";
+ testlocaleTplDef.OutDir = binPath;
testlocaleTplDef.IntDir = testlocaleTplDef.OutDir;
testlocaleTplDef.CustomBuildFile = "run_locale_utils.wsf";
testlocaleTplDef.CustomBuildDeps = "%FILES%";
@@ -450,7 +457,7 @@
if (0 <= arrayIndexOf(arrDeps, stdlibDef))
{
var libname = "stdlib%CONFIG%.dll";
- var src = "\"$(SolutionDir)lib\\" + libname + "\"";
+ var src = "\"" + libPath + "\\" + libname + "\"";
var dst = "\"$(OutDir)\\" + libname + "\"";
var cmd = "if exist " + src + " (\r\n" +
"del " + dst + "\r\n" +
Modified: incubator/stdcxx/trunk/etc/config/windows/utilities.js
URL:
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/utilities.js?view=diff&rev=521853&r1=521852&r2=521853
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/utilities.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/utilities.js Fri Mar 23 11:36:59
2007
@@ -39,6 +39,7 @@
var WINDIFF = "";
var ICCCONVERT = "";
var PLATFORM = "Win32";
+var CLVARSBAT = "";
// read and parse compiler configuration file
// config - name of the compiler configuration
@@ -129,6 +130,9 @@
case "PLATFORM":
PLATFORM = arr[2];
break;
+ case "CLVARSBAT":
+ CLVARSBAT = arr[2];
+ break;
}
}
}
@@ -179,6 +183,7 @@
stream.WriteLine(" WINDIFF=" + WINDIFF);
stream.WriteLine(" ICCCONVERT=" + ICCCONVERT);
stream.WriteLine(" PLATFORM=" + PLATFORM);
+ stream.WriteLine(" CLVARSBAT=" + CLVARSBAT);
stream.WriteLine("");
}
