svn commit: r570727 - in /incubator/stdcxx/trunk/etc/config/windows: icc-10.0-x64.config icc-10.0.config msvc-7.0.config projectdef.js

[faridz]

Author: faridz
Date: Wed Aug 29 02:54:23 2007
New Revision: 570727

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

        * msvc-7.0.config: Updated comment on ICCCONVERT variable.
        * icc-10.0.config: Set ICCCONVERT=ICProjConvert100.exe.
        * icc-10.0-x64.config: Ditto.
        * projectdef.js (InitVSObjects): Updated the intel conversion
        utility path detection algorithm.

Modified:
    incubator/stdcxx/trunk/etc/config/windows/icc-10.0-x64.config
    incubator/stdcxx/trunk/etc/config/windows/icc-10.0.config
    incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config
    incubator/stdcxx/trunk/etc/config/windows/projectdef.js

Modified: incubator/stdcxx/trunk/etc/config/windows/icc-10.0-x64.config
URL: 
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/icc-10.0-x64.config?rev=570727&r1=570726&r2=570727&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/icc-10.0-x64.config (original)
+++ incubator/stdcxx/trunk/etc/config/windows/icc-10.0-x64.config Wed Aug 29 
02:54:23 2007
@@ -7,3 +7,4 @@
 LD=icl
 AR=xilib
 CLVARSBAT=%ICPP_COMPILER10%\EM64T\Bin\iclvars.bat
+ICCCONVERT=ICProjConvert100.exe

Modified: incubator/stdcxx/trunk/etc/config/windows/icc-10.0.config
URL: 
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/icc-10.0.config?rev=570727&r1=570726&r2=570727&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/icc-10.0.config (original)
+++ incubator/stdcxx/trunk/etc/config/windows/icc-10.0.config Wed Aug 29 
02:54:23 2007
@@ -7,3 +7,4 @@
 LD=icl
 AR=xilib
 CLVARSBAT=%ICPP_COMPILER10%\IA32\Bin\iclvars.bat
+ICCCONVERT=ICProjConvert100.exe

Modified: incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config
URL: 
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config?rev=570727&r1=570726&r2=570727&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config (original)
+++ incubator/stdcxx/trunk/etc/config/windows/msvc-7.0.config Wed Aug 29 
02:54:23 2007
@@ -17,8 +17,8 @@
 // if empty it will be tried to be detected automatically
 WINDIFF=
 
-// Path to the ICProjConvert90.exe utility:
-// if empty it will be tried to be detected automatically
+// Path of the ICProjConvertxx.exe utility:
+// if path is empty it will be tried to be detected automatically
 ICCCONVERT=
 
 // Convert solution to ICC format

Modified: incubator/stdcxx/trunk/etc/config/windows/projectdef.js
URL: 
http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/projectdef.js?rev=570727&r1=570726&r2=570727&view=diff
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projectdef.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projectdef.js Wed Aug 29 02:54:23 
2007
@@ -66,14 +66,17 @@
 
     if (CONVERT)
     {
+        if (ICCCONVERT == "")
+            ICCCONVERT = "ICProjConvert90.exe";
+
         var ICConvertTool = ICCCONVERT;
 
         var arrPath = new Array(ICConvertTool);
 
-        if (ICConvertTool == "")
+        if (0 > ICConvertTool.indexOf("\\"))
         {
-            ICConvertTool = "ICProjConvert90.exe";
-            arrPath[0] = ICConvertTool;
+            // no file path specified
+            // try to detect the path
             if (null != dte)
             {
                 try
@@ -103,6 +106,7 @@
         if (!success)
         {
             WScript.StdErr.WriteLine(ICCCONVERT + " conversion utility not 
found");
+            WScript.StdErr.WriteLine("You should check ICCCONVERT 
configuration variable");
             WScript.Quit(3);
         }
     }