fix vcprojmaker to add the correct GUIDs

implemented Debug/Release configurations to make Alex happy

svn path=/trunk/; revision=18624

diff --git a/reactos/tools/rbuild/backend/msvc/msvc.cpp b/reactos/tools/rbuild/backend/msvc/msvc.cpp
index 6b5c3f2..39c7839 100644 (file)
--- a/reactos/tools/rbuild/backend/msvc/msvc.cpp
+++ b/reactos/tools/rbuild/backend/msvc/msvc.cpp
@@ -31,8 +31,6 @@
 \r
 using namespace std;\r
 \r
-void gen_guid();\r
-\r
 static class MSVCFactory : public Backend::Factory\r
 {\r
        public:\r
@@ -93,9 +91,10 @@ void MSVCBackend::ProcessModules()
        {\r
                Module &module = *ProjectNode.modules[i];\r
 \r
+               module.guid = _gen_guid();\r
                this->_generate_dsp ( module );\r
                this->_generate_vcproj ( module );\r
-//             gen_guid();\r
+\r
 \r
                /*for(size_t k = 0; k < module.non_if_data.files.size(); k++)\r
                {\r

diff --git a/reactos/tools/rbuild/backend/msvc/msvc.h b/reactos/tools/rbuild/backend/msvc/msvc.h
index b685fe5..15b5431 100644 (file)
--- a/reactos/tools/rbuild/backend/msvc/msvc.h
+++ b/reactos/tools/rbuild/backend/msvc/msvc.h
@@ -86,7 +86,7 @@ class MSVCBackend : public Backend
                        const std::string &replace_str);\r
 \r
                void _generate_vcproj ( const Module& module );\r
-               \r
+\r
                void _generate_sln_header ( FILE* OUT );\r
                void _generate_sln_footer ( FILE* OUT );\r
                void _generate_sln ( FILE* OUT );\r
@@ -97,6 +97,9 @@ class MSVCBackend : public Backend
                        std::string sln_guid,\r
                        std::string vcproj_guid,\r
                        const std::vector<Dependency*>& dependencies );\r
+               void _generate_sln_configurations (\r
+                       FILE* OUT,\r
+                       std::string vcproj_guid );\r
 \r
 };\r
 \r

diff --git a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
index 98d3d14..1f2c300 100644 (file)
--- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
@@ -140,7 +140,8 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 \r
        std::vector<std::string> cfgs;\r
 \r
-       cfgs.push_back ( module.name + " - Win32" );\r
+       cfgs.push_back ( "Debug" );\r
+       cfgs.push_back ( "Release" );\r
 \r
        if (!no_cpp)\r
        {\r
@@ -177,6 +178,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 \r
        fprintf ( OUT, "\tVersion=\"%s\"\r\n", configuration.VSProjectVersion.c_str() );\r
        fprintf ( OUT, "\tName=\"%s\"\r\n", module.name.c_str() );\r
+       fprintf ( OUT, "\tProjectGUID=\"%s\"\r\n", module.guid.c_str() ); \r
        fprintf ( OUT, "\tKeyword=\"Win32Proj\">\r\n" );\r
 \r
        fprintf ( OUT, "\t<Platforms>\r\n" );\r
@@ -436,12 +438,11 @@ MSVCBackend::_generate_sln_project (
        std::string vcproj_guid,\r
        const std::vector<Dependency*>& dependencies )\r
 {\r
-       \r
-    vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file );\r
+       vcproj_file = DosSeparator ( std::string(".\\") + vcproj_file );\r
 \r
        fprintf ( OUT, "Project(\"%s\") = \"%s\", \"%s\", \"%s\"\r\n", sln_guid.c_str() , module.name.c_str(), vcproj_file.c_str(), vcproj_guid.c_str() );\r
-       fprintf ( OUT, "        ProjectSection(ProjectDependencies) = postProject\r\n" );\r
-       fprintf ( OUT, "        EndProjectSection\r\n" );\r
+       fprintf ( OUT, "\tProjectSection(ProjectDependencies) = postProject\r\n" );\r
+       fprintf ( OUT, "\tEndProjectSection\r\n" );\r
        fprintf ( OUT, "EndProject\r\n" );\r
 }\r
 \r
@@ -449,17 +450,23 @@ MSVCBackend::_generate_sln_project (
 void\r
 MSVCBackend::_generate_sln_footer ( FILE* OUT )\r
 {\r
-    fprintf ( OUT, "Global\r\n" );\r
-\r
-       fprintf ( OUT, "        GlobalSection(SolutionConfiguration) = preSolution\r\n" );\r
-       fprintf ( OUT, "                Debug = Debug\r\n" );\r
-       fprintf ( OUT, "                Release = Release\r\n" );\r
-       fprintf ( OUT, "        EndGlobalSection\r\n" );\r
-\r
-       fprintf ( OUT, "        GlobalSection(ExtensibilityGlobals) = postSolution\r\n" );\r
-       fprintf ( OUT, "        EndGlobalSection\r\n" );\r
-       fprintf ( OUT, "        GlobalSection(ExtensibilityAddIns) = postSolution\r\n" );\r
-       fprintf ( OUT, "        EndGlobalSection\r\n" );\r
+       fprintf ( OUT, "Global\r\n" );\r
+       fprintf ( OUT, "\tGlobalSection(SolutionConfiguration) = preSolution\r\n" );\r
+       fprintf ( OUT, "\t\tDebug = Debug\r\n" );\r
+       fprintf ( OUT, "\t\tRelease = Release\r\n" );\r
+       fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
+       fprintf ( OUT, "\tGlobalSection(ProjectConfiguration) = postSolution\r\n" );\r
+       for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )\r
+       {\r
+               Module& module = *ProjectNode.modules[i];\r
+               std::string guid = module.guid;\r
+               _generate_sln_configurations ( OUT, guid.c_str() );\r
+       } \r
+       fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
+       fprintf ( OUT, "\tGlobalSection(ExtensibilityGlobals) = postSolution\r\n" );\r
+       fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
+       fprintf ( OUT, "\tGlobalSection(ExtensibilityAddIns) = postSolution\r\n" );\r
+       fprintf ( OUT, "\tEndGlobalSection\r\n" );\r
        fprintf ( OUT, "EndGlobal\r\n" );\r
 \r
 \r
@@ -467,21 +474,30 @@ MSVCBackend::_generate_sln_footer ( FILE* OUT )
 }\r
 \r
 \r
+void\r
+MSVCBackend::_generate_sln_configurations ( FILE* OUT, std::string vcproj_guid )\r
+{\r
+       fprintf ( OUT, "\t\t%s.Debug.ActiveCfg = Debug|Win32\r\n", vcproj_guid.c_str() );\r
+       fprintf ( OUT, "\t\t%s.Debug.Build.0 = Debug|Win32\r\n", vcproj_guid.c_str() );\r
+       fprintf ( OUT, "\t\t%s.Debug.Release.ActiveCfg = Release|Win32\r\n", vcproj_guid.c_str() );\r
+       fprintf ( OUT, "\t\t%s.Debug.Release.Build.0 = Release|Win32\r\n", vcproj_guid.c_str() );\r
+}\r
+\r
 void\r
 MSVCBackend::_generate_sln ( FILE* OUT )\r
 {\r
        string sln_guid = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}";\r
+       vector<string> guids;\r
 \r
        _generate_sln_header(OUT);\r
        // TODO FIXME - is it necessary to sort them?\r
        for ( size_t i = 0; i < ProjectNode.modules.size(); i++ )\r
        {\r
                Module& module = *ProjectNode.modules[i];\r
-\r
+               \r
                std::string vcproj_file = VcprojFileName ( module );\r
-               std::string vcproj_guid = _gen_guid();\r
-               _generate_sln_project ( OUT, module, vcproj_file, sln_guid, vcproj_guid, module.dependencies );\r
-    }\r
-    _generate_sln_footer ( OUT );\r
+               _generate_sln_project ( OUT, module, vcproj_file, sln_guid, module.guid, module.dependencies );\r
+       }\r
+       _generate_sln_footer ( OUT );\r
 }\r
 \r