stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r540999 - in /incubator/stdcxx/trunk/etc/config/windows: projects.js runall.wsf
Date Wed, 23 May 2007 17:35:16 GMT
Author: faridz
Date: Wed May 23 10:35:15 2007
New Revision: 540999

URL: http://svn.apache.org/viewvc?view=rev&rev=540999
Log:
2007-05-23 Farid Zaripov <Farid_Zaripov@epam.com>

	* projects.js (CreateProjectDefs): Add path of the bin directory to PATH
	envirobment variable before invoking runall.wsf script.
	* runall.wsf: Removed LIBDIR option as unused. Removed libdllFolder and
	libFileName variables as unused.

Modified:
    incubator/stdcxx/trunk/etc/config/windows/projects.js
    incubator/stdcxx/trunk/etc/config/windows/runall.wsf

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=540999&r1=540998&r2=540999
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projects.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projects.js Wed May 23 10:35:15 2007
@@ -247,7 +247,7 @@
         "if exist \"$(OutDir)\\runexamples.log\" del \"$(OutDir)\\runexamples.log\"";
     runexamplesDef.CustomBuildFile = "runall.wsf";
     runexamplesDef.CustomBuildCmd =
-        "set PATH=$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
+        "set PATH=$(SolutionDir)%CONFIG%\\bin;$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
         "cscript /nologo \"%CUSTOMFILE%\"" +
         " /INOUTDIR:\"%SRCDIR%\\examples\"" +
         " /EXEDIR:\"$(OutDir)\"" +
@@ -307,7 +307,7 @@
         "if exist \"$(OutDir)\\runtests.log\" del \"$(OutDir)\\runtests.log\"";
     runtestsDef.CustomBuildFile = "runall.wsf";
     runtestsDef.CustomBuildCmd =
-        "set PATH=$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
+        "set PATH=$(SolutionDir)%CONFIG%\\bin;$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
         "cscript /nologo \"%CUSTOMFILE%\"" +
         " /EXEDIR:\"$(OutDir)\"" +
         " /PRJDIR:\"" + runtestsDef.VCProjDir + "\"" +
@@ -385,7 +385,7 @@
                           "summary.js")));
     testlocaleTplDef.CustomBuildFile = "runall.wsf";
     testlocaleTplDef.CustomBuildCmd =
-        "set PATH=$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
+        "set PATH=$(SolutionDir)%CONFIG%\\bin;$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
         "cscript /nologo \"%CUSTOMFILE%\"" +
         " /EXEDIR:\"$(OutDir)\"" +
         " /CONFIG:\"%SOLUTION%\"" +

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=540999&r1=540998&r2=540999
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/runall.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/runall.wsf Wed May 23 10:35:15 2007
@@ -36,8 +36,6 @@
                 required="false" type="string"/>
             <named helpstring="Run tests in compat mode" name="COMPAT" 
                 required="false" type="string"/>
-            <named helpstring="The lib dll folder" name="LIBDIR" 
-                required="false" type="string"/>
             <named helpstring="The examples extension" name="EXT" 
                 required="false" type="string"/>
             <example>
@@ -48,7 +46,7 @@
             <usage>
 Usage: cscript runexamples.wsf /EXEDIR:@EXEDIR /CONFIG:@CONFIG
 [/PRJDIR:@PRJDIR] [/INOUTDIR:@INOUTDIR] [/LOGFILE:@LOGFILE]
-[/COMPAT] [/LIBDIR:@LIBDIR] [/EXT:@EXT]
+[/COMPAT] [/EXT:@EXT]
 where
 @EXEDIR is the root directory with executables to be run and checked,
 @PRJDIR is the directory with .vcproj files of the executables,
@@ -57,7 +55,6 @@
 @CONFIG is the compiler configuration (msvc-7.1, icc-9.0, etc),
 @LOGFILE is the log file name,
 @COMPAT is the option for run tests in compat mode,
-@LIBDIR is the library dll folder,
 @EXT is the extension of the example files, default value: "exe".
             </usage>
         </runtime>
@@ -80,7 +77,6 @@
 var logFileName = ""; // the log file name
 var logFileDefault = "runexamples.log"; // the default log file name
 var compatMode = false;
-var libdllFolder = "";
 var ext = "exe";
 
 var varOut = "out";
@@ -97,7 +93,6 @@
 var buildlogFile = "BuildLog.htm";
 var summaryFileName = "Summary.htm";
 var htmFolderName = "temphtm";
-var libFileName = "libstd";
 
 var utlExec = "exec.exe";
 var unicodeLog = false;
@@ -165,8 +160,6 @@
     if (WScript.Arguments.Named.Exists("INOUTDIR"))
         inoutDir =  WScript.Arguments.Named("INOUTDIR");
 
-    utlExec = examplesDir + "\\..\\bin\\" + utlExec;
-    
     if (WScript.Arguments.Named.Exists("LOGFILE"))
         logFileName = WScript.Arguments.Named("LOGFILE");
     else
@@ -174,9 +167,6 @@
         
     if (WScript.Arguments.Named.Exists("COMPAT"))
         compatMode = true;
-    
-    if (WScript.Arguments.Named.Exists("LIBDIR"))
-        libdllFolder = WScript.Arguments.Named("LIBDIR");
     
     if (WScript.Arguments.Named.Exists("EXT"))
         ext = WScript.Arguments.Named("EXT");



Mime
View raw message