You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2007/04/06 20:11:39 UTC
svn commit: r526240 - in /incubator/stdcxx/trunk/etc/config/windows:
build.wsf generate.wsf makelog.wsf projects.js runall.wsf
Author: faridz
Date: Fri Apr 6 11:11:38 2007
New Revision: 526240
URL: http://svn.apache.org/viewvc?view=rev&rev=526240
Log:
2007-04-06 Farid Zaripov <Fa...@epam.com>
* build.wsf: Rename stdlib to stdcxx.
* generate.wsf: Ditto.
* makelog.wsf: Ditto.
* projects.js: Ditto. Rename out library name from
stdlib.[lib|dll] to libstd.[lib|dll] to consistency
with unix names
* runall.wsf: The same.
Modified:
incubator/stdcxx/trunk/etc/config/windows/build.wsf
incubator/stdcxx/trunk/etc/config/windows/generate.wsf
incubator/stdcxx/trunk/etc/config/windows/makelog.wsf
incubator/stdcxx/trunk/etc/config/windows/projects.js
incubator/stdcxx/trunk/etc/config/windows/runall.wsf
Modified: incubator/stdcxx/trunk/etc/config/windows/build.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/build.wsf?view=diff&rev=526240&r1=526239&r2=526240
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/build.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/build.wsf Fri Apr 6 11:11:38 2007
@@ -211,8 +211,8 @@
break;
}
- WScript.Echo("Compiling stdlib library...\n");
- res = BuildProject(solutionBuild, ".stdlib");
+ WScript.Echo("Compiling stdcxx library...\n");
+ res = BuildProject(solutionBuild, ".stdcxx");
if (0 < res)
{
retCode = 4;
Modified: incubator/stdcxx/trunk/etc/config/windows/generate.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/generate.wsf?view=diff&rev=526240&r1=526239&r2=526240
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/generate.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/generate.wsf Fri Apr 6 11:11:38 2007
@@ -26,7 +26,7 @@
</description>
<named helpstring="Name of the compiler configuration"
name="CONFIG" required="true" type="string"/>
- <named helpstring="Top directory of stdlib sources tree"
+ <named helpstring="Top directory of stdcxx sources tree"
name="TOPDIR" required="false" type="string"/>
<named helpstring="Output directory for modules"
name="BUILDDIR" required="true" type="string"/>
@@ -138,7 +138,7 @@
var runsolutionName = currentCfg + "_run.sln";
var configureDefs = projectDefs[0];
- var stdlibDefs = projectDefs[1];
+ var stdcxxDefs = projectDefs[1];
var rwtestDefs = projectDefs[2];
var utilDefs = projectDefs[3];
var exampleDefs = projectDefs[4];
@@ -152,11 +152,11 @@
for (var i = 0; i < projectDefs.length; ++i)
solution = solution.concat(projectDefs[i]);
- var exsolution = configureDefs.concat(stdlibDefs).concat(exampleDefs);
- var tstsolution = configureDefs.concat(stdlibDefs).concat(rwtestDefs).concat(testDefs);
- var locsolution = configureDefs.concat(stdlibDefs).concat(utilDefs).concat(localeDefs);
- var tstlocsolution = configureDefs.concat(stdlibDefs).concat(utilDefs).concat(testlocaleDefs);
- var runsolution = configureDefs.concat(stdlibDefs).concat(utilDefs).concat(runexamplesDefs).concat(runtestsDefs);
+ var exsolution = configureDefs.concat(stdcxxDefs).concat(exampleDefs);
+ var tstsolution = configureDefs.concat(stdcxxDefs).concat(rwtestDefs).concat(testDefs);
+ var locsolution = configureDefs.concat(stdcxxDefs).concat(utilDefs).concat(localeDefs);
+ var tstlocsolution = configureDefs.concat(stdcxxDefs).concat(utilDefs).concat(testlocaleDefs);
+ var runsolution = configureDefs.concat(stdcxxDefs).concat(utilDefs).concat(runexamplesDefs).concat(runtestsDefs);
generateSolution(solution, outDir, solutionName);
generateSolution(exsolution, outDir, exsolutionName);
Modified: incubator/stdcxx/trunk/etc/config/windows/makelog.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/makelog.wsf?view=diff&rev=526240&r1=526239&r2=526240
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/makelog.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/makelog.wsf Fri Apr 6 11:11:38 2007
@@ -101,7 +101,7 @@
buildSummaryPrefix, buildType);
// read information about library
- var libInfo = new ItemBuildInfo(".stdlib");
+ var libInfo = new ItemBuildInfo(".stdcxx");
getLibraryBuildInfo(buildDir + "\\" + buildType +
"\\" + libBuildDir, libInfo);
@@ -182,8 +182,8 @@
}
}
-// collects information about build process of the stdlib library
-// libDir - output directory for the stdlib library
+// collects information about build process of the stdcxx library
+// libDir - output directory for the stdcxx library
// libInfo - ItemBuildInfo object to hold the collected information
function getLibraryBuildInfo(libDir, libInfo)
{
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=526240&r1=526239&r2=526240
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projects.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projects.js Fri Apr 6 11:11:38 2007
@@ -25,8 +25,8 @@
var commonDefines = "debug?_RWSTDDEBUG;dll?_RWSHARED";
var commonIncludes = "$(SolutionDir)%CONFIG%\\include";
-var stdlibIncludes = "%SRCDIR%\\include;%SRCDIR%\\include\\ansi;" + commonIncludes;
-var rwtestIncludes = "%SRCDIR%\\tests\\include;" + stdlibIncludes;
+var stdcxxIncludes = "%SRCDIR%\\include;%SRCDIR%\\include\\ansi;" + commonIncludes;
+var rwtestIncludes = "%SRCDIR%\\tests\\include;" + stdcxxIncludes;
var commonLibs = "kernel32.lib user32.lib";
var binPath = "$(SolutionDir)%CONFIG%\\bin";
@@ -42,7 +42,7 @@
// fill and return array of ProjectDef objects
// with definitions of the solution projects
-// copyDll - if true then stdlib and rwtest dlls will be copied
+// copyDll - if true then libstd and rwtest dlls will be copied
// to the target folder after build
// buildLocales - if true then generate projects for build locales
// testLocales - if true then generate projects for test locales
@@ -84,25 +84,25 @@
projectDefs.push(new Array(configureDef));
///////////////////////////////////////////////////////////////////////////////
- var stdlibDef = new ProjectDef(".stdlib", typeLibrary);
- stdlibDef.VCProjDir = ProjectsDir;
- stdlibDef.FilterDefs.push(
+ var stdcxxDef = new ProjectDef(".stdcxx", typeLibrary);
+ stdcxxDef.VCProjDir = ProjectsDir;
+ stdcxxDef.FilterDefs.push(
new FilterDef(sourceFilterName, sourceFilterUuid, sourceFilterExts, eFileTypeCppCode, false).
addFilesByMask("%SRCDIR%\\src", rxExcludedFolders, null));
- stdlibDef.FilterDefs.push(
+ stdcxxDef.FilterDefs.push(
new FilterDef(headerFilterName, headerFilterUuid, headerFilterExts, eFileTypeCppHeader, true).
addFilesByMask("%SRCDIR%\\src", rxExcludedFolders, null).
addFilter(new FilterDef("Include", headerFilterUuid, headerFilterExts + ";.", eFileTypeCppHeader, true).
addFilesByMask("%SRCDIR%\\include", rxExcludedFolders, null)));
- stdlibDef.Defines = commonDefines;
- stdlibDef.Includes = stdlibIncludes;
- stdlibDef.OutDir = libPath;
- stdlibDef.IntDir = "$(SolutionDir)%CONFIG%\\src";
- stdlibDef.Libs = commonLibs;
- stdlibDef.OutFile = "$(OutDir)\\stdlib%CONFIG%%EXT%";
- stdlibDef.PrjDeps.push(configureDef);
+ stdcxxDef.Defines = commonDefines;
+ stdcxxDef.Includes = stdcxxIncludes;
+ stdcxxDef.OutDir = libPath;
+ stdcxxDef.IntDir = "$(SolutionDir)%CONFIG%\\src";
+ stdcxxDef.Libs = commonLibs;
+ stdcxxDef.OutFile = "$(OutDir)\\libstd%CONFIG%%EXT%";
+ stdcxxDef.PrjDeps.push(configureDef);
- projectDefs.push(new Array(stdlibDef));
+ projectDefs.push(new Array(stdcxxDef));
///////////////////////////////////////////////////////////////////////////////
var rwtestDef = new ProjectDef(".rwtest", typeLibrary);
@@ -120,7 +120,7 @@
rwtestDef.OutDir = "$(SolutionDir)%CONFIG%\\tests";
rwtestDef.IntDir = rwtestDef.OutDir + "\\src";
rwtestDef.Libs = commonLibs;
- rwtestDef.PrjRefs.push(stdlibDef);
+ rwtestDef.PrjRefs.push(stdcxxDef);
projectDefs.push(new Array(rwtestDef));
@@ -163,11 +163,11 @@
new Array("aliases.h", "charmap.h", "def.h", "diagnostic.h",
"loc_exception.h", "localedef.h", "path.h", "scanner.h")));
localedefDef.Defines = commonDefines;
- localedefDef.Includes = stdlibIncludes;
+ localedefDef.Includes = stdcxxIncludes;
localedefDef.OutDir = binPath;
localedefDef.Libs = commonLibs;
localedefDef.OutFile = "$(OutDir)\\localedef.exe";
- localedefDef.PrjRefs.push(stdlibDef);
+ localedefDef.PrjRefs.push(stdcxxDef);
utilsArray.push(localedefDef);
@@ -188,11 +188,11 @@
new Array("aliases.h", "charmap.h", "def.h", "diagnostic.h",
"loc_exception.h", "memchk.h", "path.h", "scanner.h")));
localeDef.Defines = commonDefines;
- localeDef.Includes = stdlibIncludes;
+ localeDef.Includes = stdcxxIncludes;
localeDef.OutDir = binPath;
localeDef.Libs = commonLibs;
localeDef.OutFile = "$(OutDir)\\locale.exe";
- localeDef.PrjRefs.push(stdlibDef);
+ localeDef.PrjRefs.push(stdcxxDef);
utilsArray.push(localeDef);
@@ -215,10 +215,10 @@
var exampleTplDef = new ProjectDef(null, typeApplication);
exampleTplDef.VCProjDir = ProjectsDir + "\\examples";
exampleTplDef.Defines = commonDefines;
- exampleTplDef.Includes = "%SRCDIR%\\examples\\include;" + stdlibIncludes;
+ exampleTplDef.Includes = "%SRCDIR%\\examples\\include;" + stdcxxIncludes;
exampleTplDef.OutDir = "$(SolutionDir)%CONFIG%\\examples";
exampleTplDef.Libs = commonLibs;
- exampleTplDef.PrjRefs.push(stdlibDef);
+ exampleTplDef.PrjRefs.push(stdcxxDef);
var exampleDefs = exampleTplDef.createProjectDefsFromFolder(
"%SRCDIR%\\examples",
@@ -277,7 +277,7 @@
testTplDef.Includes = rwtestIncludes;
testTplDef.OutDir = "$(SolutionDir)%CONFIG%\\tests";
testTplDef.Libs = commonLibs;
- testTplDef.PrjRefs.push(stdlibDef);
+ testTplDef.PrjRefs.push(stdcxxDef);
testTplDef.PrjRefs.push(rwtestDef);
var testDefs = testTplDef.createProjectDefsFromFolder(
@@ -345,10 +345,10 @@
localeTplDef.PrjDeps.push(localedefDef);
if (!copyDll)
{
- // copy stdlibxxx.dll to the bin directory
+ // copy libstdxx.dll to the bin directory
// before executing localedef.exe utility
// and finally delete the copied file
- var libname = "stdlib%CONFIG%.dll";
+ var libname = "libstd%CONFIG%.dll";
var src = "\"" + libPath + "\\" + libname + "\"";
var dst = "\"" + binPath + "\\" + libname + "\"";
localeTplDef.PreBuildCmd = "if exist " + src + " if not exist " + dst +
@@ -389,10 +389,10 @@
testlocaleTplDef.PrjDeps.push(localedefDef);
if (!copyDll)
{
- // copy stdlibxxx.dll to the bin directory
+ // copy libstdxx.dll to the bin directory
// before executing run_locale_utils.wsf script
// and finally delete the copied file
- var libname = "stdlib%CONFIG%.dll";
+ var libname = "libstd%CONFIG%.dll";
var set =
"set soldir=%BUILDDIR%\r\n" +
"set bindir=%soldir%\\%CONFIG%\\bin\r\n" +
@@ -436,8 +436,8 @@
if (copyDll)
{
// if project type is application and
- // if it depends on stdlib project then
- // copy stdlibxxx.dll to project output directory
+ // if it depends on stdcxx project then
+ // copy libstdxx.dll to project output directory
// if it depends on rwtest project then
// copy rwtest.dll to project output directory
for (var i = 0; i < projectDefs.length; ++i)
@@ -454,9 +454,9 @@
var arrDeps = projectDef.PrjRefs.concat(projectDef.PrjDeps);
var command = "";
- if (0 <= arrayIndexOf(arrDeps, stdlibDef))
+ if (0 <= arrayIndexOf(arrDeps, stdcxxDef))
{
- var libname = "stdlib%CONFIG%.dll";
+ var libname = "libstd%CONFIG%.dll";
var src = "\"" + libPath + "\\" + libname + "\"";
var dst = "\"$(OutDir)\\" + libname + "\"";
var cmd = "if exist " + src + " (\r\n" +
Modified: incubator/stdcxx/trunk/etc/config/windows/runall.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/runall.wsf?view=diff&rev=526240&r1=526239&r2=526240
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/runall.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/runall.wsf Fri Apr 6 11:11:38 2007
@@ -34,7 +34,7 @@
required="true" type="string"/>
<named helpstring="The log file" name="LOGFILE"
required="false" type="string"/>
- <named helpstring="The copy stdlibxx.dll to exe option" name="COPYDLL"
+ <named helpstring="The copy libstdxx.dll to exe option" name="COPYDLL"
required="false" type="string"/>
<named helpstring="The lib dll folder" name="LIBDIR"
required="false" type="string"/>
@@ -55,7 +55,7 @@
@BUILDTYPE is the build type (11d, 11s, etc).
@CONFIG is the compiler configuration (msvc-7.1, icc-9.0, etc).
@LOGFILE is the log file name.
-@COPYDLL is the option for copy stdlibxx.dll to executables
+@COPYDLL is the option for copy libstdxx.dll to executables
@LIBDIR is the library dll folder (specify when COPYDLL is true)
@EXT is the extension of the example files, default value: "exe"
</usage>
@@ -95,7 +95,7 @@
var buildlogFile = "BuildLog.htm";
var summaryFileName = "Summary.htm";
var htmFolderName = "temphtm";
-var libFileName = "stdlib";
+var libFileName = "libstd";
var utlExec = "exec.exe";
var unicodeLog = false;