[ros-diffs] [janderwald] 22504: apply changes to msvc_clean target

Author: janderwald
Date: Thu Jun 22 23:09:46 2006
New Revision: 22504
URL: http://svn.reactos.ru/svn/reactos?rev=22504&view=rev
Log:
apply changes to msvc_clean target
Modified:
    trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp
Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/m…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Thu Jun 22 23:09:46 2006
@@ -296,18 +296,33 @@
        string basepath = module.GetBasePath ();
        string vcdir = _get_vc_dir ();
        size_t i;
-       string intenv = Environment::GetIntermediatePath () + "\\" + basepath +
"\\" + vcdir + "\\";
-       string outenv = Environment::GetOutputPath () + "\\" + basepath +
"\\" + vcdir + "\\";
+       string intenv = Environment::GetIntermediatePath () + "\\" + basepath +
"\\";
+       string outenv = Environment::GetOutputPath () + "\\" + basepath +
"\\";
+
+       if ( configuration.UseVSVersionInPath )
+       {
+               intenv += vcdir + "\\";
+               outenv += vcdir + "\\";
+       }
+
        string dbg = vcdir.substr ( 0, 3 );
        vector<string> cfgs;
-       cfgs.push_back ( intenv + "Debug" );
-       cfgs.push_back ( intenv + "Release" );
-       cfgs.push_back ( intenv + "Speed" );
-       cfgs.push_back ( outenv + "Debug" );
-       cfgs.push_back ( outenv + "Release" );
-       cfgs.push_back ( outenv + "Speed" );
-
+
+       if ( configuration.UseVSConfigurationInPath )
+       {
+               cfgs.push_back ( intenv + "Debug" );
+               cfgs.push_back ( intenv + "Release" );
+               cfgs.push_back ( intenv + "Speed" );
+               cfgs.push_back ( outenv + "Debug" );
+               cfgs.push_back ( outenv + "Release" );
+               cfgs.push_back ( outenv + "Speed" );
+       }
+       else
+       {
+               cfgs.push_back ( intenv );
+               cfgs.push_back ( outenv );
+       }
        vector<const IfableData*> ifs_list;
        ifs_list.push_back ( &module.project.non_if_data );
@@ -371,8 +386,12 @@
                _get_object_files ( module, out );
                for ( size_t j = 0; j < out.size (); j++)
+               {
+                       //printf("Cleaning file %s\n", out[j].c_str () );
                        remove ( out[j].c_str () );
-       }
+               }
+       }
+
        string filename_sln = ProjectNode.name + ".sln";
        string filename_dsw = ProjectNode.name + ".dsw";