svn commit: r590167 - in /incubator/stdcxx/branches/4.2.x/etc/config/windows: configure.wsf projects.js

[faridz]

Author: faridz
Date: Tue Oct 30 10:29:56 2007
New Revision: 590167

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

        Merged r583840 from trunk
        * configure.wsf (configure): Removed IncludeDir command
        line option.
        * projects.js (CreateProjectsDefs): Removed /IncludeDir
        option from command line of the configure.wsf script.

Modified:
    incubator/stdcxx/branches/4.2.x/etc/config/windows/configure.wsf
    incubator/stdcxx/branches/4.2.x/etc/config/windows/projects.js

Modified: incubator/stdcxx/branches/4.2.x/etc/config/windows/configure.wsf
URL: 
http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/etc/config/windows/configure.wsf?rev=590167&r1=590166&r2=590167&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/etc/config/windows/configure.wsf (original)
+++ incubator/stdcxx/branches/4.2.x/etc/config/windows/configure.wsf Tue Oct 30 
10:29:56 2007
@@ -72,7 +72,6 @@
 var configFile = configTargerDir + "\\" + configFileName;
 var stageFile = stageDir + "\\" + configFileName;
 var srcDir = slnDir + "\\etc\\config\\src";
-var includeDir = slnDir + "\\include";
 var runWindowMode = 0;
 var timeOut = 30000; // 30 sec
 var logFileName = "config.log";
@@ -135,18 +134,6 @@
             WScript.Quit(2);
         }
     }
-        
-    if (WScript.Arguments.Named.Exists("IncludeDir"))
-    {
-        includeDir = WScript.Arguments.Named("IncludeDir");
-        if (!fso.FolderExists(includeDir))
-        {
-            WScript.StdErr.WriteLine(
-                "Configure: Fatal error: Unable to read includes folder "
-                + includeDir);
-            WScript.Quit(2);
-        }
-    }
 
     if (WScript.Arguments.Named.Exists("OutFile"))
         configFile = WScript.Arguments.Named("OutFile");
@@ -257,7 +244,7 @@
         LDFLAGS += " /DEBUG";
     }
 
-    CPPFLAGS += joinArray(new Array(stageDir, includeDir), "/I");
+    CPPFLAGS += " /I\"" + stageDir + "\"";
     
     var defines = new Array ();
     

Modified: incubator/stdcxx/branches/4.2.x/etc/config/windows/projects.js
URL: 
http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/etc/config/windows/projects.js?rev=590167&r1=590166&r2=590167&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/etc/config/windows/projects.js (original)
+++ incubator/stdcxx/branches/4.2.x/etc/config/windows/projects.js Tue Oct 30 
10:29:56 2007
@@ -74,7 +74,6 @@
         " /SolutionName:\"%SOLUTION%\"" +
         " /ConfigurationName:\"%CFGNAME%\"" +
         " /SrcDir:\"%SRCDIR%\\etc\\config\\src\"" +
-        " /IncludeDir:\"%SRCDIR%\\include\"" +
         " /OutDir:\"$(OutDir)\"" +
         " /OutFile:\"$(OutDir)\\config.h\"" +
         " /LogFile:\"$(OutDir)\\config.log\"";