svn commit: r497103 - in /incubator/stdcxx/trunk/etc/config/windows: build.wsf projectdef.js summary.js

[faridz]

Author: faridz
Date: Wed Jan 17 10:03:23 2007
New Revision: 497103

URL: http://svn.apache.org/viewvc?view=rev&rev=497103
Log:
2007-01-17 Farid Zaripov <[EMAIL PROTECTED]>

        * build.wsf (build): Set BuildLogging variable to true before the build
        * projectdef.js (projectCreateTestLocalesDef): Use compacted PreBuildCmd
        * summary.js (readBuildLog): Removed temporary for loop since the bug 
not repeated

Modified:
    incubator/stdcxx/trunk/etc/config/windows/build.wsf
    incubator/stdcxx/trunk/etc/config/windows/projectdef.js
    incubator/stdcxx/trunk/etc/config/windows/summary.js

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=497103&r1=497102&r2=497103
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/build.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/build.wsf Wed Jan 17 10:03:23 2007
@@ -186,6 +186,7 @@
 
         // save BuildLogging property value
         oldLogging = projectEngine.BuildLogging;
+        projectEngine.BuildLogging = true;
 
         WScript.Echo("Performing configure step...\n");
         var res = BuildProject(solutionBuild, "Projects\\configure.vcproj");

Modified: incubator/stdcxx/trunk/etc/config/windows/projectdef.js
URL: 
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/projectdef.js?view=diff&rev=497103&r1=497102&r2=497103
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projectdef.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projectdef.js Wed Jan 17 10:03:23 
2007
@@ -852,6 +852,8 @@
     projectDef.CustomBuildCmd = "cd \"" + bindir + "\"\r\n" +
         "exec.exe -t " + execTimeout + " " + test + ".bat";
     projectDef.CustomBuildOut = bindir + "\\" + test + ".out";
+
+    var locales = "";
         
     for (var i = 0; i < this.arrLocales.length; ++i)
     {
@@ -884,13 +886,20 @@
             WScript.Quit(3);
         }
 
-        projectDef.PreBuildCmd += "\r\n" +
-            "echo cscript /nologo \"" + srcdir + "\\run_locale_utils.wsf\"" +
-            " /f /b:\"" + bindir + "\" /i:\"" + nlsDir + "\"" +
-            " /l:" + locale.Name + " > \"" + bindir + "\\" + locale.Name + 
".bat\"";
+        locales += locale.Name + " ";
         projectDef.CustomBuildCmd += " " + locale.Name + ".bat";
         projectDef.CustomBuildOut += ";" + bindir + "\\" + locale.Name + 
".out";
-    }    
+    }
+
+    if (0 < locales.length)
+    {
+        locales = "set locales=" + locales;
+        projectDef.PreBuildCmd += "\r\n" + locales + "\r\n" +
+            "for %%l in (%locales%) do " +
+            "echo cscript /nologo \"" + srcdir + "\\run_locale_utils.wsf\"" +
+            " /f /b:\"" + bindir + "\" /i:\"" + nlsDir + "\"" +
+            " /l:%%l > \"" + bindir + "\\%%l.bat\"";
+    }
 
     return projectDef;
 }

Modified: incubator/stdcxx/trunk/etc/config/windows/summary.js
URL: 
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/summary.js?view=diff&rev=497103&r1=497102&r2=497103
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/summary.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/summary.js Wed Jan 17 10:03:23 
2007
@@ -58,23 +58,11 @@
     var uniMode = (true == useUnicode) ? -1 : 0;
     var blogFile;
 
-    // temporary loop for detect place of the problem:
-    // runall.wsf(59, 6) Microsoft JScript runtime error: Permission denied
-    for (var i = 0; i < 5 && "undefined" == typeof(blogFile); ++i)
+    try
     {
-        try
-        {
-            blogFile = fso.OpenTextFile(blogFilePath, 1, false, uniMode);
-        }
-        catch (e)
-        {
-            // file may be locked, waiting
-            WScript.Echo("File " + blogFilePath + " is locked, waiting for a 1 
second");
-            WScript.Sleep(1000);
-        }
+        blogFile = fso.OpenTextFile(blogFilePath, 1, false, uniMode);
     }
-
-    if ("undefined" == typeof(blogFile))
+    catch (e)
     {
         WScript.Echo("Cannot open file: " + blogFilePath);
         return;