Author: faridz
Date: Tue Aug 7 06:36:26 2007
New Revision: 563498
URL: http://svn.apache.org/viewvc?view=rev&rev=563498
Log:
2007-08-07 Farid Zaripov <[EMAIL PROTECTED]>
* projects.js (CreateProjectsDefs): Fixed bug with deleting original
rwtest.dll when solution was generated with /COPYDLL:yes.
Modified:
incubator/stdcxx/trunk/etc/config/windows/projects.js
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=563498&r1=563497&r2=563498
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projects.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projects.js Tue Aug 7 06:36:26
2007
@@ -428,15 +428,20 @@
var arrDeps = projectDef.PrjRefs.concat(projectDef.PrjDeps);
var command = "";
+ var cmdtpl = "set src=_SRC_\r\n" +
+ "set dst=_DST_\r\n" +
+ "if /I not %src%==%dst% (\r\n" +
+ "if exist %src% (\r\n" +
+ "del %dst%\r\n" +
+ "copy /Y %src% %dst%\r\n" +
+ "))";
+
if (0 <= arrayIndexOf(arrDeps, stdcxxDef))
{
var libname = "libstd%CONFIG%.dll";
var src = "\"" + libPath + "\\" + libname + "\"";
var dst = "\"$(OutDir)\\" + libname + "\"";
- var cmd = "if exist " + src + " (\r\n" +
- "del " + dst + "\r\n" +
- "copy /Y " + src + " " + dst + "\r\n" +
- ")";
+ var cmd = cmdtpl.replace("_SRC_", src).replace("_DST_",
dst);
if (0 == command.length)
command = cmd;
else
@@ -448,10 +453,7 @@
var libname = "rwtest.dll";
var src = "\"$(SolutionDir)%CONFIG%\\tests\\" + libname +
"\"";
var dst = "\"$(OutDir)\\" + libname + "\"";
- var cmd = "if exist " + src + " (\r\n" +
- "del " + dst + "\r\n" +
- "copy /Y " + src + " " + dst + "\r\n" +
- ")";
+ var cmd = cmdtpl.replace("_SRC_", src).replace("_DST_",
dst);
if (0 == command.length)
command = cmd;
else
