stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r477223 - in /incubator/stdcxx/trunk/etc/config/windows: projectdef.js projects.js
Date Mon, 20 Nov 2006 15:27:28 GMT
Author: faridz
Date: Mon Nov 20 07:27:27 2006
New Revision: 477223

URL: http://svn.apache.org/viewvc?view=rev&rev=477223
Log:
2006-11-20 Farid Zaripov <faridz@kyiv.vdiweb.com>

	* projects.js (CreateProjectsDefs): Corrected OutDir for test
	locales projects; added dependency from project "exec"
	* projectdef.js (projectCreateTestLocaleDefs): Added locale
	sanity test; modified command line to using the exec utility
	to run locale test.

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

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=477223&r1=477222&r2=477223
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projectdef.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projectdef.js Mon Nov 20 07:27:27 2006
@@ -27,6 +27,9 @@
 var TristateTrue = -1;
 var TristateFalse = 0;
 
+// the timeout for the exec utility
+var execTimeout = 180;
+
 var VCProjectEngine = null;
 var ICConvertTool = "ICProjConvert90.exe";
 
@@ -746,6 +749,28 @@
         
     var projectDefs = new Array();
 
+    var srcdir = "%SRCDIR%\\etc\\config\\windows";
+    var bindir = "$(SolutionDir)%CONFIG%\\bin";
+    var exec = bindir + "\\exec.exe";
+    var test = bindir + "\\sanity_test";
+
+    // create test_locale_sanity project
+    var sanityDef = this.clone();
+    sanityDef.Name = "test_locale_sanity";
+    sanityDef.FilterDefs.push(
+        new FilterDef("Script Files", null, "js;wsf", eFileTypeScript, false).
+        addFiles(srcdir, new Array("run_locale_utils.wsf")));
+    if (null == sanityDef.PreBuildCmd)
+        sanityDef.PreBuildCmd = "";
+    else
+        sanityDef.PreBuildCmd += "\r\n";
+    sanityDef.PreBuildCmd +=
+        "echo cscript /nologo \"" + srcdir + "\\run_locale_utils.wsf\"" +
+        " /s /b:\"" + bindir + "\" > \"" + test + ".bat\"";
+    sanityDef.CustomBuildCmd = "\"" + exec + "\" -t " + execTimeout + " \"" + test + ".bat\"";
+    sanityDef.CustomBuildOut = test + ".out";
+    projectDefs.push(sanityDef);
+        
     for (var i = 0; i < this.arrLocales.length; ++i)
     {
         var locale = this.arrLocales[i];
@@ -777,6 +802,8 @@
             WScript.Quit(3);
         }
 
+        test = bindir + "\\" + locale.Name;
+
         var projectDef = this.clone();
         projectDef.Name = "test_" + locale.Name;
         projectDef.FilterDefs.push(
@@ -787,12 +814,18 @@
             addFiles(null, new Array(srcFile.Path)));
         projectDef.FilterDefs.push(
             new FilterDef("Script Files", null, "js;wsf", eFileTypeScript, false).
-            addFiles("%SRCDIR%\\etc\\config\\windows", new Array("run_locale_utils.wsf")));
-        projectDef.CustomBuildCmd =
-            "cscript /nologo \"%SRCDIR%\\etc\\config\\windows\\run_locale_utils.wsf\"" +
-            " /b:\"$(SolutionDir)%CONFIG%\\bin\" /f" +
-            " /i:\"" + nlsDir + "\"" + " /l:" + locale.Name;
-        projectDef.CustomBuildOut = " ";
+            addFiles(srcdir, new Array("run_locale_utils.wsf")));
+        if (null == projectDef.PreBuildCmd)
+            projectDef.PreBuildCmd = "";
+        else
+            projectDef.PreBuildCmd += "\r\n";
+        projectDef.PreBuildCmd +=
+            "echo cscript /nologo \"" + srcdir + "\\run_locale_utils.wsf\"" +
+            " /f /b:\"" + bindir + "\" /i:\"" + nlsDir + "\"" +
+            " /l:" + locale.Name + " > \"" + test + ".bat\"";
+        projectDef.CustomBuildCmd = "\"" + exec + "\" -t " + execTimeout + " \"" + test +
".bat\"";
+        projectDef.CustomBuildOut = test + ".out";
+        projectDef.PrjDeps.push(sanityDef);
         
         projectDefs.push(projectDef);
     }    

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=477223&r1=477222&r2=477223
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projects.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projects.js Mon Nov 20 07:27:27 2006
@@ -332,9 +332,10 @@
     {
         var testlocaleTplDef = new ProjectDef(null, typeGeneric);
         testlocaleTplDef.VCProjDir = ProjectsDir + "\\locales";
-        testlocaleTplDef.OutDir = "$(SolutionDir)bin";
-        testlocaleTplDef.IntDir = testlocaleTplDef.OutDir + "\\Build\\$(ProjectName)";
+        testlocaleTplDef.OutDir = "$(SolutionDir)%CONFIG%\\bin";
+        testlocaleTplDef.IntDir = testlocaleTplDef.OutDir + "\\$(ProjectName)";
         testlocaleTplDef.CustomBuildDeps = "%FILES%";
+        testlocaleTplDef.PrjDeps.push(execDef);
         testlocaleTplDef.PrjDeps.push(localeDef);
         testlocaleTplDef.PrjDeps.push(localedefDef);
         if (!copyDll)



Mime
View raw message