- Put output from MSVC into the relevant output-i386 / obj-i386 files

- #if 0'd out the code to use ReactOS' internal libs until ReactOS can be fully built with MSVC. We must continue to rely on PSDK until this time.
- code by Brezenbak (IRC)

svn path=/trunk/; revision=19884

diff --git a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
index d95a6c2..b62f796 100644 (file)
--- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
@@ -47,16 +47,28 @@ MSVCBackend::_generate_vcproj ( const Module& module )
        FILE* OUT = fopen ( vcproj_file.c_str(), "wb" );\r
 \r
        vector<string> imports;\r
-       for ( i = 0; i < module.non_if_data.libraries.size(); i++ )\r
-       {\r
-               imports.push_back ( module.non_if_data.libraries[i]->name );\r
-       }\r
-\r
        string module_type = GetExtension(module.GetTargetName());\r
        bool lib = (module.type == ObjectLibrary) || (module_type == ".lib") || (module_type == ".a");\r
        bool dll = (module_type == ".dll") || (module_type == ".cpl");\r
        bool exe = (module_type == ".exe");\r
        bool sys = (module_type == ".sys");\r
+\r
+       string path_basedir = module.GetPathToBaseDir ();\r
+       string intenv = Environment::GetIntermediatePath ();\r
+       string outenv = Environment::GetOutputPath ();\r
+       string outdir;\r
+       string intdir;\r
+       \r
+       if ( intenv == "obj-i386" )\r
+               intdir = path_basedir + "obj-i386"; /* append relative dir from project dir */\r
+       else\r
+               intdir = intenv;\r
+\r
+       if ( outenv == "output-i386" )\r
+               outdir = path_basedir + "output-i386";\r
+       else\r
+               outdir = outenv;\r
+\r
        // TODO FIXME - need more checks here for 'sys' and possibly 'drv'?\r
 \r
        bool console = exe && (module.type == Win32CUI);\r
@@ -130,7 +142,19 @@ MSVCBackend::_generate_vcproj ( const Module& module )
                const vector<Library*>& libs = data.libraries;\r
                for ( i = 0; i < libs.size(); i++ )\r
                {\r
-                       libraries.push_back ( libs[i]->name + ".lib" );\r
+#if 0\r
+                       // this code is deactivated untill the tree builds fine with msvc\r
+                       // --- is appended to each library path which is later\r
+                       // replaced by the configuration\r
+                       // i.e. ../output-i386/lib/rtl/---/rtl.lib becomes\r
+                       //      ../output-i386/lib/rtl/Debug/rtl.lib \r
+                       // etc\r
+                       libs[i]->importedModule->\r
+                       string libpath = outdir + "\\" + libs[i]->importedModule->GetBasePath() + "\\---\\" + libs[i]->name + ".lib";\r
+                       libraries.push_back ( libpath );\r
+#else\r
+               libraries.push_back ( libs[i]->name + ".lib" );\r
+#endif\r
                }\r
                const vector<Define*>& defs = data.defines;\r
                for ( i = 0; i < defs.size(); i++ )\r
@@ -229,8 +253,8 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 \r
                fprintf ( OUT, "\t\t<Configuration\r\n" );\r
                fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.c_str() );\r
-               fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\"\r\n", cfg.c_str() );\r
-               fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\"\r\n", cfg.c_str() );\r
+               fprintf ( OUT, "\t\t\tOutputDirectory=\"%s\\%s\\%s\"\r\n", outdir.c_str (), module.GetBasePath ().c_str (), cfg.c_str() );\r
+               fprintf ( OUT, "\t\t\tIntermediateDirectory=\"%s\\%s\\%s\"\r\n", intdir.c_str (), module.GetBasePath ().c_str (), cfg.c_str() );\r
                fprintf ( OUT, "\t\t\tConfigurationType=\"%d\"\r\n", exe ? 1 : dll ? 2 : lib ? 4 : -1 );\r
                fprintf ( OUT, "\t\t\tCharacterSet=\"2\">\r\n" );\r
 \r
@@ -316,6 +340,8 @@ MSVCBackend::_generate_vcproj ( const Module& module )
                fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127\"\r\n" );\r
                fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", release ? "0" : "4" );\r
                fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", release ? "FALSE" : "TRUE");\r
+               if ( !module.cplusplus )\r
+                       fprintf ( OUT, "\t\t\t\tCompileAs=\"1\"\r\n" );\r
                fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : "4");\r
 \r
                fprintf ( OUT, "\t\t\t<Tool\r\n" );\r
@@ -337,7 +363,17 @@ MSVCBackend::_generate_vcproj ( const Module& module )
                        {\r
                                if ( i > 0 )\r
                                        fprintf ( OUT, " " );\r
+#if 0 \r
+                               // this code is deactivated untill \r
+                               // msvc can build the whole tree\r
+                               string libpath = libraries[i].c_str();\r
+                               libpath.replace (libpath.find("---"), //See HACK\r
+                                                    3,\r
+                                                                cfg);\r
+                               fprintf ( OUT, "%s", libpath.c_str() );\r
+#else\r
                                fprintf ( OUT, "%s", libraries[i].c_str() );\r
+#endif\r
                        }\r
                        fprintf ( OUT, "\"\r\n" );\r
 \r

diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index a44be3b..69d577f 100644 (file)
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -996,6 +996,19 @@ Module::GetPathWithPrefix ( const string& prefix ) const
        return path + cSep + prefix + GetTargetName ();
 }
 
+string
+Module::GetPathToBaseDir () const
+{
+       string temp_path = path;
+       string result = "..\\";
+       while(temp_path.find ('\\') != string::npos)
+       {
+               temp_path.erase (0, temp_path.find('\\')+1);
+               result += "..\\";
+       }
+       return result;
+}
+
 string
 Module::GetInvocationTarget ( const int index ) const
 {

diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h
index 0fe88ad..917512a 100644 (file)
--- a/reactos/tools/rbuild/rbuild.h
+++ b/reactos/tools/rbuild/rbuild.h
@@ -322,6 +322,7 @@ public:
        std::string GetBasePath () const; // "path"
        std::string GetPath () const; // "path/foo.exe"
        std::string GetPathWithPrefix ( const std::string& prefix ) const; // "path/prefixfoo.exe"
+       std::string GetPathToBaseDir() const; // "../" offset to rootdirectory
        void GetTargets ( string_list& ) const;
        std::string GetInvocationTarget ( const int index ) const;
        bool HasFileWithExtension ( const IfableData&, const std::string& extension ) const;