stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r497858 - in /incubator/stdcxx/trunk/etc/config/windows: projectdef.js projects.js
Date Fri, 19 Jan 2007 16:14:56 GMT
Author: faridz
Date: Fri Jan 19 08:14:55 2007
New Revision: 497858

URL: http://svn.apache.org/viewvc?view=rev&rev=497858
Log:
2007-01-19 Farid Zaripov <faridz@kyiv.vdiweb.com>

	* projectdef.js (projectCreateTestLocalesDef): PreBuildCmd modified
	to use local variables for paths.
	* projects.js (CreateProjectsDefs): Ditto.

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=497858&r1=497857&r2=497858
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projectdef.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projectdef.js Fri Jan 19 08:14:55 2007
@@ -843,12 +843,18 @@
     // create test_locale_sanity project
     var projectDef = this.clone();
     if (null == projectDef.PreBuildCmd)
-        projectDef.PreBuildCmd = "";
-    else
-        projectDef.PreBuildCmd += "\r\n";
+    {
+        projectDef.PreBuildCmd =
+            "set soldir=$(SolutionDir)\r\n" +
+            "set bindir=%soldir%%CONFIG%\\bin";
+    }
+
+    projectDef.PreBuildCmd += "\r\n" +
+        "set etcdir=%SRCDIR%\\etc\r\n" +
+        "set util=\"%etcdir%\\config\\windows\\run_locale_utils.wsf\"\r\n";
+
     projectDef.PreBuildCmd +=
-        "echo cscript /nologo \"" + srcdir + "\\run_locale_utils.wsf\"" +
-        " /s /b:\"" + bindir + "\" > \"" + bindir + "\\" + test + ".bat\"";
+        "echo cscript /nologo %util% /s /b:\"%bindir%\" > \"%bindir%\\" + test + ".bat\"";
     projectDef.CustomBuildCmd = "cd \"" + bindir + "\"\r\n" +
         "exec.exe -t " + execTimeout + " " + test + ".bat";
     projectDef.CustomBuildOut = bindir + "\\" + test + ".out";
@@ -893,12 +899,10 @@
 
     if (0 < locales.length)
     {
-        locales = "set locales=" + locales;
-        projectDef.PreBuildCmd += "\r\n" + locales + "\r\n" +
+        projectDef.PreBuildCmd += "\r\nset locales=" + 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\"";
+            "echo cscript /nologo %util% /f /b:\"%bindir%\" " +
+            "/i:\"%etcdir%\\nls\" /l:%%l > \"%bindir%\\%%l.bat\"";
     }
 
     return 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=497858&r1=497857&r2=497858
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projects.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projects.js Fri Jan 19 08:14:55 2007
@@ -386,11 +386,16 @@
         // before executing run_locale_utils.wsf script
         // and finally delete the copied file
         var libname = "stdlib%CONFIG%.dll";
-        var src = "\"$(SolutionDir)lib\\" + libname + "\"";
-        var dst = "\"$(SolutionDir)%CONFIG%\\bin\\" + libname + "\"";
-        testlocaleTplDef.PreBuildCmd = "if exist " + src + " if not exist " + dst +
-                                     " copy /Y " + src + " " + dst;
-        testlocaleTplDef.PostBuildCmd = "if exist " + dst + " del " + dst;
+        var set = 
+            "set soldir=$(SolutionDir)\r\n" +
+            "set bindir=%soldir%%CONFIG%\\bin\r\n" +
+            "set dstdll=\"%bindir%\\" + libname + "\"\r\n";
+        testlocaleTplDef.PreBuildCmd = set +
+            "set srcdll=\"%soldir%lib\\" + libname + "\"\r\n" +
+            "if exist %srcdll% if not exist %dstdll% " +
+            "copy /Y %srcdll% %dstdll%";
+        testlocaleTplDef.PostBuildCmd = set +
+            "if exist %dstdll% del %dstdll%";
     }
 
     if (testLocales)



Mime
View raw message