Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 14:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix vcprojmaker to add the correct GUIDs

Browse source 
implemented Debug/Release configurations to make Alex happy

svn path=/trunk/; revision=18624
This commit is contained in:
Christoph von Wittich 2005-10-20 11:21:23 +00:00
parent 68bfd8c14e
commit 2104d4ade7
3 changed files with 43 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reactos/tools/rbuild/backend/msvc/msvc.cpp
View file

@ -31,8 +31,6 @@
using namespace std; using namespace std;
void gen_guid();
static class MSVCFactory : public Backend::Factory static class MSVCFactory : public Backend::Factory
{ {
public: public:
@ -93,9 +91,10 @@ void MSVCBackend::ProcessModules()
{ {
Module &module = *ProjectNode.modules[i]; Module &module = *ProjectNode.modules[i];
module.guid = _gen_guid();
this->_generate_dsp ( module ); this->_generate_dsp ( module );
this->_generate_vcproj ( module ); this->_generate_vcproj ( module );
// gen_guid();
/*for(size_t k = 0; k < module.non_if_data.files.size(); k++) /*for(size_t k = 0; k < module.non_if_data.files.size(); k++)
{ {

3
reactos/tools/rbuild/backend/msvc/msvc.h
View file

@ -97,6 +97,9 @@ class MSVCBackend : public Backend
std::string sln_guid, std::string sln_guid,
std::string vcproj_guid, std::string vcproj_guid,
const std::vector<Dependency*>& dependencies ); const std::vector<Dependency*>& dependencies );
void _generate_sln_configurations (
FILE* OUT,
std::string vcproj_guid );
}; };

56
reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
View file

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